wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Alexandre Julliard : Wine release 1.5.27
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: website Branch: master Commit: 51afc12a8d3b82507924348047007721faae5e35 URL: http://source.winehq.org/git/website.git/?a=commit;h=51afc12a8d3b8250792434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:30:03 2013 +0100 Wine release 1.5.27 --- news/en/2013032901.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013032901.xml b/news/en/2013032901.xml new file mode 100644 index 0000000..22b2116 --- /dev/null +++ b/news/en/2013032901.xml @@ -0,0 +1,15 @@ +<news> +<date>March 29, 2013</date> +<title>Wine 1.5.27 Released</title> +<body> + The Wine development release 1.5.27 is now available. + <a href="{$root}/announce/1.5.27">What's new</a> in this release: +<ul> + <li>System tray support in the Mac driver.</li> + <li>Various C runtime improvements.</li> + <li>Large icons for built-in applications.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.27 : Alexandre Julliard : Release 1.5.27
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: refs/tags/wine-1.5.27 Tag: d240f530219eb848719fe83bd33ebb5679a33b95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d240f530219eb848719fe83bd33e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:19:16 2013 +0100 Release 1.5.27

1 0

Alexandre Julliard : Release 1.5.27.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: e1a42bba54734dfcab59e22852405ad1030335e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a42bba54734dfcab59e2285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 19:19:16 2013 +0100 Release 1.5.27. --- ANNOUNCE | 629 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 275 insertions(+), 374 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1a42bba54734dfcab59e…

1 0

Michael Stefaniuc : dplayx: Get rid of the useless IDirectPlay{2, 3} vtables .
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: 338c726682c75cf9ba953d7a8d64c4c0399cb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338c726682c75cf9ba953d7a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:58:51 2013 +0100 dplayx: Get rid of the useless IDirectPlay{2,3} vtables. --- dlls/dplayx/dplay.c | 257 ++------------------------------------------------- 1 files changed, 8 insertions(+), 249 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=338c726682c75cf9ba953…

1 0

