winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
839 discussions
Start a n
N
ew thread
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
0
0
Alexandre Julliard : user32/tests: Fix the listbox LB_DIR tests when directories are present.
by Alexandre Julliard
05 Aug '08
05 Aug '08
Module: wine Branch: master Commit: 4fce63eb74be8d12b5ddb6d0db4e73fcf574651d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4fce63eb74be8d12b5ddb6d0d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 4 23:04:47 2008 +0200 user32/tests: Fix the listbox LB_DIR tests when directories are present. --- dlls/user32/tests/listbox.c | 71 ++++++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 31 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fce63eb74be8d12b5ddb…
1
0
0
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
0
0
Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: 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
0
0
Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: 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
0
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
0
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
0
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
0
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
0
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
0
0
← Newer
1
...
71
72
73
74
75
76
77
...
84
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
Results per page:
10
25
50
100
200