Skip to content

W
wine-winehq
Commit 20ca4e9a authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dhcpcsvc/tests: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 56681b53
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
dlls/dhcpcsvc/tests/Makefile.in
View file @ 20ca4e9a
EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = dhcpcsvc.dll
IMPORTS = dhcpcsvc iphlpapi
......
dlls/dhcpcsvc/tests/dhcpcsvc.c
View file @ 20ca4e9a
......@@ -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;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment