Eric Pouech : jsproxy/tests: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Mon Feb 28 15:50:23 CST 2022
Module: wine
Branch: master
Commit: 510542bdefea5f9a11ec5a18ce32917e4c441407
URL: https://source.winehq.org/git/wine.git/?a=commit;h=510542bdefea5f9a11ec5a18ce32917e4c441407
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Feb 28 08:27:21 2022 +0100
jsproxy/tests: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/jsproxy/tests/Makefile.in | 1 -
dlls/jsproxy/tests/jsproxy.c | 42 +++++++++++++++++++++---------------------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/dlls/jsproxy/tests/Makefile.in b/dlls/jsproxy/tests/Makefile.in
index 216fbb34cd9..356947694d3 100644
--- a/dlls/jsproxy/tests/Makefile.in
+++ b/dlls/jsproxy/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = jsproxy.dll
IMPORTS = jsproxy
diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c
index d1c905c2e99..59b3c5dfb9e 100644
--- a/dlls/jsproxy/tests/jsproxy.c
+++ b/dlls/jsproxy/tests/jsproxy.c
@@ -49,48 +49,48 @@ static void test_InternetInitializeAutoProxyDll(void)
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
err = GetLastError();
ok( !ret, "unexpected success\n" );
- ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err );
+ ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
buf.dwScriptBufferSize = strlen(script) + 1;
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
GlobalFree( proxy );
buf.dwScriptBufferSize = strlen(script2) + 1;
buf.lpszScriptBuffer = script2;
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy );
GlobalFree( proxy );
buf.dwScriptBufferSize = strlen(script2) + 2;
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy );
GlobalFree( proxy );
buf.lpszScriptBuffer = script3;
buf.dwScriptBufferSize = strlen(script3);
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret || broken(old_jsproxy && !ret), "got %u\n", GetLastError() );
+ ok( ret || broken(old_jsproxy && !ret), "got %lu\n", GetLastError() );
buf.dwScriptBufferSize = 1;
script3[0] = 0;
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ret = pInternetDeInitializeAutoProxyDll( NULL, 0 );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
}
static void test_InternetGetProxyInfo(void)
@@ -106,48 +106,48 @@ static void test_InternetGetProxyInfo(void)
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
err = GetLastError();
ok( !ret, "unexpected success\n" );
- ok( err == ERROR_CAN_NOT_COMPLETE, "got %u\n", err );
+ ok( err == ERROR_CAN_NOT_COMPLETE, "got %lu\n", err );
buf.dwStructSize = sizeof(buf);
buf.lpszScriptBuffer = script;
buf.dwScriptBufferSize = strlen(script) + 1;
ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
len = 0;
proxy = NULL;
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
- ok( len == strlen("DIRECT") + 1, "got %u\n", len );
+ ok( len == strlen("DIRECT") + 1, "got %lu\n", len );
GlobalFree( proxy );
len = 0;
proxy = NULL;
ret = pInternetGetProxyInfo( url, strlen(url) + 1, host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
- ok( len == strlen("DIRECT") + 1, "got %u\n", len );
+ ok( len == strlen("DIRECT") + 1, "got %lu\n", len );
GlobalFree( proxy );
len = 0;
proxy = NULL;
ret = pInternetGetProxyInfo( url, strlen(url) - 1, host, strlen(host), &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
- ok( len == strlen("DIRECT") + 1, "got %u\n", len );
+ ok( len == strlen("DIRECT") + 1, "got %lu\n", len );
GlobalFree( proxy );
len = 0;
proxy = NULL;
ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host) + 1, &proxy, &len );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy );
- ok( len == strlen("DIRECT") + 1, "got %u\n", len );
+ ok( len == strlen("DIRECT") + 1, "got %lu\n", len );
GlobalFree( proxy );
ret = pInternetDeInitializeAutoProxyDll( NULL, 0 );
- ok( ret, "got %u\n", GetLastError() );
+ ok( ret, "got %lu\n", GetLastError() );
}
START_TEST(jsproxy)
More information about the wine-cvs
mailing list