diff options
| author | Harald Radi <phanto@php.net> | 2001-09-25 16:29:45 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2001-09-25 16:29:45 +0000 |
| commit | 333ce2d05074ca850824c1fe7e655b4e7315f87b (patch) | |
| tree | 0afa1bc533556a7eae2a9e8cbae5be4f02f29ece /ext | |
| parent | a84618a3de0986db27ce433618b294c6b32481bd (diff) | |
| download | php-git-333ce2d05074ca850824c1fe7e655b4e7315f87b.tar.gz | |
changed flags
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/com/COM.c | 2 | ||||
| -rw-r--r-- | ext/com/conversion.c | 2 | ||||
| -rw-r--r-- | ext/rpc/com/com_wrapper.c | 2 | ||||
| -rw-r--r-- | ext/rpc/com/conversion.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index df6ee80535..a8b49f7d59 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -554,7 +554,7 @@ PHP_FUNCTION(com_load) pResults.pIID = &IID_IDispatch; pResults.pItf = NULL; pResults.hr = S_OK; - hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_SERVER, &server_info, 1, &pResults); + hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_REMOTE_SERVER, &server_info, 1, &pResults); if (SUCCEEDED(hr)) { hr = pResults.hr; C_DISPATCH(obj) = (IDispatch *) pResults.pItf; diff --git a/ext/com/conversion.c b/ext/com/conversion.c index 18ce7f17b8..8c11fec1fb 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -456,7 +456,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS /* This call has failed for everything I have tried */ /* But best leave it to be on the safe side */ - if (FAILED(SafeArrayGetVartype(array, &vartype))) { + if (FAILED(SafeArrayGetVartype(array, &vartype)) || (vartype == VT_EMPTY)) { /* Fall back to what we do know */ /* Mask off the array bit and assume */ /* what is left is the type of the array */ diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index df6ee80535..a8b49f7d59 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -554,7 +554,7 @@ PHP_FUNCTION(com_load) pResults.pIID = &IID_IDispatch; pResults.pItf = NULL; pResults.hr = S_OK; - hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_SERVER, &server_info, 1, &pResults); + hr=CoCreateInstanceEx(&clsid, NULL, CLSCTX_REMOTE_SERVER, &server_info, 1, &pResults); if (SUCCEEDED(hr)) { hr = pResults.hr; C_DISPATCH(obj) = (IDispatch *) pResults.pItf; diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c index 18ce7f17b8..8c11fec1fb 100644 --- a/ext/rpc/com/conversion.c +++ b/ext/rpc/com/conversion.c @@ -456,7 +456,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS /* This call has failed for everything I have tried */ /* But best leave it to be on the safe side */ - if (FAILED(SafeArrayGetVartype(array, &vartype))) { + if (FAILED(SafeArrayGetVartype(array, &vartype)) || (vartype == VT_EMPTY)) { /* Fall back to what we do know */ /* Mask off the array bit and assume */ /* what is left is the type of the array */ |