Skip to content

Commit 37cce7f

Browse files
author
Harald Radi
committed
MFH
1 parent 1678bfa commit 37cce7f

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎ext/com/COM.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ static PHP_MINFO_FUNCTION(COM)
100100
DISPLAY_INI_ENTRIES();
101101
}
102102

103+
103104
PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, char **ErrString TSRMLS_DC)
104105
{
105106
HRESULT hr;
@@ -164,6 +165,7 @@ PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DIS
164165
}
165166
}
166167

168+
167169
PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId TSRMLS_DC)
168170
{
169171
HRESULT hr;
@@ -195,6 +197,7 @@ PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames
195197
}
196198
}
197199

200+
198201
PHPAPI HRESULT php_COM_release(comval *obj TSRMLS_DC)
199202
{
200203
HRESULT hr;
@@ -215,6 +218,7 @@ PHPAPI HRESULT php_COM_release(comval *obj TSRMLS_DC)
215218
return obj->refcount;
216219
}
217220

221+
218222
PHPAPI HRESULT php_COM_addref(comval *obj TSRMLS_DC)
219223
{
220224
if (C_ISREFD(obj)) {
@@ -224,24 +228,19 @@ PHPAPI HRESULT php_COM_addref(comval *obj TSRMLS_DC)
224228
return obj->refcount;
225229
}
226230

231+
227232
PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup TSRMLS_DC)
228233
{
229234
HRESULT hr = 1;
230235
DISPPARAMS dispparams;
231236
VARIANT *var_result;
232237
IDispatch FAR* pDisp;
233238

234-
pDisp = *ppDisp;
235-
if(cleanup)
236-
{
237-
*ppDisp = NULL;
238-
}
239-
240239
pDisp = *ppDisp;
241240
if (cleanup) {
242241
*ppDisp = NULL;
243242
}
244-
243+
245244
C_REFCOUNT(obj) = 1;
246245
C_DISPATCH(obj) = pDisp;
247246
C_HASTLIB(obj) = SUCCEEDED(C_DISPATCH_VT(obj)->GetTypeInfo(C_DISPATCH(obj), 0, LANG_NEUTRAL, &C_TYPEINFO(obj)));
@@ -277,6 +276,7 @@ PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanup
277276
return hr;
278277
}
279278

279+
280280
PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup TSRMLS_DC)
281281
{
282282
HRESULT hr;
@@ -307,6 +307,7 @@ PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup TSRMLS_DC)
307307
return hr;
308308
}
309309

310+
310311
PHPAPI char *php_COM_error_message(HRESULT hr TSRMLS_DC)
311312
{
312313
void *pMsgBuf;
@@ -322,6 +323,7 @@ PHPAPI char *php_COM_error_message(HRESULT hr TSRMLS_DC)
322323
return pMsgBuf;
323324
}
324325

326+
325327
static char *php_string_from_clsid(const CLSID *clsid TSRMLS_DC)
326328
{
327329
LPOLESTR ole_clsid;
@@ -334,6 +336,7 @@ static char *php_string_from_clsid(const CLSID *clsid TSRMLS_DC)
334336
return clsid_str;
335337
}
336338

339+
337340
PHPAPI HRESULT php_COM_destruct(comval *obj TSRMLS_DC)
338341
{
339342
HRESULT hr = S_OK;
@@ -718,6 +721,7 @@ int do_COM_invoke(comval *obj, pval *function_name, VARIANT *var_result, pval **
718721
char *ErrString;
719722

720723
funcname = php_char_to_OLECHAR(Z_STRVAL_P(function_name), Z_STRLEN_P(function_name), codepage TSRMLS_CC);
724+
721725
hr = php_COM_get_ids_of_names(obj, &funcname, &dispid TSRMLS_CC);
722726

723727
if (FAILED(hr)) {
@@ -877,6 +881,7 @@ PHP_FUNCTION(com_addref)
877881
}
878882
/* }}} */
879883

884+
880885
static int do_COM_offget(VARIANT *result, comval *array, pval *property, int cleanup TSRMLS_DC)
881886
{
882887
pval function_name;
@@ -891,6 +896,7 @@ static int do_COM_offget(VARIANT *result, comval *array, pval *property, int cle
891896
return retval;
892897
}
893898

899+
894900
static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property, int cleanup TSRMLS_DC)
895901
{
896902
DISPID dispid;
@@ -910,7 +916,6 @@ static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property,
910916
php_error(E_WARNING,"Unable to lookup %s: %s", Z_STRVAL_P(arg_property), error_message);
911917
LocalFree(error_message);
912918
efree(propname);
913-
914919
if (cleanup) {
915920
php_COM_destruct(obj TSRMLS_CC);
916921
}
@@ -931,18 +936,15 @@ static int do_COM_propget(VARIANT *var_result, comval *obj, pval *arg_property,
931936
} else {
932937
php_error(E_WARNING,"PropGet() failed: %s", error_message);
933938
}
934-
935939
LocalFree(error_message);
936940
efree(propname);
937-
938941
if (cleanup) {
939942
php_COM_destruct(obj TSRMLS_CC);
940943
}
941944
return FAILURE;
942945
}
943946

944947
efree(propname);
945-
946948
if (cleanup) {
947949
php_COM_destruct(obj TSRMLS_CC);
948950
}
@@ -998,7 +1000,6 @@ static void do_COM_propput(pval *return_value, comval *obj, pval *arg_property,
9981000
} else {
9991001
php_error(E_WARNING,"PropPut() failed: %s", error_message);
10001002
}
1001-
10021003
LocalFree(error_message);
10031004
efree(propname);
10041005

@@ -1154,7 +1155,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
11541155

11551156
for (element=property_reference->elements_list->head; element; element=element->next) {
11561157
overloaded_property = (zend_overloaded_element *) element->data;
1157-
11581158
switch (overloaded_property->type) {
11591159
case OE_IS_ARRAY:
11601160
if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) {
@@ -1184,7 +1184,6 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
11841184
} else {
11851185
RETVAL_COM(obj);
11861186
}
1187-
11881187
return return_value;
11891188
}
11901189
break;
@@ -1379,6 +1378,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
13791378
pval_destructor(&function_name->element);
13801379
}
13811380

1381+
13821382
static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC)
13831383
{
13841384
ITypeLib *TypeLib = NULL;
@@ -1542,6 +1542,7 @@ static ITypeLib *php_COM_find_typelib(char *search_string, int mode TSRMLS_DC)
15421542
return TypeLib;
15431543
}
15441544

1545+
15451546
static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
15461547
{
15471548
ITypeComp *TypeComp;
@@ -1589,7 +1590,6 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
15891590
continue;
15901591
}
15911592
const_name = php_OLECHAR_to_char(bstr_ids, &c.name_len, codepage TSRMLS_CC);
1592-
15931593
c.name = zend_strndup(const_name, c.name_len);
15941594
c.name_len++; /* length should include the NULL */
15951595

@@ -1603,7 +1603,6 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
16031603
if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) {
16041604
php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
16051605
}
1606-
16071606
free(c.name);
16081607
j++;
16091608
continue;
@@ -1655,6 +1654,7 @@ PHP_FUNCTION(com_isenum)
16551654
}
16561655
/* }}} */
16571656

1657+
16581658
static void php_register_COM_class(TSRMLS_D)
16591659
{
16601660
INIT_OVERLOADED_CLASS_ENTRY(COM_class_entry, "COM", NULL,

0 commit comments

Comments
 (0)