diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-02 23:08:20 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-02 23:08:20 +0000 |
| commit | efab05139139f5d20a0723753786469e1f0692dd (patch) | |
| tree | 0156647c68595725ce55857411aeca71021080ad | |
| parent | bd0ac7fe14b6f2eb82a2e13a38c3eca5d4fe2e4f (diff) | |
| download | php-git-efab05139139f5d20a0723753786469e1f0692dd.tar.gz | |
Import COM patch from Harald Radi <h.radi@nme.at>
The new code should allow for better international support.
| -rw-r--r-- | ext/rpc/com/COM.c | 69 |
1 files changed, 57 insertions, 12 deletions
diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 7f6a606ece..a09ad8eb54 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -33,10 +33,23 @@ * Zeev */ +/* + * 28.12.2000 + * unicode conversion fixed by Harald Radi <h.radi@nme.at> + * + * now all these strange '?'s should be disapeared + */ + #ifdef PHP_WIN32 #define _WIN32_DCOM +#ifdef CP_THREAD_ACP +#define PHP_COM_CODEPAGE CP_THREAD_ACP +#else +#define PHP_COM_CODEPAGE CP_ACP +#endif + #include "php.h" #include "php_COM.h" #include "zend_compile.h" @@ -46,6 +59,7 @@ #include "objbase.h" #include "olestd.h" #include <ctype.h> +#include <windows.h> static int le_idispatch; @@ -104,13 +118,32 @@ char *php_COM_error_message(HRESULT hr) static OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen) { - OLECHAR *unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR)*(strlen+1)); - OLECHAR *unicode_ptr = unicode_str; + OLECHAR *unicode_str; + + //request needed buffersize + uint reqSize = MultiByteToWideChar(PHP_COM_CODEPAGE, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0); + + if(reqSize) + { + unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * reqSize); - while (*C_str) { - *unicode_ptr++ = (unsigned short) *C_str++; + //convert string + MultiByteToWideChar(PHP_COM_CODEPAGE, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, unicode_str, reqSize); + } + else + { + unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR)); + *unicode_str = 0; + + switch(GetLastError()) + { + case ERROR_NO_UNICODE_TRANSLATION: + php_error(E_WARNING,"No unicode translation available for the specified string"); + break; + default: + php_error(E_WARNING,"Error in php_char_to_OLECHAR()"); + } } - *unicode_ptr = 0; return unicode_str; } @@ -118,17 +151,29 @@ static OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen) char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent) { - uint length = OLESTRLEN(unicode_str); - char *C_str = (char *) pemalloc(length+1, persistent), *p = C_str; + char *C_str; + uint length = 0; - while (*unicode_str) { - *p++ = (char) *unicode_str++; + //request needed buffersize + uint reqSize = WideCharToMultiByte(PHP_COM_CODEPAGE, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL); + + if(reqSize) + { + C_str = (char *) pemalloc(sizeof(char) * reqSize, persistent); + + //convert string + length = WideCharToMultiByte(PHP_COM_CODEPAGE, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1; + } + else + { + C_str = (char *) pemalloc(sizeof(char), persistent); + *C_str = 0; + + php_error(E_WARNING,"Error in php_OLECHAR_to_char()"); } - *p = 0; - if (out_length) { + if(out_length) *out_length = length; - } return C_str; } |