Updated to match TSRM changes

10 files changed, 102 insertions, 90 deletions

diff --git a/ext/com/COM.c b/ext/com/COM.c
index ab3ea4e8c3..f11c67805a 100644
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -378,7 +378,6 @@ static PHP_INI_MH(OnTypelibFileChange)
 	char *typelib_name_buffer;
 	char *strtok_buf = NULL;
 	int interactive;
-	TSRMLS_FETCH();
 	interactive = CG(interactive);
 
 	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
 	int type;
 	comval *obj, *obj_prop;
 	VARIANT *var_result;
+	TSRMLS_FETCH();
 
 	INIT_ZVAL(return_value);    
 	ZVAL_NULL(&return_value);
@@ -1298,7 +1298,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 	comval *obj, *obj_prop;
 	int type;
 	VARIANT *var_result;
-
+	TSRMLS_FETCH();
 
 	/* fetch the IDispatch interface */
 	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)
 				SysFreeString(bstr_ids);
 				c.name_len = strlen(ids)+1;
 				c.name = ids;
-				if (zend_get_constant(c.name, c.name_len-1, &exists))
+				if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC))
 				{
 					/* Oops, it already exists. No problem if it is defined as the same value */
 					/* Check to see if they are the same */
-					if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
+					if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
 					{
 						php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
 					}
@@ -1768,12 +1768,14 @@ PHP_FUNCTION(com_isenum)
 
 void php_register_COM_class()
 {
+	TSRMLS_FETCH();
+
 	INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL,
 								php_COM_call_function_handler,
 								php_COM_get_property_handler,
 								php_COM_set_property_handler);
 
-	zend_register_internal_class(&com_class_entry);
+	zend_register_internal_class(&com_class_entry TSRMLS_CC);
 }
 
 PHP_MINIT_FUNCTION(COM)
diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c
index fc04752f6c..6b68fd25fa 100644
--- a/ext/com/VARIANT.c
+++ b/ext/com/VARIANT.c
@@ -187,6 +187,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 {
 	zend_overloaded_element *overloaded_property;
 	int type;
+	TSRMLS_FETCH();
 
 	pval result, **var_handle, *object = property_reference->object;
 	VARIANT *var_arg;
@@ -239,6 +240,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
 {
 	zend_overloaded_element *overloaded_property;
 	int type;
+	TSRMLS_FETCH();
 
 	pval **var_handle, *object = property_reference->object;
 	VARIANT *var_arg;
@@ -434,14 +436,16 @@ static void php_variant_destructor(zend_rsrc_list_entry *rsrc)
 	FREE_VARIANT(rsrc->ptr);
 }
 
-void php_register_VARIANT_class()
+void php_register_VARIANT_class(void)
 {
+	TSRMLS_FETCH();
+
 	INIT_OVERLOADED_CLASS_ENTRY(VARIANT_class_entry, "VARIANT", NULL,
 								php_VARIANT_call_function_handler,
 								php_VARIANT_get_property_handler,
 								php_VARIANT_set_property_handler);
 
-	zend_register_internal_class(&VARIANT_class_entry);
+	zend_register_internal_class(&VARIANT_class_entry TSRMLS_CC);
 }
 
 #endif /* PHP_WIN32 */
diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index 31644e9a3c..011112e833 100644
--- a/ext/com/conversion.c
+++ b/ext/com/conversion.c
@@ -37,17 +37,17 @@
 
 /* prototypes */
 
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage);
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage);
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
 PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage);
 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage);
 PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage);
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage);
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg);
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
 
 /* implementations */
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
 {
 	int type = VT_EMPTY;	/* default variant type */
 
@@ -100,15 +100,15 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
 		type |= VT_BYREF;
 	}
 
-	pval_to_variant_ex(pval_arg, var_arg, type, codepage);
+	pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
 }
 
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage)
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-	pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage);
+	pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage)
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
 {
 	OLECHAR *unicode_str;
 
@@ -162,11 +162,11 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 						{
 							if(type)	/* explicit type */
 							{
-								pval_to_variant_ex(*entry, v, type, codepage);		/* Do the required conversion */
+							   pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC);		/* Do the required conversion */
 							}
 							else
 							{
-								php_pval_to_variant(*entry, v, codepage);			/* Do the required conversion */
+								php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
 							}
 						}
 						else
@@ -267,7 +267,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_UNKNOWN:
-				comval_to_variant(pval_arg, var_arg);
+			comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -280,7 +280,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_DISPATCH:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -355,7 +355,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_UNKNOWN|VT_BYREF:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -368,7 +368,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_DISPATCH|VT_BYREF:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -888,7 +888,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
 	return C_str;
 }
 
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg)
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 {
 	pval **comval_handle;
 	comval *obj;
diff --git a/ext/com/php_COM.h b/ext/com/php_COM.h
index b37a8eca05..0bb123161a 100644
--- a/ext/com/php_COM.h
+++ b/ext/com/php_COM.h
@@ -7,26 +7,26 @@
 
 BEGIN_EXTERN_C()
 
-extern PHP_MINIT_FUNCTION(COM);
-extern PHP_MSHUTDOWN_FUNCTION(COM);
-
-extern PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR*  pDispParams, VARIANT FAR* pVarResult);
-extern PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
-extern PHPAPI HRESULT php_COM_release(comval *obj);
-extern PHPAPI HRESULT php_COM_addref(comval *obj);
-extern PHPAPI HRESULT php_COM_destruct(comval *obj);
-extern PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
-extern PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
-
-extern int php_COM_get_le_comval();
-
-extern zend_module_entry COM_module_entry;
-extern zend_class_entry com_class_entry;
-
-extern pval php_COM_get_property_handler(zend_property_reference *property_reference);
-extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
-extern char *php_COM_error_message(HRESULT hr);
-extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
+PHP_MINIT_FUNCTION(COM);
+PHP_MSHUTDOWN_FUNCTION(COM);
+
+PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR*  pDispParams, VARIANT FAR* pVarResult);
+PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
+PHPAPI HRESULT php_COM_release(comval *obj);
+PHPAPI HRESULT php_COM_addref(comval *obj);
+PHPAPI HRESULT php_COM_destruct(comval *obj);
+PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
+PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
+
+int php_COM_get_le_comval();
+
+zend_module_entry COM_module_entry;
+zend_class_entry com_class_entry;
+
+pval php_COM_get_property_handler(zend_property_reference *property_reference);
+int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
+char *php_COM_error_message(HRESULT hr);
+void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
 
 #ifdef DEBUG
 	extern int resourcecounter;
diff --git a/ext/com/php_VARIANT.h b/ext/com/php_VARIANT.h
index 47acd13625..5e6d51f821 100644
--- a/ext/com/php_VARIANT.h
+++ b/ext/com/php_VARIANT.h
@@ -7,8 +7,8 @@
 
 extern int php_VARIANT_get_le_variant();
 
-extern PHP_MINIT_FUNCTION(VARIANT);
-extern PHP_MSHUTDOWN_FUNCTION(VARIANT);
+PHP_MINIT_FUNCTION(VARIANT);
+PHP_MSHUTDOWN_FUNCTION(VARIANT);
 
 extern zend_module_entry VARIANT_module_entry;
 
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index ab3ea4e8c3..f11c67805a 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -378,7 +378,6 @@ static PHP_INI_MH(OnTypelibFileChange)
 	char *typelib_name_buffer;
 	char *strtok_buf = NULL;
 	int interactive;
-	TSRMLS_FETCH();
 	interactive = CG(interactive);
 
 	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
 	int type;
 	comval *obj, *obj_prop;
 	VARIANT *var_result;
+	TSRMLS_FETCH();
 
 	INIT_ZVAL(return_value);    
 	ZVAL_NULL(&return_value);
@@ -1298,7 +1298,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere
 	comval *obj, *obj_prop;
 	int type;
 	VARIANT *var_result;
-
+	TSRMLS_FETCH();
 
 	/* fetch the IDispatch interface */
 	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)
 				SysFreeString(bstr_ids);
 				c.name_len = strlen(ids)+1;
 				c.name = ids;
-				if (zend_get_constant(c.name, c.name_len-1, &exists))
+				if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC))
 				{
 					/* Oops, it already exists. No problem if it is defined as the same value */
 					/* Check to see if they are the same */
-					if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose"))
+					if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose"))
 					{
 						php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name);
 					}
@@ -1768,12 +1768,14 @@ PHP_FUNCTION(com_isenum)
 
 void php_register_COM_class()
 {
+	TSRMLS_FETCH();
+
 	INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL,
 								php_COM_call_function_handler,
 								php_COM_get_property_handler,
 								php_COM_set_property_handler);
 
-	zend_register_internal_class(&com_class_entry);
+	zend_register_internal_class(&com_class_entry TSRMLS_CC);
 }
 
 PHP_MINIT_FUNCTION(COM)
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 31644e9a3c..011112e833 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -37,17 +37,17 @@
 
 /* prototypes */
 
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage);
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage);
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC);
 PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage);
 PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage);
 PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage);
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage);
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg);
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC);
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC);
 
 /* implementations */
-PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
+PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC)
 {
 	int type = VT_EMPTY;	/* default variant type */
 
@@ -100,15 +100,15 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
 		type |= VT_BYREF;
 	}
 
-	pval_to_variant_ex(pval_arg, var_arg, type, codepage);
+	pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC);
 }
 
-PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage)
+PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC)
 {
-	pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage);
+	pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC);
 }
 
-static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage)
+static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC)
 {
 	OLECHAR *unicode_str;
 
@@ -162,11 +162,11 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 						{
 							if(type)	/* explicit type */
 							{
-								pval_to_variant_ex(*entry, v, type, codepage);		/* Do the required conversion */
+							   pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC);		/* Do the required conversion */
 							}
 							else
 							{
-								php_pval_to_variant(*entry, v, codepage);			/* Do the required conversion */
+								php_pval_to_variant(*entry, v, codepage TSRMLS_CC);                    /* Do the required conversion */
 							}
 						}
 						else
