From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 19 Jan 2003 04:09:32 +0000 (+0000)
Subject: ZTS fixes.
X-Git-Tag: PHP_5_0_dev_before_13561_fix~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2500199ae3079bd984d0f369bf63875ff09e7306;p=php

ZTS fixes.
---

diff --git a/ext/rpc/com/com.c b/ext/rpc/com/com.c
index dc5d41af32..454d6dceb8 100644
--- a/ext/rpc/com/com.c
+++ b/ext/rpc/com/com.c
@@ -618,7 +618,7 @@ static int com_set(rpc_string property_name, zval *value, void **data)
 	DISPPARAMS dispparams;
 	VARIANT *var;
 	char *error_message, *ErrString;
-
+	TSRMLS_FETCH();
 
 	/* obtain property handler */
 	propname = php_char_to_OLECHAR(property_name.str, property_name.len, CP_ACP, FALSE);
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index d64666f627..1d6bcd71cf 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -97,6 +97,7 @@ PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage)
 PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage)
 {
 	OLECHAR *unicode_str = NULL;
+	TSRMLS_FETCH();
 
 	VariantInit(var_arg);
 	V_VT(var_arg) = type;
@@ -445,6 +446,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 	/* Existing calls will be unaffected by the change - so it */
 	/* seemed like the smallest impact on unfamiliar code */
 	int ret = SUCCESS; 
+	TSRMLS_FETCH();
 
 	INIT_PZVAL(zval_arg);
 
@@ -765,6 +767,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int
 {
 	BOOL error = FALSE;
 	OLECHAR *unicode_str;
+	TSRMLS_FETCH();
 
 	if (strlen == -1) {
 		/* request needed buffersize */
@@ -818,6 +821,7 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
 		/* convert string */
 		length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
 	} else {
+		TSRMLS_FETCH();
 		C_str = (char *) pemalloc(sizeof(char), persist);
 		*C_str = 0;