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

Aric Stewart : dinput: The DIK_ keycode is not the same as the scancode.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 304ff3c7280a53b7cbadfa83eaeda458ff5959d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304ff3c7280a53b7cbadfa83e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 6 08:04:36 2008 -0500 dinput: The DIK_ keycode is not the same as the scancode. It is mapped with the keyboard mapping to the resulting character so the key 'A' is DIK_A nomatter what its scancode or vkey would be. This is relevant to Japanese keymapping where the '@' key is in the '[' location the scancode for both is 0x22 but dinput generates DIK_AT in japanese and DIK_LBRACKET in us_qwerty. --- dlls/dinput/keyboard.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b2c4942..e0f76fa 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -50,6 +50,30 @@ struct SysKeyboardImpl BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; +static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) +{ + static const BYTE asciiCodes[] = + {/*32*/ DIK_SPACE,0,0,0,0,0,0,DIK_APOSTROPHE, \ + /*40*/ 0,0,0,0,DIK_COMMA,DIK_MINUS,DIK_PERIOD,DIK_SLASH, \ + /*48*/ DIK_0,DIK_1,DIK_2,DIK_3,DIK_4,DIK_5,DIK_6,DIK_7, \ + /*56*/ DIK_8,DIK_9,DIK_COLON,DIK_SEMICOLON,0,DIK_EQUALS,0,0, \ + /*64*/ DIK_AT,DIK_A,DIK_B,DIK_C,DIK_D,DIK_E,DIK_F,DIK_G, \ + /*72*/ DIK_H,DIK_I,DIK_J,DIK_K,DIK_L,DIK_M,DIK_N,DIK_O, \ + /*80*/ DIK_P,DIK_Q,DIK_R,DIK_S,DIK_T,DIK_U,DIK_V,DIK_W, \ + /*88*/ DIK_X,DIK_Y,DIK_Z,DIK_LBRACKET,0,DIK_RBRACKET,DIK_CIRCUMFLEX,DIK_UNDERLINE} /*95*/ ; + + BYTE out_code = 0; + WCHAR c = MapVirtualKeyW(vkCode,MAPVK_VK_TO_CHAR); + + if (c > 31 && c < 96) + out_code = asciiCodes[c - 32]; + + if (out_code == 0) + out_code = scanCode; + + return out_code; +} + static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)iface; @@ -63,7 +87,7 @@ static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); - dik_code = hook->scanCode & 0xff; + dik_code = map_dik_code(hook->scanCode & 0xff,hook->vkCode); /* R-Shift is special - it is an extended key with separate scan code */ if (hook->flags & LLKHF_EXTENDED && dik_code != 0x36) dik_code |= 0x80;

1 0

