Skip to content

Commit 12ab3bb

Browse files
author
Harald Radi
committed
Updated to match TSRM changes
1 parent f05328f commit 12ab3bb

File tree

10 files changed

+102
-90
lines changed

10 files changed

+102
-90
lines changed

‎ext/com/COM.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ static PHP_INI_MH(OnTypelibFileChange)
378378
char *typelib_name_buffer;
379379
char *strtok_buf = NULL;
380380
int interactive;
381-
TSRMLS_FETCH();
382381
interactive = CG(interactive);
383382

384383
if(!new_value || (typelib_file = VCWD_FOPEN(new_value, "r"))==NULL)
@@ -1199,6 +1198,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
11991198
int type;
12001199
comval *obj, *obj_prop;
12011200
VARIANT *var_result;
1201+
TSRMLS_FETCH();
12021202

12031203
INIT_ZVAL(return_value);
12041204
ZVAL_NULL(&return_value);
@@ -1298,7 +1298,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
12981298
comval *obj, *obj_prop;
12991299
int type;
13001300
VARIANT *var_result;
1301-
1301+
TSRMLS_FETCH();
13021302

13031303
/* fetch the IDispatch interface */
13041304
zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle);
@@ -1708,11 +1708,11 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
17081708
SysFreeString(bstr_ids);
17091709
c.name_len = strlen(ids)+1;
17101710
c.name = ids;
1711-
if (zend_get_constant(c.name, c.name_len-1, &exists))
1711+
if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC))
17121712
{
17131713
/* Oops, it already exists. No problem if it is defined as the same value */
17141714
/* Check to see if they are the same */
1715-
if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
1715+
if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
17161716
{
17171717
php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
17181718
}
@@ -1768,12 +1768,14 @@ PHP_FUNCTION(com_isenum)
17681768

17691769
void php_register_COM_class()
17701770
{
1771+
TSRMLS_FETCH();
1772+
17711773
INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL,
17721774
php_COM_call_function_handler,
17731775
php_COM_get_property_handler,
17741776
php_COM_set_property_handler);
17751777

1776-
zend_register_internal_class(&com_class_entry);
1778+
zend_register_internal_class(&com_class_entry TSRMLS_CC);
17771779
}
17781780

17791781
PHP_MINIT_FUNCTION(COM)

‎ext/com/VARIANT.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
187187
{
188188
zend_overloaded_element *overloaded_property;
189189
int type;
190+
TSRMLS_FETCH();
190191

191192
pval result, **var_handle, *object = property_reference->object;
192193
VARIANT *var_arg;
@@ -239,6 +240,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
239240
{
240241
zend_overloaded_element *overloaded_property;
241242
int type;
243+
TSRMLS_FETCH();
242244

243245
pval **var_handle, *object = property_reference->object;
244246
VARIANT *var_arg;
@@ -434,14 +436,16 @@ static void php_variant_destructor(zend_rsrc_list_entry *rsrc)
434436
FREE_VARIANT(rsrc->ptr);
435437
}
436438

437-
void php_register_VARIANT_class()
439+
void php_register_VARIANT_class(void)
438440
{
441+
TSRMLS_FETCH();
442+
439443
INIT_OVERLOADED_CLASS_ENTRY(VARIANT_class_entry, "VARIANT", NULL,
440444
php_VARIANT_call_function_handler,
441445
php_VARIANT_get_property_handler,
442446
php_VARIANT_set_property_handler);
443447

444-
zend_register_internal_class(&VARIANT_class_entry);
448+
zend_register_internal_class(&VARIANT_class_entry TSRMLS_CC);
445449
}
446450

447451
#endif /* PHP_WIN32 */

‎ext/com/conversion.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737

3838
/* prototypes */
3939

40-
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage);
41-
PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage);
40+
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
41+
PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
4242
PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage);
4343
PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage);
4444
PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage);
4545

46-
static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage);
47-
static void comval_to_variant(pval *pval_arg, VARIANT *var_arg);
46+
static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
47+
static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
4848

4949
/* implementations */
50-
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
50+
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
5151
{
5252
int type = VT_EMPTY; /* default variant type */
5353

@@ -100,15 +100,15 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
100100
type |= VT_BYREF;
101101
}
102102

103-
pval_to_variant_ex(pval_arg, var_arg, type, codepage);
103+
pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
104104
}
105105

106-
PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage)
106+
PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
107107
{
108-
pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage);
108+
pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
109109
}
110110

111-
static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage)
111+
static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
112112
{
113113
OLECHAR *unicode_str;
114114

@@ -162,11 +162,11 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
162162
{
163163
if(type) /* explicit type */
164164
{
165-
pval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */
165+
pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */
166166
}
167167
else
168168
{
169-
php_pval_to_variant(*entry, v, codepage); /* Do the required conversion */
169+
php_pval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */
170170
}
171171
}
172172
else
@@ -267,7 +267,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
267267
break;
268268

269269
case VT_UNKNOWN:
270-
comval_to_variant(pval_arg, var_arg);
270+
comval_to_variant(pval_arg, var_arg TSRMLS_CC);
271271
if(V_VT(var_arg) != VT_DISPATCH)
272272
{
273273
VariantInit(var_arg);
@@ -280,7 +280,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
280280
break;
281281

282282
case VT_DISPATCH:
283-
comval_to_variant(pval_arg, var_arg);
283+
comval_to_variant(pval_arg, var_arg TSRMLS_CC);
284284
if(V_VT(var_arg) != VT_DISPATCH)
285285
{
286286
VariantInit(var_arg);
@@ -355,7 +355,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
355355
break;
356356

357357
case VT_UNKNOWN|VT_BYREF:
358-
comval_to_variant(pval_arg, var_arg);
358+
comval_to_variant(pval_arg, var_arg TSRMLS_CC);
359359
if(V_VT(var_arg) != VT_DISPATCH)
360360
{
361361
VariantInit(var_arg);
@@ -368,7 +368,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
368368
break;
369369

370370
case VT_DISPATCH|VT_BYREF:
371-
comval_to_variant(pval_arg, var_arg);
371+
comval_to_variant(pval_arg, var_arg TSRMLS_CC);
372372
if(V_VT(var_arg) != VT_DISPATCH)
373373
{
374374
VariantInit(var_arg);
@@ -888,7 +888,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
888888
return C_str;
889889
}
890890

891-
static void comval_to_variant(pval *pval_arg, VARIANT *var_arg)
891+
static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
892892
{
893893
pval **comval_handle;
894894
comval *obj;

‎ext/com/php_COM.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77

88
BEGIN_EXTERN_C()
99

10-
extern PHP_MINIT_FUNCTION(COM);
11-
extern PHP_MSHUTDOWN_FUNCTION(COM);
12-
13-
extern PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult);
14-
extern PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
15-
extern PHPAPI HRESULT php_COM_release(comval *obj);
16-
extern PHPAPI HRESULT php_COM_addref(comval *obj);
17-
extern PHPAPI HRESULT php_COM_destruct(comval *obj);
18-
extern PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
19-
extern PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
20-
21-
extern int php_COM_get_le_comval();
22-
23-
extern zend_module_entry COM_module_entry;
24-
extern zend_class_entry com_class_entry;
25-
26-
extern pval php_COM_get_property_handler(zend_property_reference *property_reference);
27-
extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
28-
extern char *php_COM_error_message(HRESULT hr);
29-
extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
10+
PHP_MINIT_FUNCTION(COM);
11+
PHP_MSHUTDOWN_FUNCTION(COM);
12+
13+
PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult);
14+
PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
15+
PHPAPI HRESULT php_COM_release(comval *obj);
16+
PHPAPI HRESULT php_COM_addref(comval *obj);
17+
PHPAPI HRESULT php_COM_destruct(comval *obj);
18+
PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
19+
PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
20+
21+
int php_COM_get_le_comval();
22+
23+
zend_module_entry COM_module_entry;
24+
zend_class_entry com_class_entry;
25+
26+
pval php_COM_get_property_handler(zend_property_reference *property_reference);
27+
int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
28+
char *php_COM_error_message(HRESULT hr);
29+
void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
3030

3131
#ifdef DEBUG
3232
extern int resourcecounter;

‎ext/com/php_VARIANT.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
extern int php_VARIANT_get_le_variant();
99

10-
extern PHP_MINIT_FUNCTION(VARIANT);
11-
extern PHP_MSHUTDOWN_FUNCTION(VARIANT);
10+
PHP_MINIT_FUNCTION(VARIANT);
11+
PHP_MSHUTDOWN_FUNCTION(VARIANT);
1212

1313
extern zend_module_entry VARIANT_module_entry;
1414

‎ext/rpc/com/com_wrapper.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,6 @@ static PHP_INI_MH(OnTypelibFileChange)
378378
char *typelib_name_buffer;
379379
char *strtok_buf = NULL;
380380
int interactive;
381-
TSRMLS_FETCH();
382381
interactive = CG(interactive);
383382

384383
if(!new_value || (typelib_file = VCWD_FOPEN(new_value, "r"))==NULL)
@@ -1199,6 +1198,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer
11991198
int type;
12001199
comval *obj, *obj_prop;
12011200
VARIANT *var_result;
1201+
TSRMLS_FETCH();
12021202

12031203
INIT_ZVAL(return_value);
12041204
ZVAL_NULL(&return_value);
@@ -1298,7 +1298,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
12981298
comval *obj, *obj_prop;
12991299
int type;
13001300
VARIANT *var_result;
1301-
1301+
TSRMLS_FETCH();
13021302

13031303
/* fetch the IDispatch interface */
13041304
zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle);
@@ -1708,11 +1708,11 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode)
17081708
SysFreeString(bstr_ids);
17091709
c.name_len = strlen(ids)+1;
17101710
c.name = ids;
1711-
if (zend_get_constant(c.name, c.name_len-1, &exists))
1711+
if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC))
17121712
{
17131713
/* Oops, it already exists. No problem if it is defined as the same value */
17141714
/* Check to see if they are the same */
1715-
if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
1715+
if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
17161716
{
17171717
php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
17181718
}
@@ -1768,12 +1768,14 @@ PHP_FUNCTION(com_isenum)
17681768

17691769
void php_register_COM_class()
17701770
{
1771+
TSRMLS_FETCH();
1772+
17711773
INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL,
17721774
php_COM_call_function_handler,
17731775
php_COM_get_property_handler,
17741776
php_COM_set_property_handler);
17751777

1776-
zend_register_internal_class(&com_class_entry);
1778+
zend_register_internal_class(&com_class_entry TSRMLS_CC);
17771779
}
17781780

17791781
PHP_MINIT_FUNCTION(COM)

0 commit comments

Comments
 (0)