diff options
Diffstat (limited to 'ext/com_dotnet/com_handlers.c')
-rw-r--r-- | ext/com_dotnet/com_handlers.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 60830dc599..95a1c9a7ed 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -100,7 +100,7 @@ static zval *com_read_dimension(zval *object, zval *offset, int type, zval *rv) } else if (V_ISARRAY(&obj->v)) { convert_to_long(offset); - if (SafeArrayGetDim(V_ARRAY(&obj->v)) == 1) { + if (SafeArrayGetDim(V_ARRAY(&obj->v)) == 1) { if (php_com_safearray_get_elem(&obj->v, &v, (LONG)Z_LVAL_P(offset))) { php_com_wrap_variant(rv, &v, obj->code_page); VariantClear(&v); @@ -138,8 +138,8 @@ static void com_write_dimension(zval *object, zval *offset, zval *value) } else if (V_ISARRAY(&obj->v)) { LONG indices = 0; VARTYPE vt; - - if (SafeArrayGetDim(V_ARRAY(&obj->v)) == 1) { + + if (SafeArrayGetDim(V_ARRAY(&obj->v)) == 1) { if (FAILED(SafeArrayGetVartype(V_ARRAY(&obj->v), &vt)) || vt == VT_EMPTY) { vt = V_VT(&obj->v) & ~VT_ARRAY; } @@ -281,7 +281,7 @@ static union _zend_function *com_method_get(zend_object **object_ptr, zend_strin f.handler = PHP_FN(com_method_handler); fptr = &f; - + if (obj->typeinfo) { /* look for byref params */ ITypeComp *comp; @@ -368,7 +368,7 @@ static int com_call_method(zend_string *method, zend_object *object, INTERNAL_FU if (V_VT(&obj->v) != VT_DISPATCH) { return FAILURE; } - + nargs = ZEND_NUM_ARGS(); if (nargs) { @@ -405,19 +405,19 @@ static union _zend_function *com_constructor_get(zend_object *object) f.fn_flags = 0; \ f.handler = ZEND_FN(fn); \ return (union _zend_function*)&f; - + switch (obj->ce->name->val[0]) { #if HAVE_MSCOREE_H case 'd': POPULATE_CTOR(d, com_dotnet_create_instance); #endif - + case 'c': POPULATE_CTOR(c, com_create_instance); - + case 'v': POPULATE_CTOR(v, com_variant_create_instance); - + default: return NULL; } @@ -522,9 +522,9 @@ static int com_object_count(zval *object, zend_long *count) { php_com_dotnet_object *obj; LONG ubound = 0, lbound = 0; - + obj = CDNO_FETCH(object); - + if (!V_ISARRAY(&obj->v)) { return FAILURE; } @@ -571,10 +571,10 @@ void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable) if (obj->sink_dispatch) { IConnectionPointContainer *cont; IConnectionPoint *point; - + if (SUCCEEDED(IDispatch_QueryInterface(V_DISPATCH(&obj->v), &IID_IConnectionPointContainer, (void**)&cont))) { - + if (SUCCEEDED(IConnectionPointContainer_FindConnectionPoint(cont, &obj->sink_id, &point))) { @@ -623,7 +623,7 @@ zend_object* php_com_object_clone(zval *object) origobject = (php_com_dotnet_object*)Z_OBJ_P(object); cloneobj = (php_com_dotnet_object*)emalloc(sizeof(php_com_dotnet_object)); - + memcpy(cloneobj, origobject, sizeof(*cloneobj)); /* VariantCopy will perform VariantClear; we don't want to clobber @@ -632,7 +632,7 @@ zend_object* php_com_object_clone(zval *object) VariantInit(&cloneobj->v); /* We use the Indirection-following version of the API since we * want to clone as much as possible */ - VariantCopyInd(&cloneobj->v, &origobject->v); + VariantCopyInd(&cloneobj->v, &origobject->v); if (cloneobj->typeinfo) { ITypeInfo_AddRef(cloneobj->typeinfo); |