Andre Wisplinghoff : user32: Add a test for ToUnicode.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: ea49a06934ae81a63f8af172c5dcb49939551a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea49a06934ae81a63f8af172c… Author: Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> Date: Tue Aug 5 14:20:24 2008 +0200 user32: Add a test for ToUnicode. --- dlls/user32/tests/input.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 7227eb7..8d60d21 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1166,6 +1166,44 @@ static void test_key_map(void) } } +static void test_ToUnicode(void) +{ + WCHAR wStr[2]; + BYTE state[256]; + const BYTE SC_RETURN = 0x1c, SC_TAB = 0x0f; + const BYTE HIGHEST_BIT = 0x80; + int i, ret; + for(i=0; i<256; i++) + state[i]=0; + + SetLastError(0xdeadbeef); + ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("ToUnicode is not implemented\n"); + return; + } + + ok(ret == 1, "ToUnicode for Return key didn't return 1 (was %i)\n", ret); + if(ret == 1) + ok(wStr[0]=='\r', "ToUnicode for CTRL + Return was %i (expected 13)\n", wStr[0]); + state[VK_CONTROL] |= HIGHEST_BIT; + state[VK_LCONTROL] |= HIGHEST_BIT; + + ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); + todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + + ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); + ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)", ret); + if(ret == 1) + ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]); + + state[VK_SHIFT] |= HIGHEST_BIT; + state[VK_LSHIFT] |= HIGHEST_BIT; + ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); + todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); +} + START_TEST(input) { init_function_pointers(); @@ -1179,6 +1217,7 @@ START_TEST(input) test_keynames(); test_mouse_ll_hook(); test_key_map(); + test_ToUnicode(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Alistair Leslie-Hughes : ole32: Stop crash under w2k8.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 0a1a4f7ca8903e7aa827e6abec121d58f99b4b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1a4f7ca8903e7aa827e6abe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 6 14:51:03 2008 +1000 ole32: Stop crash under w2k8. --- dlls/ole32/tests/marshal.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index fba8b14..0443b63 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2337,20 +2337,23 @@ static void test_handler_marshaling(void) ok_ole_success(hr, "CoUnmarshalInterface"); IStream_Release(pStream); - ok_more_than_one_lock(); + if(hr == S_OK) + { + ok_more_than_one_lock(); - hr = IUnknown_QueryInterface(pProxy, &IID_IWineTest, (void **)&pObject); - ok(hr == E_NOINTERFACE, "IUnknown_QueryInterface with unknown IID should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + hr = IUnknown_QueryInterface(pProxy, &IID_IWineTest, (void **)&pObject); + ok(hr == E_NOINTERFACE, "IUnknown_QueryInterface with unknown IID should have returned E_NOINTERFACE instead of 0x%08x\n", hr); - /* it's a handler as it supports IOleObject */ - hr = IUnknown_QueryInterface(pProxy, &IID_IOleObject, (void **)&pObject); - todo_wine - ok_ole_success(hr, "IUnknown_QueryInterface(&IID_IOleObject)"); - if (SUCCEEDED(hr)) IUnknown_Release(pObject); + /* it's a handler as it supports IOleObject */ + hr = IUnknown_QueryInterface(pProxy, &IID_IOleObject, (void **)&pObject); + todo_wine + ok_ole_success(hr, "IUnknown_QueryInterface(&IID_IOleObject)"); + if (SUCCEEDED(hr)) IUnknown_Release(pObject); - IUnknown_Release(pProxy); + IUnknown_Release(pProxy); - ok_no_locks(); + ok_no_locks(); + } end_host_object(tid, thread);

1 0

Ismael Barros : dplayx: Tests for Receive.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 636bdd800c51374de0dd7ec0dd961be20fe79dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=636bdd800c51374de0dd7ec0d… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:42 2008 +0200 dplayx: Tests for Receive. --- dlls/dplayx/tests/dplayx.c | 283 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=636bdd800c51374de0dd7…

1 0

