diff --git a/modules/rostests/winetests/winhttp/winhttp.c b/modules/rostests/winetests/winhttp/winhttp.c index 776ee53e379..7c683f8f1de 100644 --- a/modules/rostests/winetests/winhttp/winhttp.c +++ b/modules/rostests/winetests/winhttp/winhttp.c @@ -4276,8 +4276,16 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); +#ifdef __REACTOS__ + if (SUCCEEDED(hr)) + { + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); + } +#else ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); +#endif IWinHttpRequest_Release( req ); @@ -4306,9 +4314,16 @@ static void test_IWinHttpRequest(int port) hr = IWinHttpRequest_get_ResponseText( req, &response ); ok( hr == S_OK, "got %08x\n", hr ); +#ifdef __REACTOS__ + if (SUCCEEDED(hr)) + { + ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); + SysFreeString( response ); + } +#else ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response ); - +#endif status = 0xdeadbeef; hr = IWinHttpRequest_get_Status( req, &status ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/sdk/include/reactos/wine/test.h b/sdk/include/reactos/wine/test.h index 8b9035adfcf..d7e4d620670 100644 --- a/sdk/include/reactos/wine/test.h +++ b/sdk/include/reactos/wine/test.h @@ -634,30 +634,23 @@ const char *wine_dbgstr_an( const CHAR *str, intptr_t n ) return res; } -const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) +const char *wine_dbgstr_wn( const WCHAR *str, int n ) { - char *dst, *res; - size_t size; + char *res; + static const char hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + char buffer[300], *dst = buffer; + if (!str) return "(null)"; if (!((ULONG_PTR)str >> 16)) { - if (!str) return "(null)"; res = get_temp_buffer( 6 ); sprintf( res, "#%04x", LOWORD(str) ); return res; } - if (n == -1) - { - const WCHAR *end = str; - while (*end) end++; - n = end - str; - } - if (n < 0) n = 0; - size = 12 + min( 300, n * 5 ); - dst = res = get_temp_buffer( size ); + if (n == -1) for (n = 0; str[n]; n++) ; *dst++ = 'L'; *dst++ = '"'; - while (n-- > 0 && dst <= res + size - 10) + while (n-- > 0 && dst <= buffer + sizeof(buffer) - 10) { WCHAR c = *str++; switch (c) @@ -668,14 +661,15 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) case '"': *dst++ = '\\'; *dst++ = '"'; break; case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: - if (c >= ' ' && c <= 126) - *dst++ = (char)c; - else + if (c < ' ' || c >= 127) { *dst++ = '\\'; - sprintf(dst,"%04x",c); - dst+=4; + *dst++ = hex[(c >> 12) & 0x0f]; + *dst++ = hex[(c >> 8) & 0x0f]; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; } + else *dst++ = (char)c; } } *dst++ = '"'; @@ -685,8 +679,10 @@ const char *wine_dbgstr_wn( const WCHAR *str, intptr_t n ) *dst++ = '.'; *dst++ = '.'; } - *dst++ = 0; - release_temp_buffer( res, dst - res ); + *dst = 0; + + res = get_temp_buffer(strlen(buffer + 1)); + strcpy(res, buffer); return res; }