August 2008 - Wine-Commits - list.winehq.org

Ismael Barros : dplayx: Tests for GetPlayerCaps.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: c50a626aa1d044cd751aee40dbd7f3bad976cd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50a626aa1d044cd751aee40d… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:14 2008 +0200 dplayx: Tests for GetPlayerCaps. --- dlls/dplayx/tests/dplayx.c | 161 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 7cac4b5..499fb8b 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1926,6 +1926,166 @@ static void test_CreatePlayer(void) } +/* GetPlayerCaps */ + +static void test_GetPlayerCaps(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2]; + HRESULT hr; + UINT i; + + DPCAPS playerCaps; + DWORD dwFlags; + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.dwMaxPlayers = 10; + + ZeroMemory( &playerCaps, sizeof(DPCAPS) ); + + + /* Uninitialized service provider */ + playerCaps.dwSize = 0; + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + checkHR( DPERR_UNINITIALIZED, hr ); + + playerCaps.dwSize = sizeof(DPCAPS); + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + checkHR( DPERR_UNINITIALIZED, hr ); + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* No session */ + playerCaps.dwSize = 0; + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + if ( hr == DPERR_UNINITIALIZED ) + { + skip( "GetPlayerCaps not implemented\n" ); + return; + } + + playerCaps.dwSize = sizeof(DPCAPS); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 2, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + checkHR( DP_OK, hr ); + + for (i=0; i<2; i++) + { + hr = IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + } + + + /* Uninitialized playerCaps */ + playerCaps.dwSize = 0; + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 2, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + + /* Invalid player */ + playerCaps.dwSize = sizeof(DPCAPS); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 0, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], 2, &playerCaps, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[0], &playerCaps, 0 ); + checkHR( DP_OK, hr ); + + + /* Regular parameters */ + for (i=0; i<2; i++) + { + for (dwFlags=0; + dwFlags<=DPGETCAPS_GUARANTEED; + dwFlags+=DPGETCAPS_GUARANTEED) + { + + hr = IDirectPlayX_GetPlayerCaps( pDP[0], dpid[i], + &playerCaps, dwFlags ); + checkHR( DP_OK, hr ); + + + check( sizeof(DPCAPS), playerCaps.dwSize ); + check( 40, playerCaps.dwSize ); + check( 0, playerCaps.dwMaxQueueSize ); + check( 0, playerCaps.dwHundredBaud ); + check( 0, playerCaps.dwLatency ); + check( 65536, playerCaps.dwMaxLocalPlayers ); + check( 20, playerCaps.dwHeaderLength ); + + if ( i == 0 ) + { + checkFlags( DPCAPS_ISHOST | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED | + DPCAPS_ASYNCSUPPORTED | + DPPLAYERCAPS_LOCAL, + playerCaps.dwFlags, FLAGS_DPCAPS ); + } + else + checkFlags( DPCAPS_ISHOST | + DPCAPS_GUARANTEEDOPTIMIZED | + DPCAPS_GUARANTEEDSUPPORTED | + DPCAPS_ASYNCSUPPORTED, + playerCaps.dwFlags, FLAGS_DPCAPS ); + + if ( dwFlags == DPGETCAPS_GUARANTEED ) + { + check( 1048547, playerCaps.dwMaxBufferSize ); + check( 64, playerCaps.dwMaxPlayers ); + } + else + { + check( 65479, playerCaps.dwMaxBufferSize ); + check( 65536, playerCaps.dwMaxPlayers ); + } + + } + } + + + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -1941,6 +2101,7 @@ START_TEST(dplayx) test_SessionDesc(); test_CreatePlayer(); + test_GetPlayerCaps(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for CreatePlayer.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 724f0ea4d6bab954b9840a19e55eaa790028ab89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724f0ea4d6bab954b9840a19e… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sun Aug 3 13:22:40 2008 +0200 dplayx: Tests for CreatePlayer. --- dlls/dplayx/dplay.c | 10 +++ dlls/dplayx/tests/dplayx.c | 169 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 468b439..b5f94d3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1611,6 +1611,11 @@ static HRESULT WINAPI DirectPlay2AImpl_CreatePlayer { IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; + if( lpidPlayer == NULL ) + { + return DPERR_INVALIDPARAMS; + } + if( dwFlags & DPPLAYER_SERVERPLAYER ) { *lpidPlayer = DPID_SERVERPLAYER; @@ -1630,6 +1635,11 @@ static HRESULT WINAPI DirectPlay2WImpl_CreatePlayer { IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; + if( lpidPlayer == NULL ) + { + return DPERR_INVALIDPARAMS; + } + if( dwFlags & DPPLAYER_SERVERPLAYER ) { *lpidPlayer = DPID_SERVERPLAYER; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index ac9da5d..7cac4b5 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1759,6 +1759,173 @@ static void test_SessionDesc(void) } +/* CreatePlayer */ + +static void test_CreatePlayer(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPNAME name; + DPID dpid; + HRESULT hr; + + + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[0] ); + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[1] ); + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + ZeroMemory( &name, sizeof(DPNAME) ); + + + /* Connection not initialized */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, 0, 0 ); + checkHR( DPERR_UNINITIALIZED, hr ); + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* Session not open */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, 0, 0 ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + if ( hr == DPERR_UNINITIALIZED ) + { + skip( "CreatePlayer not implemented\n" ); + return; + } + + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + + + /* Player name */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + + name.dwSize = -1; + + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, &name, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + + name.dwSize = sizeof(DPNAME); + name.lpszShortNameA = (LPSTR) "test"; + name.lpszLongNameA = NULL; + + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, &name, NULL, NULL, + 0, 0 ); + checkHR( DP_OK, hr ); + + + /* Null dpid */ + hr = IDirectPlayX_CreatePlayer( pDP[0], NULL, NULL, NULL, NULL, + 0, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + + /* There can only be one server player */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + check( DPID_SERVERPLAYER, dpid ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DPERR_CANTCREATEPLAYER, hr ); + + IDirectPlayX_DestroyPlayer( pDP[0], dpid ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + check( DPID_SERVERPLAYER, dpid ); + IDirectPlayX_DestroyPlayer( pDP[0], dpid ); + + + /* Flags */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + check( DPID_SERVERPLAYER, dpid ); + IDirectPlayX_DestroyPlayer( pDP[0], dpid ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SPECTATOR ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, ( DPPLAYER_SERVERPLAYER | + DPPLAYER_SPECTATOR ) ); + checkHR( DP_OK, hr ); + check( DPID_SERVERPLAYER, dpid ); + IDirectPlayX_DestroyPlayer( pDP[0], dpid ); + + + /* Session with DPSESSION_NEWPLAYERSDISABLED */ + IDirectPlayX_Close( pDP[0] ); + dpsd.dwFlags = DPSESSION_NEWPLAYERSDISABLED; + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + checkHR( DP_OK, hr ); + + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, 0 ); + checkHR( DPERR_CANTCREATEPLAYER, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DPERR_CANTCREATEPLAYER, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SPECTATOR ); + checkHR( DPERR_CANTCREATEPLAYER, hr ); + + + /* Creating players in a Client/Server session */ + IDirectPlayX_Close( pDP[0] ); + dpsd.dwFlags = DPSESSION_CLIENTSERVER; + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + checkHR( DP_OK, hr ); + + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, 0 ); + checkHR( DPERR_ACCESSDENIED, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + check( DPID_SERVERPLAYER, dpid ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid, NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DPERR_INVALIDFLAGS, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid, NULL, NULL, NULL, + 0, 0 ); + checkHR( DP_OK, hr ); + + + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -1773,5 +1940,7 @@ START_TEST(dplayx) test_EnumSessions(); test_SessionDesc(); + test_CreatePlayer(); + CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for Get/SetSessionDesc.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: bd22a57cd1a03d4cba5278b8f556bbe35422b343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd22a57cd1a03d4cba5278b8f… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:03 2008 +0200 dplayx: Tests for Get/SetSessionDesc. --- dlls/dplayx/tests/dplayx.c | 285 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 285 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd22a57cd1a03d4cba527…

1 0

Ismael Barros : dplayx: Tests for EnumSessions.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: fbc5512ee0ad3fd5488dc08769ca6ab5f35b72c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc5512ee0ad3fd5488dc0876… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:51:59 2008 +0200 dplayx: Tests for EnumSessions. --- dlls/dplayx/dplay.c | 4 + dlls/dplayx/tests/dplayx.c | 438 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 442 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbc5512ee0ad3fd5488dc…

1 0

Ismael Barros : dplayx: Tests for Open.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: fa4b3e4d5380ac3ec732f044cce2f6091e5d4d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4b3e4d5380ac3ec732f044c… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:10 2008 +0200 dplayx: Tests for Open. --- dlls/dplayx/dplay.c | 15 ++++ dlls/dplayx/tests/dplayx.c | 168 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1ba7d7e..021f61d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2202,6 +2202,10 @@ static HRESULT WINAPI DP_IF_EnumSessions TRACE( "(%p)->(%p,0x%08x,%p,%p,0x%08x,%u)\n", This, lpsd, dwTimeout, lpEnumSessionsCallback2, lpContext, dwFlags, bAnsi ); + if( This->dp2->connectionInitialized == NO_PROVIDER ) + { + return DPERR_UNINITIALIZED; + } /* Can't enumerate if the interface is already open */ if( This->dp2->bConnectionOpen ) @@ -2828,6 +2832,17 @@ static HRESULT WINAPI DP_SecureOpen FIXME( "(%p)->(%p,0x%08x,%p,%p): partial stub\n", This, lpsd, dwFlags, lpSecurity, lpCredentials ); + if( This->dp2->connectionInitialized == NO_PROVIDER ) + { + return DPERR_UNINITIALIZED; + } + + if( lpsd->dwSize != sizeof(DPSESSIONDESC2) ) + { + TRACE( ": rejecting invalid dpsd size (%d).\n", lpsd->dwSize ); + return DPERR_INVALIDPARAMS; + } + if( This->dp2->bConnectionOpen ) { TRACE( ": rejecting already open connection.\n" ); diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 5dccfe1..21ff891 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -871,6 +871,173 @@ static void test_GetCaps(void) IDirectPlayX_Release( pDP ); } +/* Open */ + +static BOOL FAR PASCAL EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, + LPDWORD lpdwTimeOut, + DWORD dwFlags, + LPVOID lpContext ) +{ + LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + DPSESSIONDESC2 dpsd; + HRESULT hr; + + if (dwFlags & DPESC_TIMEDOUT) + return FALSE; + + + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.guidInstance = lpThisSD->guidInstance; + + if ( lpThisSD->dwFlags & DPSESSION_PASSWORDREQUIRED ) + { + /* Incorrect password */ + dpsd.lpszPasswordA = (LPSTR) "sonic boom"; + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + checkHR( DPERR_INVALIDPASSWORD, hr ); + + /* Correct password */ + dpsd.lpszPasswordA = (LPSTR) "hadouken"; + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + checkHR( DP_OK, hr ); + } + else + { + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + checkHR( DP_OK, hr ); + } + + hr = IDirectPlayX_Close( pDP ); + checkHR( DP_OK, hr ); + + return TRUE; +} + +static void test_Open(void) +{ + + LPDIRECTPLAY4 pDP, pDP_server; + DPSESSIONDESC2 dpsd, dpsd_server; + HRESULT hr; + + + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP_server ); + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP ); + ZeroMemory( &dpsd_server, sizeof(DPSESSIONDESC2) ); + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + + /* Service provider not initialized */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + init_TCPIP_provider( pDP_server, "127.0.0.1", 0 ); + init_TCPIP_provider( pDP, "127.0.0.1", 0 ); + + /* Uninitialized dpsd */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + + dpsd_server.dwSize = sizeof(DPSESSIONDESC2); + dpsd_server.guidApplication = appGuid; + dpsd_server.dwMaxPlayers = 10; + + + /* Regular operation */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + /* Opening twice */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + + /* Session flags */ + IDirectPlayX_Close( pDP_server ); + + dpsd_server.dwFlags = DPSESSION_CLIENTSERVER | DPSESSION_MIGRATEHOST; + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDFLAGS, hr ); + + dpsd_server.dwFlags = DPSESSION_MULTICASTSERVER | DPSESSION_MIGRATEHOST; + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDFLAGS, hr ); + + dpsd_server.dwFlags = DPSESSION_SECURESERVER | DPSESSION_MIGRATEHOST; + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDFLAGS, hr ); + + + /* Joining sessions */ + /* - Checking how strict dplay is with sizes */ + dpsd.dwSize = 0; + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + dpsd.dwSize = sizeof(DPSESSIONDESC2)-1; + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + dpsd.dwSize = sizeof(DPSESSIONDESC2)+1; + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + dpsd.dwSize = sizeof(DPSESSIONDESC2); + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + todo_wine checkHR( DPERR_NOSESSIONS, hr ); /* Only checks for size, not guids */ + + + dpsd.guidApplication = appGuid; + dpsd.guidInstance = appGuid; + + + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN ); + todo_wine checkHR( DPERR_NOSESSIONS, hr ); + hr = IDirectPlayX_Open( pDP, &dpsd, DPOPEN_JOIN | DPOPEN_CREATE ); + todo_wine checkHR( DPERR_NOSESSIONS, hr ); /* Second flag is ignored */ + + dpsd_server.dwFlags = 0; + + + /* Join to normal session */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb2, pDP, 0 ); + + + /* Already initialized session */ + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_ALREADYINITIALIZED, hr ); + + + /* Checking which is the error checking order */ + dpsd_server.dwSize = 0; + + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DPERR_INVALIDPARAMS, hr ); + + dpsd_server.dwSize = sizeof(DPSESSIONDESC2); + + + /* Join to protected session */ + IDirectPlayX_Close( pDP_server ); + dpsd_server.lpszPasswordA = (LPSTR) "hadouken"; + hr = IDirectPlayX_Open( pDP_server, &dpsd_server, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb2, + pDP, DPENUMSESSIONS_PASSWORDREQUIRED ); + + + IDirectPlayX_Release( pDP ); + IDirectPlayX_Release( pDP_server ); + +} + START_TEST(dplayx) { @@ -881,6 +1048,7 @@ START_TEST(dplayx) test_InitializeConnection(); test_GetCaps(); + test_Open(); CoUninitialize(); }

