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

dplayx: Fix some crashes and wine_todo's.

This commit is contained in:
Alistair Leslie-Hughes 2014-09-25 15:05:40 +10:00 committed by Alexandre Julliard
parent 36c331f2e9
commit 60db3a4a86
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,7 +685,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W
} }
hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 );
todo_wine checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
HeapFree( GetProcessHeap(), 0, pAddress ); HeapFree( GetProcessHeap(), 0, pAddress );
@ -743,7 +743,7 @@ static void test_DirectPlayCreate(void)
if ( hr == DP_OK ) if ( hr == DP_OK )
IDirectPlayX_Release( pDP ); IDirectPlayX_Release( pDP );
hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL );
todo_wine checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
if ( hr == DP_OK ) if ( hr == DP_OK )
IDirectPlayX_Release( pDP ); IDirectPlayX_Release( pDP );
@ -915,9 +915,9 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP,
if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) ) if( IsEqualGUID(lpguidSP, &DPSPGUID_TCPIP) )
{ {
hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 );
todo_wine checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 ); hr = IDirectPlayX_InitializeConnection( pDP, lpConnection, 0 );
todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); checkHR( DPERR_ALREADYINITIALIZED, hr );
} }
return TRUE; return TRUE;
@ -976,7 +976,7 @@ static void test_GetCaps(void)
{ {
hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags );
todo_wine checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
if ( hr == DP_OK ) if ( hr == DP_OK )
@ -1085,7 +1085,7 @@ static void test_Open(void)
/* Uninitialized dpsd */ /* Uninitialized dpsd */
hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE );
todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
dpsd_server.dwSize = sizeof(DPSESSIONDESC2); dpsd_server.dwSize = sizeof(DPSESSIONDESC2);
@ -1095,7 +1095,7 @@ static void test_Open(void)
/* Regular operation */ /* Regular operation */
hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE );
todo_wine checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
/* Opening twice */ /* Opening twice */
hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE );
@ -1698,12 +1698,16 @@ static void test_SessionDesc(void)
checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL ); hr = IDirectPlayX_GetSessionDesc( pDP[0], NULL, NULL );
checkHR( DPERR_INVALIDPARAM, hr ); checkHR( DPERR_INVALIDPARAM, hr );
if(0)
{
/* Crashes under Win7 */
hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL );
checkHR( DPERR_INVALIDPARAM, hr ); checkHR( DPERR_INVALIDPARAM, hr );
dwDataSize=-1; dwDataSize=-1;
hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize );
checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
check( -1, dwDataSize ); check( -1, dwDataSize );
}
/* Get: Insufficient buffer size */ /* Get: Insufficient buffer size */
dwDataSize=0; dwDataSize=0;
@ -2498,10 +2502,14 @@ static void test_PlayerName(void)
checkHR( DPERR_INVALIDPLAYER, hr ); checkHR( DPERR_INVALIDPLAYER, hr );
check( 1024, dwDataSize ); check( 1024, dwDataSize );
if(0)
{
/* Crashes under Win7 */
dwDataSize = -1; dwDataSize = -1;
hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize );
checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
check( -1, dwDataSize ); check( -1, dwDataSize );
}
hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL );
checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
@ -5789,6 +5797,9 @@ static void test_GetMessageQueue(void)
check( -1, dwNumBytes ); check( -1, dwNumBytes );
/* - Remote players */ /* - Remote players */
if(0)
{
/* Crash under Win7 */
dwNumMsgs = dwNumBytes = -1; dwNumMsgs = dwNumBytes = -1;
hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3], hr = IDirectPlayX_GetMessageQueue( pDP[0], 0, dpid[3],
DPMESSAGEQUEUE_RECEIVE, DPMESSAGEQUEUE_RECEIVE,
@ -5796,6 +5807,7 @@ static void test_GetMessageQueue(void)
checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */ checkHR( DPERR_INVALIDPLAYER, hr ); /* Player 3 is remote */
check( -1, dwNumMsgs ); check( -1, dwNumMsgs );
check( -1, dwNumBytes ); check( -1, dwNumBytes );
}
dwNumMsgs = dwNumBytes = -1; dwNumMsgs = dwNumBytes = -1;
hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0, hr = IDirectPlayX_GetMessageQueue( pDP[0], dpid[3], 0,