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

Alexandre Julliard : user32/tests: Don' t check last error on success in the broadcast tests.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 13645a7b306258a3bdf6e69b0f9e6eca89c95639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13645a7b306258a3bdf6e69b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 23:05:21 2008 +0200 user32/tests: Don't check last error on success in the broadcast tests. --- dlls/user32/tests/broadcast.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index c88cee7..0b2c2d6 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -108,14 +108,14 @@ static void test_parameters(PBROADCAST broadcast, const char *functionname) skip("%s is not implemented\n", functionname); return; } - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); - ok(!ret, "Returned: %d\n", ret); + ok(!ret || broken(ret), "Returned: %d\n", ret); + if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; ret = broadcast( 0x80000000, &recips, WM_NULL, 0, 0 ); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); - ok(!ret, "Returned: %d\n", ret); + ok(!ret || broken(ret), "Returned: %d\n", ret); + if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); #if 0 /* TODO: Check the hang flags */ SetLastError(0xcafebabe); @@ -285,21 +285,18 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS; ResetEvent(hevent); ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); - ok(ret==1, "Returned: %d\n", ret); + ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLDESKTOPS || recips == BSM_ALL_RECIPS, /* win2k3 */ "Received by: %08x\n", recips); PulseEvent(hevent); - /* Wine sets last error to 0, so just use that one as token here so it doesn't fail */ - SetLastError(0); + SetLastError(0xcafebabe); recips = BSM_ALLCOMPONENTS; ResetEvent(hevent); ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - ok(!GetLastError(), "Last error: %08x\n", GetLastError()); - ok(ret==1, "Returned: %d\n", ret); + ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == BSM_ALLCOMPONENTS || recips == BSM_ALL_RECIPS, /* win2k3 */ @@ -310,8 +307,7 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, 0, NULL ); - todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); - ok(ret==1, "Returned: %d\n", ret); + ok(ret==1, "Returned: %d error %u\n", ret, GetLastError()); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || recips == BSM_APPLICATIONS, /* win2k3 */ @@ -322,7 +318,6 @@ static void test_noprivileges(void) recips = BSM_ALLDESKTOPS|BSM_APPLICATIONS; ResetEvent(hevent); ret = pBroadcastExW( BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY, NULL ); - todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) ||

1 0