1 0

Detlef Riekenberg : shlwapi/tests: Fix istream tests on win9x (GetTempPathW ).
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 139c214661fc655cb5d1c6b5d1f0b71150a1f44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=139c214661fc655cb5d1c6b5d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 3 22:08:23 2008 +0200 shlwapi/tests: Fix istream tests on win9x (GetTempPathW). --- dlls/shlwapi/tests/istream.c | 56 ++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 05a0e5a..6aa4f54 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -209,8 +209,12 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) /* invalid arguments */ stream = NULL; + /* NT: ERROR_PATH_NOT_FOUND, 9x: ERROR_BAD_PATHNAME */ ret = (*pSHCreateStreamOnFileA)(NULL, mode | stgm, &stream); - ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), got 0x%08x\n", ret); + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || + ret == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), + "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)" + "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); #if 0 /* This test crashes on WinXP SP2 */ @@ -290,13 +294,15 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) HRESULT ret; ULONG refcount; WCHAR test_file[MAX_PATH]; - static const WCHAR testW_txt[] = { '\\', 't', 'e', 's', 't', 'W', '.', 't', 'x', 't', '\0' }; + CHAR test_fileA[MAX_PATH]; + static const CHAR testW_txt[] = "\\testW.txt"; trace("SHCreateStreamOnFileW: testing mode %d, STGM flags %08x\n", mode, stgm); /* Don't used a fixed path for the testW.txt file */ - GetTempPathW(MAX_PATH, test_file); - lstrcatW(test_file, testW_txt); + GetTempPathA(MAX_PATH, test_fileA); + lstrcatA(test_fileA, testW_txt); + MultiByteToWideChar(CP_ACP, 0, test_fileA, -1, test_file, MAX_PATH); /* invalid arguments */ @@ -373,7 +379,9 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileW: expected 0, got %d\n", refcount); - ok(DeleteFileW(test_file), "SHCreateStreamOnFileW: could not delete the test file, got error %d\n", GetLastError()); + ok(DeleteFileA(test_fileA), + "SHCreateStreamOnFileW: could not delete the test file, got error %d\n", + GetLastError()); } } @@ -385,13 +393,15 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) HRESULT ret; ULONG refcount; WCHAR test_file[MAX_PATH]; - static const WCHAR testEx_txt[] = { '\\', 't', 'e', 's', 't', 'E','x', '.', 't', 'x', 't', '\0' }; + CHAR test_fileA[MAX_PATH]; + static const CHAR testEx_txt[] = "\\testEx.txt"; trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); /* Don't used a fixed path for the testEx.txt file */ - GetTempPathW(MAX_PATH, test_file); - lstrcatW(test_file, testEx_txt); + GetTempPathA(MAX_PATH, test_fileA); + lstrcatA(test_fileA, testEx_txt); + MultiByteToWideChar(CP_ACP, 0, test_fileA, -1, test_file, MAX_PATH); /* invalid arguments */ @@ -404,7 +414,11 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode, 0, FALSE, template, &stream); - ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok( ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or " + "HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); #if 0 /* This test crashes on WinXP SP2 */ @@ -425,12 +439,22 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) return; } } else { - ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok( ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or " + "HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), got 0x%08x\n", ret); } ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, TRUE, NULL, &stream); + /* not supported on win9x */ + if (broken(ret == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER) && stream == NULL)) { + skip("Not supported\n"); + DeleteFileA(test_fileA); + return; + } + ok(ret == S_OK, "SHCreateStreamOnFileEx: expected S_OK, got 0x%08x\n", ret); ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); @@ -440,7 +464,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); - ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); + ok(DeleteFileA(test_fileA), + "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); } stream = NULL; @@ -454,7 +480,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) refcount = IStream_Release(stream); ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); - ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); + ok(DeleteFileA(test_fileA), + "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); } stream = NULL; @@ -514,7 +542,9 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ok(refcount == 0, "SHCreateStreamOnFileEx: expected 0, got %d\n", refcount); } - ok(DeleteFileW(test_file), "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", GetLastError()); + ok(DeleteFileA(test_fileA), + "SHCreateStreamOnFileEx: could not delete the test file, got error %d\n", + GetLastError()); }

