ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dplayx/tests: DirectPlay IPX support was removed in Vista. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2017-02-17 06:42:37 +00:00 committed by Alexandre Julliard
parent 82965692a0
commit 52d5e868f3
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/dplayx/tests/dplayx.c
View File

@ -893,7 +893,11 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType,
} }
else if ( IsEqualGUID( types[1], guidDataType ) ) else if ( IsEqualGUID( types[1], guidDataType ) )
{ {
todo_wine checkGuid( sps[ callbackData->dwCounter1 ], lpData ); BOOL found = FALSE;
int i;
for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ )
found = IsEqualGUID( sps[i], lpData );
ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) );
} }
callbackData->dwCounter2++; callbackData->dwCounter2++;
@ -957,14 +961,14 @@ static void test_EnumConnections(void)
hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
&callbackData, callbackData.dwFlags ); &callbackData, callbackData.dwFlags );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
check( 4, callbackData.dwCounter1 ); ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 );
callbackData.dwCounter1 = 0; callbackData.dwCounter1 = 0;
callbackData.dwFlags = 0; callbackData.dwFlags = 0;
hr = IDirectPlayX_EnumConnections( pDP, NULL, EnumConnections_cb, hr = IDirectPlayX_EnumConnections( pDP, NULL, EnumConnections_cb,
&callbackData, callbackData.dwFlags ); &callbackData, callbackData.dwFlags );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
check( 4, callbackData.dwCounter1 ); ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 );
callbackData.dwCounter1 = 0; callbackData.dwCounter1 = 0;
callbackData.dwFlags = 0; callbackData.dwFlags = 0;
@ -980,7 +984,7 @@ static void test_EnumConnections(void)
hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
&callbackData, callbackData.dwFlags ); &callbackData, callbackData.dwFlags );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
check( 4, callbackData.dwCounter1 ); ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 );
callbackData.dwCounter1 = 0; callbackData.dwCounter1 = 0;
callbackData.dwFlags = DPCONNECTION_DIRECTPLAYLOBBY; callbackData.dwFlags = DPCONNECTION_DIRECTPLAYLOBBY;
@ -995,7 +999,7 @@ static void test_EnumConnections(void)
hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
&callbackData, callbackData.dwFlags ); &callbackData, callbackData.dwFlags );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
check( 4, callbackData.dwCounter1 ); ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 );
callbackData.dwCounter1 = 0; callbackData.dwCounter1 = 0;
callbackData.dwFlags = ~( DPCONNECTION_DIRECTPLAY | callbackData.dwFlags = ~( DPCONNECTION_DIRECTPLAY |
@ -1094,7 +1098,7 @@ static void test_GetCaps(void)
{ {
hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags );
checkHR( DP_OK, hr ); todo_wine checkHR( DP_OK, hr );
if ( hr == DP_OK ) if ( hr == DP_OK )
@ -6890,20 +6894,19 @@ START_TEST(dplayx)
test_COM(); test_COM();
test_COM_dplobby(); test_COM_dplobby();
test_EnumerateProviders(); test_EnumerateProviders();
test_DirectPlayCreate();
test_EnumConnections();
test_InitializeConnection();
test_GetCaps();
if (!winetest_interactive) if (!winetest_interactive)
{ {
skip("Run in interactive mode to run dplayx tests.\n"); skip("Run in interactive mode to run all dplayx tests.\n");
return; return;
} }
trace("Running in interactive mode, tests will take a while\n"); trace("Running in interactive mode, tests will take a while\n");
test_DirectPlayCreate();
test_EnumConnections();
test_InitializeConnection();
test_GetCaps();
/* test_Open() takes almost a minute, */ /* test_Open() takes almost a minute, */
test_Open(); test_Open();
/* test_EnumSession takes three minutes */ /* test_EnumSession takes three minutes */