Alexandre Julliard : user32/tests: Fix some test failures on win9x.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2b1c4ba13896c1c882009df6e5fd1d941541943b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1c4ba13896c1c882009df6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 23:06:54 2008 +0200 user32/tests: Fix some test failures on win9x. --- dlls/user32/tests/resource.c | 7 +++++-- dlls/user32/tests/static.c | 10 +++++++--- dlls/user32/tests/text.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index e588524..30b3e1f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -42,9 +42,12 @@ static void test_LoadStringW(void) the string at the pointer returned by LoadStringW when called with buflen = 0 */ SetLastError(0xdeadbeef); length1 = LoadStringW(hInst, 2, (WCHAR *) &resourcepointer, 0); /* get pointer to resource. */ - if (!length1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (!length1) { - win_skip( "LoadStringW not implemented\n" ); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + win_skip( "LoadStringW not implemented\n" ); + else + win_skip( "LoadStringW does not return a pointer to the resource\n" ); return; } length2 = LoadStringW(hInst, 2, returnedstringw, sizeof(returnedstringw) /sizeof(WCHAR)); /* get resource string */ diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 7810db4..8a9366d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -33,12 +33,12 @@ static HWND hMainWnd; -#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } +#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " fmt " got " fmt "\n", (value), val); } #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); -int g_nReceivedColorStatic = 0; +static int g_nReceivedColorStatic = 0; static HWND build_static(DWORD style) { @@ -63,7 +63,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara return DefWindowProc(hwnd, msg, wparam, lparam); } -void test_updates(int style, int flags) +static void test_updates(int style, int flags) { RECT r1 = {20, 20, 30, 30}; HWND hStatic = build_static(style); @@ -89,6 +89,10 @@ void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } + else if (style == SS_ICON || style == SS_BITMAP) + ok( g_nReceivedColorStatic == exp || + broken(g_nReceivedColorStatic == 0), /* win9x */ + "expected %u got %u\n", exp, g_nReceivedColorStatic ); else expect_eq(g_nReceivedColorStatic, exp, int, "%d"); DestroyWindow(hStatic); diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 1e09650..7627280 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -110,21 +110,21 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); SetLastError( 0); textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); SetLastError( 0); textheight = DrawTextExA(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExA(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); /* Wide char versions */ SetRect( &rect, 10,10, 100, 100); @@ -132,19 +132,23 @@ static void test_DrawTextCalcRect(void) textheight = DrawTextExW(hdc, textW, 0, &rect, DT_CALCRECT, NULL ); if( GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); ok( (rect.left == rect.right && rect.bottom == rect.top), - "rectangle should be empty.\n"); + "rectangle should be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty.\n"); + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); } /* More test cases from bug 12226 */ @@ -158,11 +162,18 @@ static void test_DrawTextCalcRect(void) SetRect(&rect, 0, 0, 0, 0); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT | DT_LEFT | DT_SINGLELINE); - todo_wine ok(textheight, "DrawTextW error %u\n", GetLastError()); - ok(0 == rect.left, "expected 0, got %d\n", rect.left); - ok(0 == rect.right, "expected 0, got %d\n", rect.right); - ok(0 == rect.top, "expected 0, got %d\n", rect.top); - todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + if (!textheight && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip( "DrawTextW not implemented\n" ); + } + else + { + todo_wine ok(textheight, "DrawTextW error %u\n", GetLastError()); + ok(0 == rect.left, "expected 0, got %d\n", rect.left); + ok(0 == rect.right, "expected 0, got %d\n", rect.right); + ok(0 == rect.top, "expected 0, got %d\n", rect.top); + todo_wine ok(rect.bottom, "rect.bottom should not be 0\n"); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont);

1 0

Alexandre Julliard : winetest: Add colors to the test names based on the results across all platforms.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: tools Branch: master Commit: bdfed583f6740beddba767d3b89a7e32e86115e2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bdfed583f6740beddba767d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 15:03:57 2008 +0200 winetest: Add colors to the test names based on the results across all platforms. --- winetest/gather | 150 ++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 98 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=bdfed583f6740beddba7…

1 0

Luis C. Busquets Pérez : d3dx9: Implementation of D3DXGetPixelShaderProfile.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 457efd55d07306039851339d041eecdc2a08c86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=457efd55d07306039851339d0… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Aug 1 21:18:08 2008 +0200 d3dx9: Implementation of D3DXGetPixelShaderProfile. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 48 +++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index bf9c8f8..95e9c26 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -156,7 +156,7 @@ @ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx8.D3DXGetImageInfoFromFileW @ stdcall D3DXGetImageInfoFromResourceA(long ptr ptr) d3dx8.D3DXGetImageInfoFromResourceA @ stdcall D3DXGetImageInfoFromResourceW(long ptr ptr) d3dx8.D3DXGetImageInfoFromResourceW -@ stub D3DXGetPixelShaderProfile +@ stdcall D3DXGetPixelShaderProfile(ptr) @ stub D3DXGetShaderConstantTable @ stub D3DXGetShaderConstantTableEx @ stub D3DXGetShaderInputSemantics diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 326331c..f4a2ce9 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -25,6 +25,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device) +{ + D3DCAPS9 caps; + + TRACE("(void): relay\n"); + + if (!device) return NULL; + + IDirect3DDevice9_GetDeviceCaps(device,&caps); + + switch (caps.PixelShaderVersion) + { + case D3DPS_VERSION(1, 1): + return "ps_1_1"; + + case D3DPS_VERSION(1, 2): + return "ps_1_2"; + + case D3DPS_VERSION(1, 3): + return "ps_1_3"; + + case D3DPS_VERSION(1, 4): + return "ps_1_4"; + + case D3DPS_VERSION(2, 0): + if ((caps.PS20Caps.NumTemps>=22) && + (caps.PS20Caps.Caps&D3DPS20CAPS_ARBITRARYSWIZZLE) && + (caps.PS20Caps.Caps&D3DPS20CAPS_GRADIENTINSTRUCTIONS) && + (caps.PS20Caps.Caps&D3DPS20CAPS_PREDICATION) && + (caps.PS20Caps.Caps&D3DPS20CAPS_NODEPENDENTREADLIMIT) && + (caps.PS20Caps.Caps&D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT)) + { + return "ps_2_a"; + } + if ((caps.PS20Caps.NumTemps>=32) && + (caps.PS20Caps.Caps&D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT)) + { + return "ps_2_b"; + } + return "ps_2_0"; + + case D3DPS_VERSION(3, 0): + return "ps_3_0"; + } + + return NULL; +} + UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code) { const DWORD *ptr = byte_code; diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 6d2aa41..38ca97d 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -25,6 +25,7 @@ extern "C" { #endif +LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code);

1 0

Luis C. Busquets Pérez : d3dx9: Implementation of D3DXGetVertexShaderProfile.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 9b572170da5f35a80c6bb07ab8ebcda7a854f27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b572170da5f35a80c6bb07ab… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Aug 1 21:19:11 2008 +0200 d3dx9: Implementation of D3DXGetVertexShaderProfile. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 29 +++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 95e9c26..a2dab96 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -164,7 +164,7 @@ @ stub D3DXGetShaderSamplers @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) -@ stub D3DXGetVertexShaderProfile +@ stdcall D3DXGetVertexShaderProfile(ptr) @ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersect @ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersectSubset @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) d3dx8.D3DXIntersectTri diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f4a2ce9..a84287f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -102,3 +102,32 @@ DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code) return byte_code ? *byte_code : 0; } + +LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) +{ + D3DCAPS9 caps; + + TRACE("(void): relay\n"); + + if (!device) return NULL; + + IDirect3DDevice9_GetDeviceCaps(device,&caps); + + switch (caps.VertexShaderVersion) + { + case D3DVS_VERSION(1, 1): + return "vs_1_1"; + case D3DVS_VERSION(2, 0): + if ((caps.VS20Caps.NumTemps>=13) && + (caps.VS20Caps.DynamicFlowControlDepth=24) && + (caps.VS20Caps.Caps&D3DPS20CAPS_PREDICATION)) + { + return "vs_2_a"; + } + return "vs_2_0"; + case D3DVS_VERSION(3, 0): + return "vs_3_0"; + } + + return NULL; +} diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 38ca97d..0e629d9 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -28,6 +28,7 @@ extern "C" { LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); +LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); #ifdef __cplusplus }

