This commit is contained in:
Dmitry Stogov 2007-04-09 15:35:49 +00:00
parent c5602be799
commit e43c55d20f
2 changed files with 3 additions and 3 deletions

View File

@ -665,7 +665,7 @@ PHP_FUNCTION(com_create_guid)
php_com_initialize(TSRMLS_C);
if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) == S_OK) {
Z_TYPE_P(return_value) = IS_STRING;
Z_STRVAL_P(return_value) = php_com_olestring_to_string(guid_string, &Z_STRLEN_P(return_value), CP_ACP, 0);
Z_STRVAL_P(return_value) = php_com_olestring_to_string(guid_string, &Z_STRLEN_P(return_value), CP_ACP TSRMLS_CC);
CoTaskMemFree(guid_string);
} else {

View File

@ -603,8 +603,6 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
struct lconv *lconv = NULL;
#endif
TSRMLS_FETCH();
/*
* Flag variables
*/
@ -616,6 +614,8 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
boolean_e adjust_width;
bool_int is_negative;
TSRMLS_FETCH();
sp = odp->nextb;
bep = odp->buf_end;