msxml3: Fix response text conversion to WCHAR string.

This commit is contained in:
Nikolay Sivov 2010-10-13 02:49:22 +04:00 committed by Alexandre Julliard
parent ace3a81d13
commit ac6671b7f3
2 changed files with 6 additions and 2 deletions

View File

@ -865,7 +865,11 @@ static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR
if (encoding == XML_CHAR_ENCODING_UTF8 || if (encoding == XML_CHAR_ENCODING_UTF8 ||
encoding == XML_CHAR_ENCODING_NONE ) encoding == XML_CHAR_ENCODING_NONE )
{ {
*body = bstr_from_xmlChar(ptr); DWORD length = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)ptr, size, NULL, 0);
*body = SysAllocStringLen(NULL, length);
if (*body)
MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)ptr, size, *body, length);
} }
else else
*body = SysAllocStringByteLen((LPCSTR)ptr, size); *body = SysAllocStringByteLen((LPCSTR)ptr, size);

View File

@ -3354,7 +3354,7 @@ if (0)
* not what the server expects */ * not what the server expects */
if(hr == S_OK) if(hr == S_OK)
{ {
todo_wine ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)), ok(!memcmp(bstrResponse, wszExpectedResponse, sizeof(wszExpectedResponse)),
"expected %s, got %s\n", wine_dbgstr_w(wszExpectedResponse), wine_dbgstr_w(bstrResponse)); "expected %s, got %s\n", wine_dbgstr_w(wszExpectedResponse), wine_dbgstr_w(bstrResponse));
SysFreeString(bstrResponse); SysFreeString(bstrResponse);
} }