MFH

# found the appropriate branch following the
# 'innsbrugga-style' paradigm markus suggested

diff --git a/ext/com/conversion.c b/ext/com/conversion.c
index 35defeea87c6649a1d7919862739aa99ad7c1611..a81fcb163d3e5083214d2c52a8179cf35c441562 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, (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 @@ 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 35defeea87c6649a1d7919862739aa99ad7c1611..a81fcb163d3e5083214d2c52a8179cf35c441562 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, (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 @@ 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));