diff options
| author | Harald Radi <phanto@php.net> | 2001-02-18 16:49:06 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2001-02-18 16:49:06 +0000 |
| commit | a15e465a34d4d4e4861e4dd077ccaa16e752b71c (patch) | |
| tree | a8940d8d380451010ee7f1cffe5fcd4d6fbcc1e4 | |
| parent | 8d6f13dc2bd27a2f7ea8a708e9bfe60677f45cb4 (diff) | |
| download | php-git-a15e465a34d4d4e4861e4dd077ccaa16e752b71c.tar.gz | |
@- Added new object VARIANT() to encapsulate values for use with
@ the COM and DOTNET module. Therefore it is now possible to pass
@ values by reference, convert php values to extended variant types (currency,
@ date, idispatch, iunknown, ...) and define the codepage that should
@ be used for unicode - conversion.
| -rw-r--r-- | ext/com/COM.c | 12 | ||||
| -rw-r--r-- | ext/rpc/com/com_wrapper.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index f1af638d90..a183bf2729 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -234,18 +234,18 @@ PHP_FUNCTION(COM_load) codepage = CP_ACP; break; case 3: - if (!INI_INT("allow_dcom")) { - php_error(E_WARNING, "DCOM is disabled"); - RETURN_FALSE; - } getParameters(ht, 3, &module_name, &server_name, &code_page); if (server_name->type == IS_NULL) { efree(server_name); server_name = NULL; - } - else + } else { + if (!INI_INT("allow_dcom")) { + php_error(E_WARNING, "DCOM is disabled"); + RETURN_FALSE; + } convert_to_string(server_name); + } convert_to_long(code_page); codepage = code_page->value.lval; diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index f1af638d90..a183bf2729 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -234,18 +234,18 @@ PHP_FUNCTION(COM_load) codepage = CP_ACP; break; case 3: - if (!INI_INT("allow_dcom")) { - php_error(E_WARNING, "DCOM is disabled"); - RETURN_FALSE; - } getParameters(ht, 3, &module_name, &server_name, &code_page); if (server_name->type == IS_NULL) { efree(server_name); server_name = NULL; - } - else + } else { + if (!INI_INT("allow_dcom")) { + php_error(E_WARNING, "DCOM is disabled"); + RETURN_FALSE; + } convert_to_string(server_name); + } convert_to_long(code_page); codepage = code_page->value.lval; |