[PATCH 0/1] MR2042: winhttp/tests: Fix test failures with the UTF-8 code page.

[Hans Leidekker (＠hans)]

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52936

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2042

[PATCH 1/1] winhttp/tests: Fix test failures with the UTF-8 code page.

[Hans Leidekker]

From: Hans Leidekker <hans(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52936
---
 dlls/winhttp/tests/url.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c
index da51117e41e..fadf8b850ca 100644
--- a/dlls/winhttp/tests/url.c
+++ b/dlls/winhttp/tests/url.c
@@ -304,8 +304,8 @@ static void WinHttpCreateUrl_test( void )
     SetLastError( 0xdeadbeef );
     ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len );
     err = GetLastError();
-    ok( !ret, "expected failure\n" );
-    ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
+    ok( !ret || GetACP() == CP_UTF8, "expected failure\n" );
+    ok( err == ERROR_INVALID_PARAMETER || (!err && GetACP() == CP_UTF8), "got %lu\n", err );
 
     /* extra info with Unicode characters, no ICU_ESCAPE */
     memset( &uc, 0, sizeof(uc) );
@@ -344,8 +344,8 @@ static void WinHttpCreateUrl_test( void )
     SetLastError( 0xdeadbeef );
     ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len );
     err = GetLastError();
-    ok( !ret, "expected failure\n" );
-    ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
+    ok( !ret || GetACP() == CP_UTF8, "expected failure\n" );
+    ok( err == ERROR_INVALID_PARAMETER || (!err && GetACP() == CP_UTF8), "got %lu\n", err );
 
     /* path with Unicode characters, no ICU_ESCAPE */
     memset( &uc, 0, sizeof(uc) );
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2042