[PATCH 0/2] MR2233: jsproxy/tests: InternetInitializeAutoProxyDll() is no longer supported on Windows 11.

[Francois Gouget (＠fgouget)]

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

[PATCH 1/2] jsproxy/tests: InternetInitializeAutoProxyDll() is no longer supported on Windows 11.

[Francois Gouget]

From: Francois Gouget <fgouget(a)codeweavers.com>

The same goes for InternetGetProxyInfo(). They seem to have been
replaced with stubs that fail but don't bother setting the error code.
So just skip the tests when that happens.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54531
---
The Microsoft documentation does indicate that
*wininet*.InternetGetProxyInfo() has been deprecated for a while on
Windows 10 and is not supported on Windows 11. This test seems to
confirm it although it tests the jsproxy implementation and it extends
to InternetInitializeAutoProxyDll() too.
---
 dlls/jsproxy/tests/jsproxy.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c
index 59b3c5dfb9e..22a828b7e5a 100644
--- a/dlls/jsproxy/tests/jsproxy.c
+++ b/dlls/jsproxy/tests/jsproxy.c
@@ -49,6 +49,11 @@ static void test_InternetInitializeAutoProxyDll(void)
     ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
     err = GetLastError();
     ok( !ret, "unexpected success\n" );
+    if (!ret && err == 0xdeadbeef)
+    {
+        win_skip("InternetInitializeAutoProxyDll() is not supported on Windows 11\n");
+        return;
+    }
     ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
 
     buf.dwScriptBufferSize = strlen(script) + 1;
@@ -105,6 +110,11 @@ static void test_InternetGetProxyInfo(void)
     SetLastError( 0xdeadbeef );
     ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
     err = GetLastError();
+    if (!ret && err == 0xdeadbeef)
+    {
+        win_skip("InternetGetProxyInfo() is not supported on Windows 11\n");
+        return;
+    }
     ok( !ret, "unexpected success\n" );
     ok( err == ERROR_CAN_NOT_COMPLETE, "got %lu\n", err );
 
-- 
GitLab


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

[PATCH 2/2] jsproxy/tests: Add more tests for InternetGetProxyInfo()'s length parameter.

[Francois Gouget]

From: Francois Gouget <fgouget(a)codeweavers.com>

---
 dlls/jsproxy/tests/jsproxy.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c
index 22a828b7e5a..505d1a9398a 100644
--- a/dlls/jsproxy/tests/jsproxy.c
+++ b/dlls/jsproxy/tests/jsproxy.c
@@ -63,6 +63,7 @@ static void test_InternetInitializeAutoProxyDll(void)
     ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
     ok( ret, "got %lu\n", GetLastError() );
     ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
+    ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy );
     GlobalFree( proxy );
 
     buf.dwScriptBufferSize = strlen(script2) + 1;
@@ -73,6 +74,7 @@ static void test_InternetInitializeAutoProxyDll(void)
     ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
     ok( ret, "got %lu\n", GetLastError() );
     ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy );
+    ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy );
     GlobalFree( proxy );
 
     buf.dwScriptBufferSize = strlen(script2) + 2;
@@ -82,6 +84,7 @@ static void test_InternetInitializeAutoProxyDll(void)
     ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
     ok( ret, "got %lu\n", GetLastError() );
     ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy );
+    ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy );
     GlobalFree( proxy );
 
     buf.lpszScriptBuffer = script3;
-- 
GitLab

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