Michael Stefaniuc : dplayx: Remove the duplicated IDirectPlayXImpl structs.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: 82b51258eae9ab4dc1e6e2e2d5b7c61980d12037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b51258eae9ab4dc1e6e2e2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:39:26 2013 +0100 dplayx: Remove the duplicated IDirectPlayXImpl structs. --- dlls/dplayx/dplay.c | 29 +++++------------------------ dlls/dplayx/dplay_global.h | 44 +++++++++++++------------------------------- 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0ddde38..c7ab380 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -396,46 +396,26 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) HRESULT DP_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { - TRACE( " for %s\n", debugstr_guid( riid ) ); + IDirectPlayImpl *This; - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlay2Impl ) ); + TRACE( " for %s\n", debugstr_guid( riid ) ); - if( *ppvObj == NULL ) - { + This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( IDirectPlayImpl ) ); + if( !This ) return DPERR_OUTOFMEMORY; - } if( IsEqualGUID( &IID_IDirectPlay2, riid ) ) - { - IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; - } else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) - { - IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; - } else if( IsEqualGUID( &IID_IDirectPlay3, riid ) ) - { - IDirectPlay3Impl *This = *ppvObj; This->lpVtbl = &directPlay3WVT; - } else if( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) - { - IDirectPlay3AImpl *This = *ppvObj; This->lpVtbl = &directPlay3AVT; - } else if( IsEqualGUID( &IID_IDirectPlay4, riid ) ) - { - IDirectPlay4Impl *This = *ppvObj; This->lpVtbl = &directPlay4WVT; - } else if( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - { - IDirectPlay4AImpl *This = *ppvObj; This->lpVtbl = &directPlay4AVT; - } else { /* Unsupported interface */ @@ -446,6 +426,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ + *ppvObj = This; if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 7578e04..94b8f9a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -31,16 +31,6 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; -/***************************************************************************** - * Predeclare the interface implementation structures - */ -typedef struct IDirectPlay2Impl IDirectPlay2AImpl; -typedef struct IDirectPlay2Impl IDirectPlay2Impl; -typedef struct IDirectPlay3Impl IDirectPlay3AImpl; -typedef struct IDirectPlay3Impl IDirectPlay3Impl; -typedef struct IDirectPlay4Impl IDirectPlay4AImpl; -typedef struct IDirectPlay4Impl IDirectPlay4Impl; - typedef struct tagDirectPlayIUnknownData { LONG ulObjRef; @@ -196,28 +186,20 @@ typedef struct tagDirectPlay2Data DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; -#define DP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ - DirectPlayIUnknownData* unk; \ - DirectPlay2Data* dp2; - -struct IDirectPlay2Impl -{ - const IDirectPlay2Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay3Impl +typedef struct IDirectPlayImpl { - const IDirectPlay3Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; - -struct IDirectPlay4Impl -{ - const IDirectPlay4Vtbl *lpVtbl; - DP_IMPL_FIELDS -}; + const void *lpVtbl; + LONG ulInterfaceRef; + DirectPlayIUnknownData *unk; + DirectPlay2Data *dp2; +} IDirectPlayImpl; + +typedef struct IDirectPlayImpl IDirectPlay2Impl; +typedef struct IDirectPlayImpl IDirectPlay2AImpl; +typedef struct IDirectPlayImpl IDirectPlay3Impl; +typedef struct IDirectPlayImpl IDirectPlay3AImpl; +typedef struct IDirectPlayImpl IDirectPlay4Impl; +typedef struct IDirectPlayImpl IDirectPlay4AImpl; HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpMessageBody, DWORD dwMessageBodySize, LPCVOID lpMessageHeader,

1 0

Michael Stefaniuc : dplayx: Get rid of the unused DirectPlay3Data / DirectPlay4Data fields.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: 0e7b1a46d521345eec57a2aa5a2a2bad3f0a80f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7b1a46d521345eec57a2aa5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:38:52 2013 +0100 dplayx: Get rid of the unused DirectPlay3Data / DirectPlay4Data fields. --- dlls/dplayx/dplay.c | 56 +------------------------------------------- dlls/dplayx/dplay_global.h | 13 +--------- 2 files changed, 2 insertions(+), 67 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 62a76f1..0ddde38 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -391,52 +391,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) return TRUE; } -static BOOL DP_CreateDirectPlay3( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - This->dp3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp3) ) ); - if ( This->dp3 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DP_DestroyDirectPlay3( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dp3 ); - - return TRUE; -} - -static BOOL DP_CreateDirectPlay4( LPVOID lpDP ) -{ - IDirectPlay4AImpl *This = lpDP; - - This->dp4 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp4) ) ); - if ( This->dp4 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DP_DestroyDirectPlay4( LPVOID lpDP ) -{ - IDirectPlay3AImpl *This = lpDP; - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dp4 ); - - return TRUE; -} - /* Create a new interface */ HRESULT DP_CreateInterface @@ -492,11 +446,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ - if ( DP_CreateIUnknown( *ppvObj ) && - DP_CreateDirectPlay2( *ppvObj ) && - DP_CreateDirectPlay3( *ppvObj ) && - DP_CreateDirectPlay4( *ppvObj ) - ) + if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); @@ -504,8 +454,6 @@ HRESULT DP_CreateInterface } /* Initialize failed, destroy it */ - DP_DestroyDirectPlay4( *ppvObj ); - DP_DestroyDirectPlay3( *ppvObj ); DP_DestroyDirectPlay2( *ppvObj ); DP_DestroyIUnknown( *ppvObj ); @@ -614,8 +562,6 @@ static ULONG WINAPI DP_Release { /* If we're destroying the object, this must be the last ref of the last interface */ - DP_DestroyDirectPlay4( This ); - DP_DestroyDirectPlay3( This ); DP_DestroyDirectPlay2( This ); DP_DestroyIUnknown( This ); } diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 273f09e..7578e04 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -196,21 +196,10 @@ typedef struct tagDirectPlay2Data DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; -typedef struct tagDirectPlay3Data -{ - BOOL dummy; -} DirectPlay3Data; -typedef struct tagDirectPlay4Data -{ - BOOL dummy; -} DirectPlay4Data; - #define DP_IMPL_FIELDS \ LONG ulInterfaceRef; \ DirectPlayIUnknownData* unk; \ - DirectPlay2Data* dp2; \ - DirectPlay3Data* dp3; \ - DirectPlay4Data* dp4; + DirectPlay2Data* dp2; struct IDirectPlay2Impl {

