cvs: php4(PHP_4_0_7) /ext/com COM.c conversion.c

phanto Tue Sep 25 12:29:45 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/com COM.c conversion.c Log: changed flags Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.50.2.3 php4/ext/com/COM.c:1.50.2.4 --- php4/ext/com/COM.c:1.50.2.3 Mon Sep 10 05:28:54 2001 +++ php4/ext/com/COM.c Tue Sep 25 12:29:43 2001 @@ -554,7 +554,7 @@ 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; Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.33.2.3 php4/ext/com/conversion.c:1.33.2.4 --- php4/ext/com/conversion.c:1.33.2.3 Mon Sep 10 05:28:54 2001 +++ php4/ext/com/conversion.c Tue Sep 25 12:29:43 2001 @@ -456,7 +456,7 @@ /* 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 */