1 0

Detlef Riekenberg : shell32/tests: Fix shelllink test on win9x ( GetTempPathW).
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: da0604bebde9b18cd1b56950b6819520e49204f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0604bebde9b18cd1b56950b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 3 22:38:32 2008 +0200 shell32/tests: Fix shelllink test on win9x (GetTempPathW). --- dlls/shell32/tests/shelllink.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 710920d..47aa659 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -497,8 +497,6 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) static void test_load_save(void) { WCHAR lnkfile[MAX_PATH]; - static const WCHAR lnkfile_name[] = { '\\', 't', 'e', 's', 't', '.', 'l', 'n', 'k', '\0' }; - char lnkfileA[MAX_PATH]; static const char lnkfileA_name[] = "\\test.lnk"; @@ -517,10 +515,9 @@ static void test_load_save(void) } /* Don't used a fixed path for the test.lnk file */ - GetTempPathW(MAX_PATH, lnkfile); - lstrcatW(lnkfile, lnkfile_name); GetTempPathA(MAX_PATH, lnkfileA); lstrcatA(lnkfileA, lnkfileA_name); + MultiByteToWideChar(CP_ACP, 0, lnkfileA, -1, lnkfile, MAX_PATH); /* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc));

1 0

Damjan Jovanovic : shdocvw: Rudimentary implementation of CLSID_InternetShortcut.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: ad886d66984b269ce0c90b0a08a2d6eedbffdcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad886d66984b269ce0c90b0a0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 3 11:18:26 2008 +0200 shdocvw: Rudimentary implementation of CLSID_InternetShortcut. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/factory.c | 4 + dlls/shdocvw/intshcut.c | 432 ++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 32 +++ dlls/shdocvw/tests/Makefile.in | 1 + dlls/shdocvw/tests/intshcut.c | 225 +++++++++++++++++++++ 6 files changed, 695 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad886d66984b269ce0c90…

1 0

Andrew Talbot : fusion: Sign-compare warnings fix.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: 5f6d8da932df1bea81a5100a22073f1cff4d1f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6d8da932df1bea81a5100a2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 2 22:09:45 2008 +0100 fusion: Sign-compare warnings fix. --- dlls/fusion/assembly.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 240c47c..ec86fd3 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -747,7 +747,7 @@ static LPSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) { BYTE *ptr; - ULONG offset; + LONG offset; DWORD stridx; offset = assembly->tables[TableFromToken(mdtAssembly)].offset; @@ -839,7 +839,7 @@ static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) static void bytes_to_str(BYTE *bytes, DWORD len, LPSTR str) { - int i; + DWORD i; static const char hexval[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' @@ -859,7 +859,8 @@ static void bytes_to_str(BYTE *bytes, DWORD len, LPSTR str) HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) { ASSEMBLYTABLE *asmtbl; - ULONG i, offset, size; + ULONG i, size; + LONG offset; BYTE *hashdata; HCRYPTPROV crypt; HCRYPTHASH hash;

1 0

Nikolay Sivov : gdiplus: Implemented GdipAddPathClosedCurve/ GdipAddPathClosedCurveI.
by Alexandre Julliard Aug. 4, 2008

Aug. 4, 2008

Module: wine Branch: master Commit: a36c2e75339e625df67cc5302b966dfbab0a0581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36c2e75339e625df67cc5302… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 3 02:45:28 2008 +0400 gdiplus: Implemented GdipAddPathClosedCurve/GdipAddPathClosedCurveI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphicspath.c | 12 ++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 55f87ba..18e7eeb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -6,8 +6,8 @@ @ stdcall GdipAddPathBeziersI(ptr ptr long) @ stdcall GdipAddPathClosedCurve2(ptr ptr long long) @ stdcall GdipAddPathClosedCurve2I(ptr ptr long long) -@ stub GdipAddPathClosedCurve -@ stub GdipAddPathClosedCurveI +@ stdcall GdipAddPathClosedCurve(ptr ptr long) +@ stdcall GdipAddPathClosedCurveI(ptr ptr long) @ stdcall GdipAddPathCurve2(ptr ptr long long) @ stdcall GdipAddPathCurve2I(ptr ptr long long) @ stub GdipAddPathCurve3 diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 23dce9d..136afe7 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -196,6 +196,18 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, return ret; } +GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath *path, GDIPCONST GpPointF *points, + INT count) +{ + return GdipAddPathClosedCurve2(path, points, count, 1.0); +} + +GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *points, + INT count) +{ + return GdipAddPathClosedCurve2I(path, points, count, 1.0); +} + GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, REAL tension) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2cc732f..dc938ac 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -246,6 +246,8 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL,REAL GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipAddPathCurve(GpPath*,GDIPCONST GpPointF*,INT);

1 0