Ismael Barros : dplayx: Tests for checking remote data replication.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 063c1e6c9797b312f83a2ba9c7501635dbb9022c URL: http://source.winehq.org/git/wine.git/?a=commit;h=063c1e6c9797b312f83a2ba9c… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:32 2008 +0200 dplayx: Tests for checking remote data replication. --- dlls/dplayx/tests/dplayx.c | 228 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 228 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 93e93e4..4fdc494 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -5988,6 +5988,232 @@ static void test_GetMessageQueue(void) } +/* Remote data replication */ + +static void test_remote_data_replication(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2], idFrom, idTo; + CallbackData callbackData; + HRESULT hr; + UINT i, j; + DWORD dwFlags, dwDataSize = 1024; + DWORD dwCount; + + LPDPMSG_SETPLAYERORGROUPDATA lpData = HeapAlloc( GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwDataSize ); + + LPCSTR lpDataLocal[] = { "local_0", "local_1" }; + LPCSTR lpDataRemote[] = { "remote_0", "remote_1" }; + LPCSTR lpDataFake = "ugly_fake_data"; + LPSTR lpDataGet = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); + DWORD dwDataSizeLocal = strlen(lpDataLocal[0])+1, + dwDataSizeRemote = strlen(lpDataRemote[0])+1, + dwDataSizeFake = strlen(lpDataFake)+1, + dwDataSizeGet; + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + init_TCPIP_provider( pDP[i], "127.0.0.1", 0 ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + + /* Host */ + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + + if ( hr == DPERR_UNINITIALIZED ) + { + skip( "dplay not implemented enough for this test yet\n" ); + return; + } + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[0], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + /* Peer */ + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid[1], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + /* Check players */ + for (i=0; i<2; i++) + { + /* Local (0,0) (1,1) */ + IDirectPlayX_GetPlayerFlags( pDP[i], dpid[i], &dwFlags ); + checkFlags( DPPLAYER_LOCAL, dwFlags, FLAGS_DPPLAYER ); + /* Remote (0,1) (1,0) */ + IDirectPlayX_GetPlayerFlags( pDP[i], dpid[!i], &dwFlags ); + checkFlags( 0, dwFlags, FLAGS_DPPLAYER ); + } + + /* Set data for a local player */ + for (i=0; i<2; i++) + { + hr = IDirectPlayX_SetPlayerData( pDP[i], dpid[i], + (LPVOID) lpDataLocal[i], + dwDataSizeLocal, + DPSET_LOCAL ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_SetPlayerData( pDP[i], dpid[i], + (LPVOID) lpDataRemote[i], + dwDataSizeRemote, + DPSET_REMOTE ); + checkHR( DP_OK, hr ); + } + + /* Retrieve data locally (0->0, 1->1) */ + for (i=0; i<2; i++) + { + dwDataSizeGet = dwDataSizeFake; + strcpy( lpDataGet, lpDataFake ); + hr = IDirectPlayX_GetPlayerData( pDP[i], dpid[i], + lpDataGet, &dwDataSizeGet, + DPGET_LOCAL ); + checkHR( DP_OK, hr ); + check( dwDataSizeLocal, dwDataSizeGet ); + checkStr( lpDataLocal[i], lpDataGet ); + + dwDataSizeGet = dwDataSizeFake; + strcpy( lpDataGet, lpDataFake ); + hr = IDirectPlayX_GetPlayerData( pDP[i], dpid[i], + lpDataGet, &dwDataSizeGet, + DPGET_REMOTE ); + checkHR( DP_OK, hr ); + check( dwDataSizeRemote, dwDataSizeGet ); + checkStr( lpDataRemote[i], lpDataGet ); + } + + + /* Set data for a remote player */ + /* This should fail with DPERR_ACCESSDENIED, + but for some reason it doesn't */ + for (i=0; i<2; i++) + { + IDirectPlayX_SetPlayerData( pDP[i], dpid[!i], + (LPVOID) lpDataLocal[!i], + dwDataSizeLocal, + DPSET_LOCAL ); + checkHR( DP_OK, hr ); + IDirectPlayX_SetPlayerData( pDP[i], dpid[!i], + (LPVOID) lpDataRemote[!i], + dwDataSizeRemote, + DPSET_REMOTE ); + checkHR( DP_OK, hr ); + } + + /* Retrieve crossed data (0->1, 1->0) */ + for (i=0; i<2; i++) + { + dwDataSizeGet = dwDataSizeFake; + strcpy( lpDataGet, lpDataFake ); + hr = IDirectPlayX_GetPlayerData( pDP[i], dpid[!i], + lpDataGet, &dwDataSizeGet, + DPGET_LOCAL ); + checkHR( DP_OK, hr ); + check( dwDataSizeLocal, dwDataSizeGet ); + checkStr( lpDataLocal[!i], lpDataGet ); + + dwDataSizeGet = dwDataSizeFake; + strcpy( lpDataGet, lpDataFake ); + hr = IDirectPlayX_GetPlayerData( pDP[i], dpid[!i], + lpDataGet, &dwDataSizeGet, + DPGET_REMOTE ); + checkHR( DP_OK, hr ); + check( dwDataSizeRemote, dwDataSizeGet ); + checkStr( lpDataRemote[!i], lpDataGet ); + } + + + /* Purge "new player" messages from queue */ + hr = IDirectPlayX_Receive( pDP[0], &idFrom, &idTo, 0, + (LPVOID) lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + checkConv( DPSYS_CREATEPLAYERORGROUP, lpData->dwType, dpMsgType2str ); + + /* Check number of messages in queue */ + for (i=0; i<2; i++) + { + IDirectPlayX_GetMessageCount( pDP[i], dpid[i], &dwCount ); + check( 2, dwCount ); + IDirectPlayX_GetMessageCount( pDP[i], dpid[!i], &dwCount ); + check( 0, dwCount ); + } + + /* Checking system messages */ + for (i=0; i<2; i++) + { + for (j=0; j<2; j++) + { + hr = IDirectPlayX_Receive( pDP[i], &idFrom, &idTo, 0, + (LPVOID) lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 29, dwDataSize ); + check( DPID_SYSMSG, idFrom ); + check( dpid[i], idTo ); + checkConv( DPSYS_SETPLAYERORGROUPDATA, lpData->dwType, + dpMsgType2str ); + check( DPPLAYERTYPE_PLAYER, lpData->dwPlayerType ); + check( dpid[j], lpData->dpId ); + checkStr( lpDataRemote[j], (LPSTR) lpData->lpData ); + check( dwDataSizeRemote, lpData->dwDataSize ); + dwDataSize = 1024; + } + hr = IDirectPlayX_Receive( pDP[i], &idFrom, &idTo, 0, + lpData, &dwDataSize ); + checkHR( DPERR_NOMESSAGES, hr ); + } + + + /* Changing remote data */ + hr = IDirectPlayX_SetPlayerData( pDP[0], dpid[0], + (LPVOID) lpDataRemote[0], dwDataSizeRemote, + DPSET_REMOTE ); + checkHR( DP_OK, hr ); + + /* Checking system messages (j=0) */ + for (i=0; i<2; i++) + { + hr = IDirectPlayX_Receive( pDP[i], &idFrom, &idTo, 0, + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 29, dwDataSize ); + check( DPID_SYSMSG, idFrom ); + check( dpid[i], idTo ); + checkConv( DPSYS_SETPLAYERORGROUPDATA, lpData->dwType, dpMsgType2str ); + check( DPPLAYERTYPE_PLAYER, lpData->dwPlayerType ); + check( dpid[0], lpData->dpId ); + checkStr( lpDataRemote[0], (LPSTR) lpData->lpData ); + check( dwDataSizeRemote, lpData->dwDataSize ); + dwDataSize = 1024; + } + + /* Queue is empty */ + check_messages( pDP[0], dpid, 2, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], dpid, 2, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -6025,5 +6251,7 @@ START_TEST(dplayx) test_GetMessageCount(); test_GetMessageQueue(); + test_remote_data_replication(); + CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for GetMessageQueue.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 8e9b291272bb17e6ce3b813a5efcc60aac401675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9b291272bb17e6ce3b813a5… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:40 2008 +0200 dplayx: Tests for GetMessageQueue. --- dlls/dplayx/tests/dplayx.c | 308 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 308 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9b291272bb17e6ce3b8…