1 0

Michael Stefaniuc : dplayx/tests: Add DirectPlay COM tests.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: d09d061157fc749ad10a794ef8d6e46d3605e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09d061157fc749ad10a794ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:37:52 2013 +0100 dplayx/tests: Add DirectPlay COM tests. --- dlls/dplayx/tests/dplayx.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 2fea137..c8ec54d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include <stdio.h> #define INITGUID @@ -6364,17 +6365,98 @@ static void test_host_migration(void) } +static void test_COM(void) +{ + IDirectPlay2A *dp2A; + IDirectPlay2 *dp2; + IDirectPlay3A *dp3A; + IDirectPlay3 *dp3; + IDirectPlay4A *dp4A; + IDirectPlay4 *dp4 = (IDirectPlay4*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dp4); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dp4, "dp4 = %p\n", dp4); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby, + (void**)&dp4); + ok(hr == E_NOINTERFACE, "DirectPlay create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Different refcount for all DirectPlay Interfaces */ + hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay4, + (void**)&dp4); + ok(hr == S_OK, "DirectPlay create failed: %08x, expected S_OK\n", hr); + refcount = IDirectPlayX_AddRef(dp4); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2, (void**)&dp2); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2 failed: %08x\n", hr); + refcount = IDirectPlay2_AddRef(dp2); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay2_Release(dp2); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3A, (void**)&dp3A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3A failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay3, (void**)&dp3); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay3 failed: %08x\n", hr); + refcount = IDirectPlay3_AddRef(dp3); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay3_Release(dp3); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay4A, (void**)&dp4A); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay4A failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp4A); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlayX_Release(dp4A); + + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IUnknown_Release(unk); + todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + + IUnknown_Release(unk); + IDirectPlayX_Release(dp4A); + IDirectPlay3_Release(dp3); + IDirectPlay3_Release(dp3A); + IDirectPlay2_Release(dp2); + IDirectPlay2_Release(dp2A); + IDirectPlayX_Release(dp4); + refcount = IDirectPlayX_Release(dp4); + todo_wine ok(refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST(dplayx) { + CoInitialize( NULL ); + + test_COM(); + if (!winetest_interactive) { skip("Run in interactive mode to run dplayx tests.\n"); return; } - CoInitialize( NULL ); - trace("Running in interactive mode, tests will take a while\n"); test_DirectPlayCreate();

1 0

