- MFH: fix for bug #14353

diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index a0005e62000a1ee7a478dbb70e035b29cb9194af..35defeea87c6649a1d7919862739aa99ad7c1611 100644 (file)
--- a/ext/com/conversion.c
+++ b/ext/com/conversion.c
@@ -769,7 +769,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML
 
        if (strlen == -1) {
                /* request needed buffersize */
-               strlen = MultiByteToWideChar(codepage, 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 @@ 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, 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));
@@ -811,13 +811,13 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
        uint length = 0;
 
        /* request needed buffersize */
-       uint reqSize = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
+       uint reqSize = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
 
        if (reqSize) {
                C_str = (char *) emalloc(sizeof(char) * reqSize);
 
                /* convert string */
-               length = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
+               length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
        } else {
                C_str = (char *) emalloc(sizeof(char));
                *C_str = 0;

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index a0005e62000a1ee7a478dbb70e035b29cb9194af..35defeea87c6649a1d7919862739aa99ad7c1611 100644 (file)
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -769,7 +769,7 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage TSRML
 
        if (strlen == -1) {
                /* request needed buffersize */
-               strlen = MultiByteToWideChar(codepage, 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 @@ 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, 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));
@@ -811,13 +811,13 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
        uint length = 0;
 
        /* request needed buffersize */
-       uint reqSize = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
+       uint reqSize = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
 
        if (reqSize) {
                C_str = (char *) emalloc(sizeof(char) * reqSize);
 
                /* convert string */
-               length = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
+               length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
        } else {
                C_str = (char *) emalloc(sizeof(char));
                *C_str = 0;