cvs: php4 /ext/rpc/com com.c conversion.c

iliaa Sat Jan 18 23:09:32 2003 EDT Modified files: /php4/ext/rpc/com com.c conversion.c Log: ZTS fixes. Index: php4/ext/rpc/com/com.c diff -u php4/ext/rpc/com/com.c:1.14 php4/ext/rpc/com/com.c:1.15 --- php4/ext/rpc/com/com.c:1.14 Sat Jan 18 19:45:47 2003 +++ php4/ext/rpc/com/com.c Sat Jan 18 23:09:31 2003 @@ -618,7 +618,7 @@ 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); Index: php4/ext/rpc/com/conversion.c diff -u php4/ext/rpc/com/conversion.c:1.53 php4/ext/rpc/com/conversion.c:1.54 --- php4/ext/rpc/com/conversion.c:1.53 Sat Jan 18 19:45:48 2003 +++ php4/ext/rpc/com/conversion.c Sat Jan 18 23:09:31 2003 @@ -97,6 +97,7 @@ 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 @@ /* 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 @@ { BOOL error = FALSE; OLECHAR *unicode_str; + TSRMLS_FETCH(); if (strlen == -1) { /* request needed buffersize */ @@ -818,6 +821,7 @@ /* 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;