@@ -267,7 +267,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_UNKNOWN:
-				comval_to_variant(pval_arg, var_arg);
+			comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -280,7 +280,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_DISPATCH:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -355,7 +355,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_UNKNOWN|VT_BYREF:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -368,7 +368,7 @@ static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int c
 				break;
 
 			case VT_DISPATCH|VT_BYREF:
-				comval_to_variant(pval_arg, var_arg);
+				comval_to_variant(pval_arg, var_arg TSRMLS_CC);
 				if(V_VT(var_arg) != VT_DISPATCH)
 				{
 					VariantInit(var_arg);
@@ -888,7 +888,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
 	return C_str;
 }
 
-static void comval_to_variant(pval *pval_arg, VARIANT *var_arg)
+static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC)
 {
 	pval **comval_handle;
 	comval *obj;
diff --git a/ext/rpc/com/php_com.h b/ext/rpc/com/php_com.h
index b37a8eca05..0bb123161a 100644
--- a/ext/rpc/com/php_com.h
+++ b/ext/rpc/com/php_com.h
@@ -7,26 +7,26 @@
 
 BEGIN_EXTERN_C()
 
-extern PHP_MINIT_FUNCTION(COM);
-extern PHP_MSHUTDOWN_FUNCTION(COM);
-
-extern PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR*  pDispParams, VARIANT FAR* pVarResult);
-extern PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
-extern PHPAPI HRESULT php_COM_release(comval *obj);
-extern PHPAPI HRESULT php_COM_addref(comval *obj);
-extern PHPAPI HRESULT php_COM_destruct(comval *obj);
-extern PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
-extern PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
-
-extern int php_COM_get_le_comval();
-
-extern zend_module_entry COM_module_entry;
-extern zend_class_entry com_class_entry;
-
-extern pval php_COM_get_property_handler(zend_property_reference *property_reference);
-extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
-extern char *php_COM_error_message(HRESULT hr);
-extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
+PHP_MINIT_FUNCTION(COM);
+PHP_MSHUTDOWN_FUNCTION(COM);
+
+PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR*  pDispParams, VARIANT FAR* pVarResult);
+PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId);
+PHPAPI HRESULT php_COM_release(comval *obj);
+PHPAPI HRESULT php_COM_addref(comval *obj);
+PHPAPI HRESULT php_COM_destruct(comval *obj);
+PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup);
+PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup);
+
+int php_COM_get_le_comval();
+
+zend_module_entry COM_module_entry;
+zend_class_entry com_class_entry;
+
+pval php_COM_get_property_handler(zend_property_reference *property_reference);
+int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value);
+char *php_COM_error_message(HRESULT hr);
+void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
 
 #ifdef DEBUG
 	extern int resourcecounter;
diff --git a/ext/rpc/com/php_variant.h b/ext/rpc/com/php_variant.h
index 47acd13625..5e6d51f821 100644
--- a/ext/rpc/com/php_variant.h
+++ b/ext/rpc/com/php_variant.h
@@ -7,8 +7,8 @@
 
 extern int php_VARIANT_get_le_variant();
 
-extern PHP_MINIT_FUNCTION(VARIANT);
-extern PHP_MSHUTDOWN_FUNCTION(VARIANT);
+PHP_MINIT_FUNCTION(VARIANT);
+PHP_MSHUTDOWN_FUNCTION(VARIANT);
 
 extern zend_module_entry VARIANT_module_entry;
 
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c
index fc04752f6c..6b68fd25fa 100644
--- a/ext/rpc/com/variant.c
+++ b/ext/rpc/com/variant.c
@@ -187,6 +187,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
 {
 	zend_overloaded_element *overloaded_property;
 	int type;
+	TSRMLS_FETCH();
 
 	pval result, **var_handle, *object = property_reference->object;
 	VARIANT *var_arg;
@@ -239,6 +240,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
 {
 	zend_overloaded_element *overloaded_property;
 	int type;
+	TSRMLS_FETCH();
 
 	pval **var_handle, *object = property_reference->object;
 	VARIANT *var_arg;
@@ -434,14 +436,16 @@ static void php_variant_destructor(zend_rsrc_list_entry *rsrc)
 	FREE_VARIANT(rsrc->ptr);
 }
 
-void php_register_VARIANT_class()
+void php_register_VARIANT_class(void)
 {
+	TSRMLS_FETCH();
+
 	INIT_OVERLOADED_CLASS_ENTRY(VARIANT_class_entry, "VARIANT", NULL,
 								php_VARIANT_call_function_handler,
 								php_VARIANT_get_property_handler,
 								php_VARIANT_set_property_handler);
 
-	zend_register_internal_class(&VARIANT_class_entry);
+	zend_register_internal_class(&VARIANT_class_entry TSRMLS_CC);
 }
 
 #endif /* PHP_WIN32 */