Michael Stefaniuc : dplayx/tests: Get rid of the LPDIRECTPLAY type usage.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: 7eaafd0141ad3309e6601bc4905835345b2db2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaafd0141ad3309e6601bc49… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:36:52 2013 +0100 dplayx/tests: Get rid of the LPDIRECTPLAY type usage. --- dlls/dplayx/tests/dplayx.c | 70 ++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e507c50..2fea137 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -63,7 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); typedef struct tagCallbackData { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; UINT dwCounter1, dwCounter2; DWORD dwFlags; char szTrace1[1024], szTrace2[1024]; @@ -581,10 +581,8 @@ static char dpid2char(DPID* dpid, DWORD dpidSize, DPID idPlayer) return '?'; } -static void check_messages( LPDIRECTPLAY4 pDP, - DPID *dpid, - DWORD dpidSize, - lpCallbackData callbackData ) +static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize, + lpCallbackData callbackData ) { /* Retrieves all messages from the queue of pDP, performing tests * to check if we are receiving what we expect. @@ -647,9 +645,7 @@ static void check_messages( LPDIRECTPLAY4 pDP, HeapFree( GetProcessHeap(), 0, lpData ); } -static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, - LPCSTR strIPAddressString, - WORD port ) +static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port ) { DPCOMPOUNDADDRESSELEMENT addressElements[3]; @@ -732,7 +728,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, static void test_DirectPlayCreate(void) { - LPDIRECTPLAY pDP; + IDirectPlay *pDP; HRESULT hr; /* TODO: Check how it behaves with pUnk!=NULL */ @@ -833,7 +829,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, static void test_EnumConnections(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; CallbackData callbackData; HRESULT hr; @@ -936,7 +932,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, static void test_InitializeConnection(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; HRESULT hr; hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, @@ -955,7 +951,7 @@ static void test_InitializeConnection(void) static void test_GetCaps(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPCAPS dpcaps; DWORD dwFlags; HRESULT hr; @@ -1068,7 +1064,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, static void test_Open(void) { - LPDIRECTPLAY4 pDP, pDP_server; + IDirectPlay4 *pDP, *pDP_server; DPSESSIONDESC2 dpsd, dpsd_server; HRESULT hr; @@ -1228,10 +1224,10 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, return TRUE; } -static LPDIRECTPLAY4 create_session(DPSESSIONDESC2 *lpdpsd) +static IDirectPlay4 *create_session(DPSESSIONDESC2 *lpdpsd) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPNAME name; DPID dpid; HRESULT hr; @@ -1266,7 +1262,7 @@ static void test_EnumSessions(void) #define N_SESSIONS 6 - LPDIRECTPLAY4 pDP, pDPserver[N_SESSIONS]; + IDirectPlay4 *pDP, *pDPserver[N_SESSIONS]; DPSESSIONDESC2 dpsd, dpsd_server[N_SESSIONS]; CallbackData callbackData; HRESULT hr; @@ -1636,7 +1632,7 @@ static void test_EnumSessions(void) static void test_SessionDesc(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; LPDPSESSIONDESC2 lpData[2]; LPVOID lpDataMsg; @@ -1814,7 +1810,7 @@ static void test_SessionDesc(void) static void test_CreatePlayer(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPNAME name; DPID dpid; @@ -1987,7 +1983,7 @@ static void test_CreatePlayer(void) static void test_GetPlayerCaps(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2149,7 +2145,7 @@ static void test_GetPlayerCaps(void) static void test_PlayerData(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid; HRESULT hr; @@ -2415,7 +2411,7 @@ static void test_PlayerData(void) static void test_PlayerName(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2695,7 +2691,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, static void test_GetPlayerAccount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2]; HRESULT hr; @@ -2879,7 +2875,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, static void test_GetPlayerAddress(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; LPDIRECTPLAYLOBBY3 pDPL; DPSESSIONDESC2 dpsd; DPID dpid[2]; @@ -3017,7 +3013,7 @@ static void test_GetPlayerAddress(void) static void test_GetPlayerFlags(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -3125,7 +3121,7 @@ static void test_GetPlayerFlags(void) static void test_CreateGroup(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID idFrom, idTo, dpid, idGroup, idGroupParent; DPNAME groupName; @@ -3434,7 +3430,7 @@ static void test_CreateGroup(void) static void test_GroupOwner(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idGroup, idOwner; HRESULT hr; @@ -3602,7 +3598,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumPlayers(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5+2]; /* 5 players, 2 groups */ CallbackData callbackData; @@ -3925,7 +3921,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, static void test_EnumGroups(void) { - LPDIRECTPLAY4 pDP[3]; + IDirectPlay4 *pDP[3]; DPSESSIONDESC2 dpsd[3]; DPID dpid[5]; CallbackData callbackData; @@ -4152,7 +4148,7 @@ static void test_EnumGroups(void) static void test_EnumGroupsInGroup(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd[2]; DPID dpid[6]; CallbackData callbackData; @@ -4387,7 +4383,7 @@ static void test_EnumGroupsInGroup(void) static void test_groups_p2p(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; HRESULT hr; @@ -4622,7 +4618,7 @@ static void test_groups_p2p(void) static void test_groups_cs(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID idPlayer[6], idGroup[3]; CallbackData callbackData; @@ -4859,7 +4855,7 @@ static void test_groups_cs(void) static void test_Send(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; CallbackData callbackData; @@ -5194,7 +5190,7 @@ static void test_Send(void) static void test_Receive(void) { - LPDIRECTPLAY4 pDP; + IDirectPlay4 *pDP; DPSESSIONDESC2 dpsd; DPID dpid[4], idFrom, idTo; HRESULT hr; @@ -5479,7 +5475,7 @@ static void test_Receive(void) static void test_GetMessageCount(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; HRESULT hr; @@ -5702,7 +5698,7 @@ static void test_GetMessageCount(void) static void test_GetMessageQueue(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[4]; CallbackData callbackData; @@ -6011,7 +6007,7 @@ static void test_GetMessageQueue(void) static void test_remote_data_replication(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; CallbackData callbackData; @@ -6239,7 +6235,7 @@ static void test_remote_data_replication(void) static void test_host_migration(void) { - LPDIRECTPLAY4 pDP[2]; + IDirectPlay4 *pDP[2]; DPSESSIONDESC2 dpsd; DPID dpid[2], idFrom, idTo; HRESULT hr;

1 0

Michael Stefaniuc : dplayx/tests: Remove superfluous void pointer casts.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: c1907b5ff9c61aa161c130b5190a2b56a40b9220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1907b5ff9c61aa161c130b51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:35:29 2013 +0100 dplayx/tests: Remove superfluous void pointer casts. --- dlls/dplayx/tests/dplayx.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index a1da9e4..e507c50 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -706,7 +706,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -766,7 +766,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, @@ -801,7 +801,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; LPDIRECTPLAYLOBBY pDPL; HRESULT hr; @@ -910,7 +910,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; HRESULT hr; /* Incorrect parameters */ @@ -1028,7 +1028,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; HRESULT hr; @@ -1201,7 +1201,7 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; callbackData->dwCounter1++; if ( dwFlags & DPESC_TIMEDOUT ) @@ -2664,7 +2664,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - LPDIRECTPLAY4 pDP = (LPDIRECTPLAY4) lpContext; + IDirectPlay4 *pDP = lpContext; DPSESSIONDESC2 dpsd; DPCREDENTIALS dpCredentials; HRESULT hr; @@ -2841,7 +2841,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, LPCVOID lpData, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; static REFGUID types[] = { &DPAID_TotalSize, &DPAID_ServiceProvider, &DPAID_INet, @@ -3515,7 +3515,7 @@ static BOOL CALLBACK EnumPlayers_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3551,7 +3551,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT) @@ -3846,7 +3846,7 @@ static BOOL CALLBACK EnumGroups_cb( DPID dpId, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; char playerIndex = dpid2char( callbackData->dpid, callbackData->dpidSize, dpId ); @@ -3874,7 +3874,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, DWORD dwFlags, LPVOID lpContext ) { - lpCallbackData callbackData = (lpCallbackData) lpContext; + lpCallbackData callbackData = lpContext; HRESULT hr; if (dwFlags & DPESC_TIMEDOUT)

1 0

Michael Stefaniuc : dplayx: Have the decency to support IUnknown in DirectPlay.
by Alexandre Julliard 29 Mar '13

29 Mar '13

Module: wine Branch: master Commit: caf9d42e0d8888809075896cee0f4a42f93f0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf9d42e0d8888809075896ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:34:45 2013 +0100 dplayx: Have the decency to support IUnknown in DirectPlay. --- dlls/dplayx/dplay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 29212bc..62a76f1 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -457,7 +457,7 @@ HRESULT DP_CreateInterface IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } - else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) + else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT; @@ -541,7 +541,7 @@ static HRESULT WINAPI DP_QueryInterface IDirectPlay2Impl *This = *ppvObj; This->lpVtbl = &directPlay2WVT; } - else if( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) + else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) ) { IDirectPlay2AImpl *This = *ppvObj; This->lpVtbl = &directPlay2AVT;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013