diff options
| author | Harald Radi <phanto@php.net> | 2002-05-15 17:59:48 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2002-05-15 17:59:48 +0000 |
| commit | 37b9089bfa3527d2bab7a0a2bd0bfd375ea45169 (patch) | |
| tree | 1e371192e0750dcb53d995cda8de8cbbe3269698 | |
| parent | bef1729fc651a865b4161245391746d11d7f06ed (diff) | |
| download | php-git-37b9089bfa3527d2bab7a0a2bd0bfd375ea45169.tar.gz | |
this should finally fix bug #14353
| -rw-r--r-- | ext/com/conversion.c | 4 | ||||
| -rw-r--r-- | ext/rpc/com/conversion.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/com/conversion.c b/ext/com/conversion.c index e18c464e81..0adcefdf47 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -770,7 +770,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML if (strlen == -1) { /* request needed buffersize */ - strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED) | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0); + strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, -1, NULL, 0); } else { /* \0 terminator */ strlen++; @@ -780,7 +780,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * strlen); /* convert string */ - error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED) | MB_ERR_INVALID_CHARS, C_str, strlen, unicode_str, strlen); + error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, strlen, unicode_str, strlen); } else { /* return a zero-length string */ unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR)); diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c index e18c464e81..0adcefdf47 100644 --- a/ext/rpc/com/conversion.c +++ b/ext/rpc/com/conversion.c @@ -770,7 +770,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML if (strlen == -1) { /* request needed buffersize */ - strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED) | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0); + strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, -1, NULL, 0); } else { /* \0 terminator */ strlen++; @@ -780,7 +780,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * strlen); /* convert string */ - error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED) | MB_ERR_INVALID_CHARS, C_str, strlen, unicode_str, strlen); + error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, strlen, unicode_str, strlen); } else { /* return a zero-length string */ unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR)); |