Module: wine Branch: master Commit: 20ca4e9a06442fa1865a8f63a2bdfc6aa3404399 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ca4e9a06442fa1865a8f63a...
Author: Eric Pouech eric.pouech@gmail.com Date: Thu Feb 24 11:27:45 2022 +0100
dhcpcsvc/tests: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dhcpcsvc/tests/Makefile.in | 1 - dlls/dhcpcsvc/tests/dhcpcsvc.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/dhcpcsvc/tests/Makefile.in b/dlls/dhcpcsvc/tests/Makefile.in index 1f1e6acb7ce..47440eb2cd4 100644 --- a/dlls/dhcpcsvc/tests/Makefile.in +++ b/dlls/dhcpcsvc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dhcpcsvc.dll IMPORTS = dhcpcsvc iphlpapi
diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 547fb515329..52b1b150ad8 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -56,24 +56,24 @@ static void test_DhcpRequestParams(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - trace( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled ); + trace( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(ptr->Description), ptr->IfType, ptr->Dhcpv4Enabled );
if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue;
memset( &send_params, 0, sizeof(send_params) ); memset( &recv_params, 0, sizeof(recv_params) ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, NULL, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, nosuchW, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, NULL, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
size = 0; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, NULL, &size, NULL ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err );
memset( params, 0, sizeof(params) ); params[0].OptionId = OPTION_SUBNET_MASK; @@ -106,8 +106,8 @@ static void test_DhcpRequestParams(void) case OPTION_BROADCAST_ADDRESS: if (params[i].Data) { - ok( params[i].nBytesData == sizeof(DWORD), "got %u\n", params[i].nBytesData ); - trace( "%u: Data %p (%08x) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + ok( params[i].nBytesData == sizeof(DWORD), "got %lu\n", params[i].nBytesData ); + trace( "%lu: Data %p (%08lx) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, *(DWORD *)params[i].Data, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); } @@ -120,14 +120,14 @@ static void test_DhcpRequestParams(void) char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; - trace( "%u: Data %p (%s) nBytesData %u OptionId %u Flags %08x IsVendor %d\n", + trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); HeapFree( GetProcessHeap(), 0, str ); } break; default: - ok( 0, "unexpected option %u\n", params[i].OptionId ); + ok( 0, "unexpected option %lu\n", params[i].OptionId ); break; } }