cvs: php4(PHP_4_2_0) /ext/com conversion.c
| From: | Harald Radi | Date: | Wed, 15 May 2002 18:05:13 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/com conversion.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11942@lists.php.net to get a copy of this message | ||
phanto Wed May 15 14:05:13 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/com conversion.c
Log:
MFH
# found the appropriate branch following the
# 'innsbrugga-style' paradigm markus suggested
Index: php4/ext/com/conversion.c
diff -u php4/ext/com/conversion.c:1.42.2.2 php4/ext/com/conversion.c:1.42.2.3
--- php4/ext/com/conversion.c:1.42.2.2 Thu Apr 25 02:37:57 2002
+++ php4/ext/com/conversion.c Wed May 15 14:05:12 2002
@@ -769,7 +769,7 @@
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++;
@@ -779,7 +779,7 @@
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));