1 0

Ismael Barros : dplayx: Tests for GetMessageCount.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 4db050d800c087f1ba87e11c6c72e1be261568bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db050d800c087f1ba87e11c6… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:18 2008 +0200 dplayx: Tests for GetMessageCount. --- dlls/dplayx/tests/dplayx.c | 222 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 006a0ea..2ea8ca5 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -5460,6 +5460,227 @@ static void test_Receive(void) } +/* GetMessageCount */ + +static void test_GetMessageCount(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[4]; + HRESULT hr; + UINT i; + DWORD dwCount; + + DWORD dwDataSize = 1024; + LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + CallbackData callbackData; + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + todo_wine checkHR( DPERR_UNINITIALIZED, hr ); + check( -1, dwCount ); + + if ( hr == DP_OK ) + { + skip( "GetMessageCount not implemented\n" ); + return; + } + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.dwMaxPlayers = 10; + IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + + IDirectPlayX_CreatePlayer( pDP[0], &dpid[0], NULL, NULL, NULL, 0, 0 ); + IDirectPlayX_CreatePlayer( pDP[0], &dpid[1], NULL, NULL, NULL, 0, 0 ); + IDirectPlayX_CreatePlayer( pDP[1], &dpid[3], NULL, NULL, NULL, 0, 0 ); + IDirectPlayX_CreatePlayer( pDP[0], &dpid[2], NULL, NULL, NULL, 0, 0 ); + + + /* Incorrect parameters */ + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[0], NULL ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check( -1, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, NULL ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check( -1, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], -1, &dwCount ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( -1, dwCount ); + + + /* Correct parameters */ + /* Player creation messages */ + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 5, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 1, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + checkHR( DP_OK, hr ); + check( 3, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[1], &dwCount ); + checkHR( DP_OK, hr ); + check( 2, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[3], &dwCount ); + checkHR( DP_OK, hr ); + /* Remote player: doesn't throw error but result is 0 and not 1 */ + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], dpid[3], &dwCount ); + checkHR( DP_OK, hr ); + check( 1, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[1], &dwCount ); + checkHR( DP_OK, hr ); + check( 2, dwCount ); + + + /* Purge queues */ + check_messages( pDP[0], dpid, 6, &callbackData ); + checkStr( "S0,S1,S0,S1,S0,", callbackData.szTrace1 ); + check_messages( pDP[1], dpid, 6, &callbackData ); + checkStr( "S3,", callbackData.szTrace1 ); + + + /* Ensure queues is purged */ + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + + /* Send data messages */ + for (i=0; i<5; i++) + IDirectPlayX_Send( pDP[0], dpid[0], dpid[1], 0, lpData, dwDataSize ); + for (i=0; i<6; i++) + IDirectPlayX_Send( pDP[0], dpid[1], dpid[2], 0, lpData, dwDataSize ); + for (i=0; i<7; i++) + IDirectPlayX_Send( pDP[0], dpid[2], dpid[3], 0, lpData, dwDataSize ); + + + /* Check all messages are in the queues */ + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 11, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 7, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[1], &dwCount ); + checkHR( DP_OK, hr ); + check( 5, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[2], &dwCount ); + checkHR( DP_OK, hr ); + check( 6, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], dpid[3], &dwCount ); + checkHR( DP_OK, hr ); + check( 7, dwCount ); + + + /* Purge queues again */ + check_messages( pDP[0], dpid, 6, &callbackData ); + checkStr( "01,01,01,01,01," + "12,12,12,12,12,12,", callbackData.szTrace1 ); + check_messages( pDP[1], dpid, 6, &callbackData ); + checkStr( "23,23,23,23,23,23,23,", callbackData.szTrace1 ); + + + /* Check queues are purged */ + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], 0, &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[0], &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[1], &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[0], dpid[2], &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + dwCount = -1; + hr = IDirectPlayX_GetMessageCount( pDP[1], dpid[3], &dwCount ); + checkHR( DP_OK, hr ); + check( 0, dwCount ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -5494,6 +5715,7 @@ START_TEST(dplayx) test_Send(); test_Receive(); + test_GetMessageCount(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for Send.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 2a96593369da4d882f7ff0dc7200e7ec1680200d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a96593369da4d882f7ff0dc7… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:24 2008 +0200 dplayx: Tests for Send. --- dlls/dplayx/tests/dplayx.c | 335 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a96593369da4d882f7ff…

1 0

Ismael Barros : dplayx: Tests for checking the behaviour of groups in a C/ S session.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 37ab5a4ffb55b0e88e2776ed90485b7a25bcfd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ab5a4ffb55b0e88e2776ed9… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:26 2008 +0200 dplayx: Tests for checking the behaviour of groups in a C/S session. --- dlls/dplayx/tests/dplayx.c | 234 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 234 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e10a9f7..f2a0546 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -4612,6 +4612,239 @@ static void test_groups_p2p(void) } +static void test_groups_cs(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID idPlayer[6], idGroup[3]; + CallbackData callbackData; + HRESULT hr; + UINT i; + + DWORD dwDataSize = 1024; + LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 1024 ); + + + 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; + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + dpsd.dwFlags = DPSESSION_CLIENTSERVER; + hr = IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + todo_wine checkHR( DP_OK, hr ); + dpsd.dwFlags = 0; + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + todo_wine checkHR( DP_OK, hr ); + + if ( hr == DPERR_UNINITIALIZED ) + { + skip( "dplay not implemented enough for this test yet\n" ); + return; + } + + + /* Create players */ + hr = IDirectPlayX_CreatePlayer( pDP[0], &idPlayer[0], + NULL, NULL, NULL, 0, 0 ); + checkHR( DPERR_ACCESSDENIED, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[0], &idPlayer[0], + NULL, NULL, NULL, 0, + DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[0], &idPlayer[1], + NULL, NULL, NULL, 0, 0 ); + checkHR( DPERR_ACCESSDENIED, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[1], &idPlayer[1], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[1], &idPlayer[2], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[1], &idPlayer[3], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[1], &idPlayer[4], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[1], &idPlayer[5], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreateGroup( pDP[0], &idGroup[0], + NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreateGroup( pDP[1], &idGroup[2], + NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreateGroupInGroup( pDP[1], idGroup[2], &idGroup[1], + NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + + /* Purge queues */ + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "S0,S0,S0,S0,S0,S0,", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "S1," "S2,S1," "S3,S2,S1," "S4,S3,S2,S1," + "S5,S4,S3,S2,S1," "S5,S4,S3,S2,S1,", callbackData.szTrace1 ); + + /* + * Player 0 | | pDP 0 + * Player 1 | Group 0 | + * Player 2 | | + * Player 3 | Group 1 ) | + * Player 4 | | Group 2 | pDP 1 + * Player 5 | | + */ + + /* Build groups */ + hr = IDirectPlayX_AddPlayerToGroup( pDP[0], idGroup[0], idPlayer[0] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[0], idGroup[0], idPlayer[1] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[0], idGroup[0], idPlayer[2] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[1], idGroup[1], idPlayer[3] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[1], idGroup[1], idPlayer[4] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[1], idGroup[2], idPlayer[4] ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_AddPlayerToGroup( pDP[1], idGroup[2], idPlayer[5] ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_AddGroupToGroup( pDP[1], idGroup[2], idGroup[1] ); + checkHR( DP_OK, hr ); + + /* Purge queues */ + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "S0,S0,S0,S0,", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "S5," "S4,S3,S2,S1," "S5,S4,S3,S2,S1," + "S5,S4,S3,S2,S1," "S5,S4,S3,S2,S1,", callbackData.szTrace1 ); + + + /* Sending broadcast messages, and checking who receives them */ + dwDataSize = 4; + /* 0 -> * */ + hr = IDirectPlayX_Send( pDP[0], idPlayer[0], DPID_ALLPLAYERS, 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "05,04,03,02,01,", callbackData.szTrace1 ); + + /* 0 -> g0 */ + hr = IDirectPlayX_Send( pDP[0], idPlayer[0], idGroup[0], 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "02,01,", callbackData.szTrace1 ); + /* 0 -> g1 */ + hr = IDirectPlayX_Send( pDP[0], idPlayer[0], idGroup[1], 0, + lpData, dwDataSize ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + /* 0 -> g2 */ + hr = IDirectPlayX_Send( pDP[0], idPlayer[0], idGroup[2], 0, + lpData, dwDataSize ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + + /* 3 -> * */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[3], DPID_ALLPLAYERS, 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "30,", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "35,34,32,31,", callbackData.szTrace1 ); + /* 3 -> g0 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[3], idGroup[0], 0, + lpData, dwDataSize ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + /* 3 -> g1 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[3], idGroup[1], 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "34,", callbackData.szTrace1 ); + /* 3 -> g2 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[3], idGroup[2], 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "35,34,", callbackData.szTrace1 ); + + /* 5 -> * */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[5], DPID_ALLPLAYERS, 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "50,", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "54,53,52,51,", callbackData.szTrace1 ); + /* 5 -> g0 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[5], idGroup[0], 0, + lpData, dwDataSize ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + /* 5 -> g1 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[5], idGroup[1], 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "54,53,", callbackData.szTrace1 ); + /* 5 -> g2 */ + hr = IDirectPlayX_Send( pDP[1], idPlayer[5], idGroup[2], 0, + lpData, dwDataSize ); + checkHR( DP_OK, hr ); + check_messages( pDP[0], idPlayer, 6, &callbackData ); + checkStr( "", callbackData.szTrace1 ); + check_messages( pDP[1], idPlayer, 6, &callbackData ); + checkStr( "54,", callbackData.szTrace1 ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -4642,6 +4875,7 @@ START_TEST(dplayx) test_EnumGroupsInGroup(); test_groups_p2p(); + test_groups_cs(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for checking the behaviour of groups in a p2p session.
by Alexandre Julliard Aug. 20, 2008

Aug. 20, 2008

Module: wine Branch: master Commit: 5ba76a257a4ff76e9d2a45046ac4afc22c1d4bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba76a257a4ff76e9d2a45046… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Aug 5 03:56:22 2008 +0200 dplayx: Tests for checking the behaviour of groups in a p2p session. --- dlls/dplayx/dplay.c | 10 ++ dlls/dplayx/tests/dplayx.c | 235 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ba76a257a4ff76e9d2a4…

1 0