1 0

Ismael Barros : dplayx: Tests for GetPlayerFlags.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 42fd319923237efe6686c48aeaf02e5ab02cc255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fd319923237efe6686c48ae… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:08 2008 +0200 dplayx: Tests for GetPlayerFlags. --- dlls/dplayx/tests/dplayx.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index fbd9ae7..c1eb037 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2955,6 +2955,111 @@ static void test_GetPlayerAddress(void) } +/* GetPlayerFlags */ + +static void test_GetPlayerFlags(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[4]; + HRESULT hr; + UINT i; + + DWORD dwFlags = 0; + + + 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; + + /* Uninitialized service provider */ + hr = IDirectPlayX_GetPlayerFlags( pDP[0], 0, &dwFlags ); + todo_wine checkHR( DPERR_UNINITIALIZED, hr ); + + if ( hr == DP_OK ) + { + skip( "GetPlayerFlags not implemented\n" ); + return; + } + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* No session */ + hr = IDirectPlayX_GetPlayerFlags( pDP[0], 0, &dwFlags ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[0], 1, &dwFlags ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + + IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + + for (i=0; i<2; i++) + { + hr = IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + } + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[2], + NULL, NULL, NULL, + 0, DPPLAYER_SPECTATOR ); + checkHR( DP_OK, hr ); + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[3], + NULL, NULL, NULL, + 0, DPPLAYER_SERVERPLAYER ); + checkHR( DP_OK, hr ); + + + /* Invalid player */ + hr = IDirectPlayX_GetPlayerFlags( pDP[0], 0, &dwFlags ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[0], 2, &dwFlags ); + checkHR( DPERR_INVALIDPLAYER, hr ); + + /* Invalid parameters */ + hr = IDirectPlayX_GetPlayerFlags( pDP[0], dpid[0], NULL ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + + /* Regular parameters */ + hr = IDirectPlayX_GetPlayerFlags( pDP[0], dpid[0], &dwFlags ); + checkHR( DP_OK, hr ); + checkFlags( dwFlags, DPPLAYER_LOCAL, FLAGS_DPPLAYER ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[1], dpid[1], &dwFlags ); + checkHR( DP_OK, hr ); + checkFlags( dwFlags, DPPLAYER_LOCAL, FLAGS_DPPLAYER ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[0], dpid[1], &dwFlags ); + checkHR( DP_OK, hr ); + checkFlags( dwFlags, 0, FLAGS_DPPLAYER ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[0], dpid[2], &dwFlags ); + checkHR( DP_OK, hr ); + checkFlags( dwFlags, DPPLAYER_SPECTATOR | DPPLAYER_LOCAL, FLAGS_DPPLAYER ); + + hr = IDirectPlayX_GetPlayerFlags( pDP[1], dpid[3], &dwFlags ); + checkHR( DP_OK, hr ); + checkFlags( dwFlags, DPPLAYER_SERVERPLAYER, FLAGS_DPPLAYER ); + + + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -2975,6 +3080,7 @@ START_TEST(dplayx) test_PlayerName(); test_GetPlayerAccount(); test_GetPlayerAddress(); + test_GetPlayerFlags(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for Get/SetPlayerName.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: aacefb7e176ef6543dd70b8f7320197c268d75fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacefb7e176ef6543dd70b8f7… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:12 2008 +0200 dplayx: Tests for Get/SetPlayerName. --- dlls/dplayx/dplay.c | 10 ++ dlls/dplayx/tests/dplayx.c | 240 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 043f028..c150d7e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2702,6 +2702,11 @@ static HRESULT WINAPI DP_IF_GetPlayerName FIXME( "(%p)->(0x%08x,%p,%p,%u): ANSI\n", This, idPlayer, lpData, lpdwDataSize, bAnsi ); + if( This->dp2->connectionInitialized == NO_PROVIDER ) + { + return DPERR_UNINITIALIZED; + } + if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) { return DPERR_INVALIDPLAYER; @@ -3227,6 +3232,11 @@ static HRESULT WINAPI DP_IF_SetPlayerName TRACE( "(%p)->(0x%08x,%p,0x%08x,%u)\n", This, idPlayer, lpPlayerName, dwFlags, bAnsi ); + if( This->dp2->connectionInitialized == NO_PROVIDER ) + { + return DPERR_UNINITIALIZED; + } + if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) { return DPERR_INVALIDGROUP; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 7986db4..4580b02 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2363,6 +2363,245 @@ static void test_PlayerData(void) IDirectPlayX_Release( pDP ); } +/* GetPlayerName + SetPlayerName */ + +static void test_PlayerName(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2]; + HRESULT hr; + UINT i; + + DPNAME playerName; + 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) ); + ZeroMemory( &playerName, sizeof(DPNAME) ); + + + /* Service provider not initialized */ + hr = IDirectPlayX_SetPlayerName( pDP[0], 0, &playerName, 0 ); + checkHR( DPERR_UNINITIALIZED, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], 0, lpData, &dwDataSize ); + checkHR( DPERR_UNINITIALIZED, hr ); + check( 1024, dwDataSize ); + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* Session not initialized */ + hr = IDirectPlayX_SetPlayerName( pDP[0], 0, &playerName, 0 ); + todo_wine checkHR( DPERR_INVALIDPLAYER, hr ); + + if ( hr == DPERR_UNINITIALIZED ) + { + skip( "Get/SetPlayerName not implemented\n" ); + return; + } + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], 0, lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + + 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[1], &dpid[1], NULL, NULL, NULL, 0, 0 ); + + + /* Name not initialized */ + playerName.dwSize = -1; + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, 0 ); + checkHR( DP_OK, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], 0, lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + + playerName.dwSize = sizeof(DPNAME); + playerName.lpszShortNameA = (LPSTR) "player_name"; + playerName.lpszLongNameA = (LPSTR) "player_long_name"; + + + /* Invalid parameters */ + hr = IDirectPlayX_SetPlayerName( pDP[0], -1, &playerName, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + hr = IDirectPlayX_SetPlayerName( pDP[0], 0, &playerName, 0 ); + checkHR( DPERR_INVALIDPLAYER, hr ); + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, -1 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], 0, lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + dwDataSize = -1; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPARAMS, hr ); + check( -1, dwDataSize ); + + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, NULL ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + /* Trying to modify remote player */ + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[1], &playerName, 0 ); + checkHR( DPERR_ACCESSDENIED, hr ); + + + /* Regular operation */ + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, 0 ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( playerName.lpszShortNameA, ((LPDPNAME)lpData)->lpszShortNameA ); + checkStr( playerName.lpszLongNameA, ((LPDPNAME)lpData)->lpszLongNameA ); + check( 0, ((LPDPNAME)lpData)->dwFlags ); + + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], NULL, 0 ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 16, dwDataSize ); + checkLP( NULL, ((LPDPNAME)lpData)->lpszShortNameA ); + checkLP( NULL, ((LPDPNAME)lpData)->lpszLongNameA ); + check( 0, ((LPDPNAME)lpData)->dwFlags ); + + + /* Small buffer in get operation */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], NULL, &dwDataSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + check( 16, dwDataSize ); + + dwDataSize = 0; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + check( 16, dwDataSize ); + + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 16, dwDataSize ); + checkLP( NULL, ((LPDPNAME)lpData)->lpszShortNameA ); + checkLP( NULL, ((LPDPNAME)lpData)->lpszLongNameA ); + check( 0, ((LPDPNAME)lpData)->dwFlags ); + + + /* Flags */ + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, + DPSET_GUARANTEED ); + checkHR( DP_OK, hr ); + + /* - Local (no propagation) */ + playerName.lpszShortNameA = (LPSTR) "no_propagation"; + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, + DPSET_LOCAL ); + checkHR( DP_OK, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], + lpData, &dwDataSize ); /* Local fetch */ + checkHR( DP_OK, hr ); + check( 48, dwDataSize ); + checkStr( "no_propagation", ((LPDPNAME)lpData)->lpszShortNameA ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[1], dpid[0], + lpData, &dwDataSize ); /* Remote fetch */ + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( "player_name", ((LPDPNAME)lpData)->lpszShortNameA ); + + /* -- 2 */ + + playerName.lpszShortNameA = (LPSTR) "no_propagation_2"; + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, + DPSET_LOCAL | DPSET_REMOTE ); + checkHR( DP_OK, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], + lpData, &dwDataSize ); /* Local fetch */ + checkHR( DP_OK, hr ); + check( 50, dwDataSize ); + checkStr( "no_propagation_2", ((LPDPNAME)lpData)->lpszShortNameA ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[1], dpid[0], + lpData, &dwDataSize ); /* Remote fetch */ + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( "player_name", ((LPDPNAME)lpData)->lpszShortNameA ); + + /* - Remote (propagation, default) */ + playerName.lpszShortNameA = (LPSTR) "propagation"; + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, + DPSET_REMOTE ); + checkHR( DP_OK, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[1], dpid[0], + lpData, &dwDataSize ); /* Remote fetch */ + checkHR( DP_OK, hr ); + check( 45, dwDataSize ); + checkStr( "propagation", ((LPDPNAME)lpData)->lpszShortNameA ); + + /* -- 2 */ + playerName.lpszShortNameA = (LPSTR) "propagation_2"; + hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, + 0 ); + checkHR( DP_OK, hr ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerName( pDP[1], dpid[0], + lpData, &dwDataSize ); /* Remote fetch */ + checkHR( DP_OK, hr ); + check( 47, dwDataSize ); + checkStr( "propagation_2", ((LPDPNAME)lpData)->lpszShortNameA ); + + + /* Checking system messages */ + check_messages( pDP[0], dpid, 2, &callbackData ); + checkStr( "S0,S0,S0,S0,S0,S0,S0,", callbackData.szTrace1 ); + checkStr( "48,28,57,28,57,57,59,", callbackData.szTrace2 ); + check_messages( pDP[1], dpid, 2, &callbackData ); + checkStr( "S1,S1,S1,S1,S1,S1,", callbackData.szTrace1 ); + checkStr( "28,57,28,57,57,59,", callbackData.szTrace2 ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -2380,6 +2619,7 @@ START_TEST(dplayx) test_CreatePlayer(); test_GetPlayerCaps(); test_PlayerData(); + test_PlayerName(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for GetPlayerAccount.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 858d8892886e63c8524ef186274edf4961a76906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858d8892886e63c8524ef1862… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:01 2008 +0200 dplayx: Tests for GetPlayerAccount. --- dlls/dplayx/tests/dplayx.c | 177 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 4580b02..8988e6d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2602,6 +2602,182 @@ static void test_PlayerName(void) } +/* GetPlayerAccount */ + +static BOOL FAR PASCAL EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, + LPDWORD lpdwTimeOut, + DWORD dwFlags, + LPVOID lpContext ) +{ + LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + DPSESSIONDESC2 dpsd; + DPCREDENTIALS dpCredentials; + HRESULT hr; + + if (dwFlags & DPESC_TIMEDOUT) + { + return FALSE; + } + + checkFlags( DPSESSION_SECURESERVER, lpThisSD->dwFlags, FLAGS_DPSESSION ); + + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + dpsd.dwSize = sizeof(DPSESSIONDESC2); + dpsd.guidApplication = appGuid; + dpsd.guidInstance = lpThisSD->guidInstance; + + ZeroMemory( &dpCredentials, sizeof(DPCREDENTIALS) ); + dpCredentials.dwSize = sizeof(DPCREDENTIALS); + dpCredentials.lpszUsernameA = (LPSTR) "user"; + dpCredentials.lpszPasswordA = (LPSTR) "pass"; + hr = IDirectPlayX_SecureOpen( pDP, &dpsd, DPOPEN_JOIN, + NULL, &dpCredentials ); + checkHR( DPERR_LOGONDENIED, hr ); /* TODO: Make this work */ + + return TRUE; +} + +static void test_GetPlayerAccount(void) +{ + + LPDIRECTPLAY4 pDP[2]; + DPSESSIONDESC2 dpsd; + DPID dpid[2]; + HRESULT hr; + UINT i; + + DWORD dwDataSize = 1024; + LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + + + 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; + + /* Uninitialized service provider */ + hr = IDirectPlayX_GetPlayerAccount( pDP[0], 0, 0, lpData, &dwDataSize ); + todo_wine checkHR( DPERR_UNINITIALIZED, hr ); + + if ( hr == DP_OK ) + { + skip( "GetPlayerAccount not implemented\n" ); + return; + } + + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* No session */ + hr = IDirectPlayX_GetPlayerAccount( pDP[0], 0, 0, lpData, &dwDataSize ); + checkHR( DPERR_NOSESSIONS, hr ); + + + IDirectPlayX_Open( pDP[0], &dpsd, DPOPEN_CREATE ); + IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, EnumSessions_cb_join, + (LPVOID) pDP[1], 0 ); + + for (i=0; i<2; i++) + { + hr = IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], NULL, NULL, NULL, + 0, 0 ); + checkHR( DP_OK, hr ); + } + + + /* Session is not secure */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 0, + lpData, &dwDataSize ); + checkHR( DPERR_UNSUPPORTED, hr ); + check( 1024, dwDataSize ); + + + /* Open a secure session */ + for (i=0; i<2; i++) + { + hr = IDirectPlayX_Close( pDP[i] ); + checkHR( DP_OK, hr ); + } + + dpsd.dwFlags = DPSESSION_SECURESERVER; + hr = IDirectPlayX_SecureOpen( pDP[0], &dpsd, DPOPEN_CREATE, NULL, NULL ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[0], &dpid[0], + NULL, NULL, NULL, 0, 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd, 0, + EnumSessions_cb_join_secure, + (LPVOID) pDP[1], 0 ); + checkHR( DP_OK, hr ); + + hr = IDirectPlayX_CreatePlayer( pDP[1], &dpid[1], + NULL, NULL, NULL, 0, 0 ); + checkHR( DPERR_INVALIDPARAMS, hr ); + + /* TODO: Player creation so that this works */ + + /* Invalid player */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], 0, 0, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + /* Invalid flags */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], -1, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDFLAGS, hr ); + check( 1024, dwDataSize ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 1, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDFLAGS, hr ); + check( 1024, dwDataSize ); + + /* Small buffer */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 0, + NULL, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 0, dwDataSize ); + + dwDataSize = 0; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 0, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 0, dwDataSize ); + + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 0, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 0, dwDataSize ); + + /* Normal operation */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAccount( pDP[0], dpid[0], 0, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -2620,6 +2796,7 @@ START_TEST(dplayx) test_GetPlayerCaps(); test_PlayerData(); test_PlayerName(); + test_GetPlayerAccount(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for GetPlayerAddress.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: bbbe26bb5d3e40459507817bdd4757d0b959461f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbe26bb5d3e40459507817bd… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:52:17 2008 +0200 dplayx: Tests for GetPlayerAddress. --- dlls/dplayx/tests/dplayx.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 8988e6d..fbd9ae7 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -2778,6 +2778,183 @@ static void test_GetPlayerAccount(void) } +/* GetPlayerAddress */ + +static BOOL FAR PASCAL EnumAddress_cb( REFGUID guidDataType, + DWORD dwDataSize, + LPCVOID lpData, + LPVOID lpContext ) +{ + lpCallbackData callbackData = (lpCallbackData) lpContext; + static REFGUID types[] = { &DPAID_TotalSize, + &DPAID_ServiceProvider, + &DPAID_INet, + &DPAID_INetW }; + static DWORD sizes[] = { 4, 16, 12, 24, 4, 16, 10, 20 }; + + + checkGuid( types[callbackData->dwCounter1%4], guidDataType ); + check( sizes[callbackData->dwCounter1], dwDataSize ); + + switch(callbackData->dwCounter1) + { + case 0: + check( 136, *(LPDWORD) lpData ); + break; + case 4: + check( 130, *(LPDWORD) lpData ); + break; + case 1: + case 5: + checkGuid( &DPSPGUID_TCPIP, (LPGUID) lpData ); + break; + case 6: + checkStr( "127.0.0.1", (LPSTR) lpData ); + break; + default: break; + } + + + callbackData->dwCounter1++; + + return TRUE; +} + +static void test_GetPlayerAddress(void) +{ + + LPDIRECTPLAY4 pDP[2]; + LPDIRECTPLAYLOBBY3 pDPL; + DPSESSIONDESC2 dpsd; + DPID dpid[2]; + CallbackData callbackData; + HRESULT hr; + UINT i; + + DWORD dwDataSize = 1024; + LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + + + for (i=0; i<2; i++) + { + CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, + &IID_IDirectPlay4A, (LPVOID*) &pDP[i] ); + } + ZeroMemory( &dpsd, sizeof(DPSESSIONDESC2) ); + CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL, + &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL ); + + + /* Uninitialized service provider */ + hr = IDirectPlayX_GetPlayerAddress( pDP[0], 0, lpData, &dwDataSize ); + todo_wine checkHR( DPERR_UNINITIALIZED, hr ); + + if ( hr == DP_OK ) + { + skip( "GetPlayerAddress not implemented\n" ); + return; + } + + init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); + init_TCPIP_provider( pDP[1], "127.0.0.1", 0 ); + + + /* No session */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], 0, lpData, &dwDataSize ); + checkHR( DPERR_UNSUPPORTED, hr ); + check( 1024, dwDataSize ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], 1, lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + + 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 ); + + for (i=0; i<2; i++) + { + hr = IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], NULL, NULL, NULL, + 0, 0 ); + checkHR( DP_OK, hr ); + } + + /* Invalid player */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], 0, + lpData, &dwDataSize ); + checkHR( DPERR_UNSUPPORTED, hr ); + check( 1024, dwDataSize ); + + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], 1, + lpData, &dwDataSize ); + checkHR( DPERR_INVALIDPLAYER, hr ); + check( 1024, dwDataSize ); + + /* Small buffer */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], dpid[0], + NULL, &dwDataSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + check( 136, dwDataSize ); + + dwDataSize = 0; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], dpid[0], + lpData, &dwDataSize ); + checkHR( DPERR_BUFFERTOOSMALL, hr ); + check( 136, dwDataSize ); + + hr = IDirectPlayX_GetPlayerAddress( pDP[0], dpid[0], + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 136, dwDataSize ); + + + /* Regular parameters */ + callbackData.dwCounter1 = 0; + + /* - Local */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], dpid[0], + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 136, dwDataSize ); + + hr = IDirectPlayLobby_EnumAddress( pDPL, EnumAddress_cb, + (LPCVOID) lpData, dwDataSize, + (LPVOID) &callbackData ); + checkHR( DP_OK, hr ); + + check( 4, callbackData.dwCounter1 ); + + /* - Remote */ + dwDataSize = 1024; + hr = IDirectPlayX_GetPlayerAddress( pDP[0], dpid[1], + lpData, &dwDataSize ); + checkHR( DP_OK, hr ); + check( 130, dwDataSize ); + + hr = IDirectPlayLobby_EnumAddress( pDPL, EnumAddress_cb, + (LPCVOID) lpData, dwDataSize, + (LPVOID) &callbackData ); + checkHR( DP_OK, hr ); + + check( 8, callbackData.dwCounter1 ); + + + HeapFree( GetProcessHeap(), 0, lpData ); + IDirectPlayX_Release( pDP[0] ); + IDirectPlayX_Release( pDP[1] ); + +} + START_TEST(dplayx) { @@ -2797,6 +2974,7 @@ START_TEST(dplayx) test_PlayerData(); test_PlayerName(); test_GetPlayerAccount(); + test_GetPlayerAddress(); CoUninitialize(); }

1 0

Ismael Barros : dplayx: Tests for Get/SetPlayerData.
by Alexandre Julliard 04 Aug '08

04 Aug '08

Module: wine Branch: master Commit: 0755a77e0e1f3bdb6e67c6228bb79ff63ed63833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0755a77e0e1f3bdb6e67c6228… Author: Ismael Barros <razielmine(a)gmail.com> Date: Sat Aug 2 21:51:56 2008 +0200 dplayx: Tests for Get/SetPlayerData. --- dlls/dplayx/dplay.c | 5 + dlls/dplayx/tests/dplayx.c | 278 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0755a77e0e1f3bdb6e67c…

1 0