April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Cleanup the DirectPlay object creation.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 4a9cd6307282a26f6a603074a8cc48ac206a159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9cd6307282a26f6a603074a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:48:57 2013 +0100 dplayx: Cleanup the DirectPlay object creation. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dpinit.h | 2 +- dlls/dplayx/dplay.c | 95 ++++++++++++++---------------------------- dlls/dplayx/dplobby.c | 3 +- 4 files changed, 35 insertions(+), 67 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 2502e1e..438ad60 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -101,7 +101,7 @@ static const IClassFactoryVtbl cf_vt = { IClassFactoryImpl_LockServer }; -static IClassFactoryImpl dplay_cf = {{&cf_vt}, DP_CreateInterface}; +static IClassFactoryImpl dplay_cf = {{&cf_vt}, dplay_create}; static IClassFactoryImpl dplaylobby_cf = {{&cf_vt}, DPL_CreateInterface}; diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h index 361759b..090b67a 100644 --- a/dlls/dplayx/dpinit.h +++ b/dlls/dplayx/dpinit.h @@ -26,7 +26,7 @@ #include "wtypes.h" #include "dplay_global.h" -extern HRESULT DP_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; +extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 9f766de..93862a3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -76,10 +76,6 @@ static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, LPVOID lpContext ); static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); -/* Forward declarations of virtual tables */ -static const IDirectPlay4Vtbl directPlay4AVT; -static const IDirectPlay4Vtbl directPlay4WVT; - /* Helper methods for player/group interfaces */ static HRESULT DP_IF_DeletePlayerFromGroup ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, @@ -360,55 +356,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) } -/* Create a new interface */ -HRESULT DP_CreateInterface - ( REFIID riid, LPVOID* ppvObj ) -{ - IDirectPlayImpl *This; - - TRACE( " for %s\n", debugstr_guid( riid ) ); - - This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( IDirectPlayImpl ) ); - if( !This ) - return DPERR_OUTOFMEMORY; - - This->IDirectPlay4_iface.lpVtbl = &directPlay4WVT; - This->IDirectPlay4A_iface.lpVtbl = &directPlay4AVT; - - if( IsEqualGUID( &IID_IDirectPlay2, riid ) || IsEqualGUID( &IID_IDirectPlay3, riid ) || - IsEqualGUID( &IID_IDirectPlay4, riid ) ) - *ppvObj = &This->IDirectPlay4_iface; - else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) || - IsEqualGUID( &IID_IDirectPlay3A, riid ) || IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - *ppvObj = &This->IDirectPlay4A_iface; - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - /* Initialize it */ - if ( DP_CreateDirectPlay2( This ) ) - { - InitializeCriticalSection( &This->lock ); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); - IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); - - return S_OK; - } - - /* Initialize failed, destroy it */ - DP_DestroyDirectPlay2( This ); - HeapFree( GetProcessHeap(), 0, This ); - - *ppvObj = NULL; - return DPERR_NOMEMORY; -} - - /* Direct Play methods */ /* Shared between all dplay types */ @@ -4619,12 +4566,8 @@ static HRESULT WINAPI DirectPlay4WImpl_CancelPriority } /* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay4WVT.fun)) -#else # define XCAST(fun) (void*) -#endif -static const IDirectPlay4Vtbl directPlay4WVT = +static const IDirectPlay4Vtbl dp4_vt = { IDirectPlay4Impl_QueryInterface, IDirectPlay4Impl_AddRef, @@ -4685,7 +4628,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = }; #undef XCAST -static const IDirectPlay4Vtbl directPlay4AVT = +static const IDirectPlay4Vtbl dp4A_vt = { IDirectPlay4AImpl_QueryInterface, IDirectPlay4AImpl_AddRef, @@ -4743,6 +4686,35 @@ static const IDirectPlay4Vtbl directPlay4AVT = DirectPlay4AImpl_CancelPriority }; +HRESULT dplay_create( REFIID riid, void **ppv ) +{ + IDirectPlayImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), 0, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDirectPlay4A_iface.lpVtbl = &dp4A_vt; + obj->IDirectPlay4_iface.lpVtbl = &dp4_vt; + obj->ulInterfaceRef = 1; + + InitializeCriticalSection( &obj->lock ); + obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); + + if ( DP_CreateDirectPlay2( obj ) ) + hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4A_iface, riid, ppv ); + else + hr = DPERR_NOMEMORY; + IDirectPlayX_Release( &obj->IDirectPlay4A_iface ); + + return hr; +} + + HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID* lplpData ) @@ -5016,13 +4988,10 @@ HRESULT WINAPI DirectPlayCreate return DPERR_INVALIDPARAMS; } - /* Create an IDirectPlay object. We don't support that so we'll cheat and give them an IDirectPlay2A object and hope that doesn't cause problems */ - if( DP_CreateInterface( &IID_IDirectPlay2A, (LPVOID*)lplpDP ) != DP_OK ) - { + if ( dplay_create( &IID_IDirectPlay2A, (void**)lplpDP ) != DP_OK ) return DPERR_UNAVAILABLE; - } if( IsEqualGUID( &GUID_NULL, lpGUID ) ) { diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 9adc67a..204ff59 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -494,8 +494,7 @@ static HRESULT DPL_ConnectEx dwFlags = DPCONNECT_RETURNSTATUS; } - /* Create the DirectPlay interface */ - if( ( hr = DP_CreateInterface( riid, lplpDP ) ) != DP_OK ) + if ( ( hr = dplay_create( riid, lplpDP ) ) != DP_OK ) { ERR( "error creating interface for %s:%s.\n", debugstr_guid( riid ), DPLAYX_HresultToString( hr ) );

1 0

Michael Stefaniuc : dplayx: IDirectPlay4 / IDirectPlay4A have independent refcounts.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 719b5d931cae73042cc38621713e5653f307e964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719b5d931cae73042cc386217… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:49:30 2013 +0100 dplayx: IDirectPlay4 / IDirectPlay4A have independent refcounts. --- dlls/dplayx/dplay.c | 77 ++++++++++++++++++++++++-------------------- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 93862a3..b3bb7c6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -355,6 +355,13 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) return TRUE; } +static void dplay_destroy(IDirectPlayImpl *obj) +{ + DP_DestroyDirectPlay2( obj ); + obj->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &obj->lock ); + HeapFree( GetProcessHeap(), 0, obj ); +} /* Direct Play methods */ @@ -381,36 +388,6 @@ static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, voi return S_OK; } -/* Shared between all dplay types */ -static ULONG WINAPI DP_AddRef( IDirectPlayImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - - TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - - return ulInterfaceRefCount; -} - -static ULONG WINAPI DP_Release( IDirectPlayImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - - TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulInterfaceRefCount == 0 ) - { - /* If we're destroying the object, this must be the last ref - of the last interface */ - DP_DestroyDirectPlay2( This ); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->lock ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ulInterfaceRefCount; -} - static inline DPID DP_NextObjectId(void) { return (DPID)InterlockedIncrement( &kludgePlayerGroupId ); @@ -610,25 +587,53 @@ static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFI static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref4A ); + + TRACE( "(%p) ref4A=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlay4Impl_AddRef(IDirectPlay4 *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - return DP_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref4 ); + + TRACE( "(%p) ref4=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlay4AImpl_Release(IDirectPlay4A *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref4A ); + + TRACE( "(%p) ref4A=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplay_destroy( This ); + + return ref; } static ULONG WINAPI IDirectPlay4Impl_Release(IDirectPlay4 *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - return DP_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref4 ); + + TRACE( "(%p) ref4=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplay_destroy( This ); + + return ref; } static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface, DPID idGroup, @@ -4700,7 +4705,9 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->IDirectPlay4A_iface.lpVtbl = &dp4A_vt; obj->IDirectPlay4_iface.lpVtbl = &dp4_vt; - obj->ulInterfaceRef = 1; + obj->numIfaces = 1; + obj->ref4A = 1; + obj->ref4 = 0; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 4684f53..18eb8077 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -184,7 +184,8 @@ typedef struct IDirectPlayImpl { IDirectPlay4A IDirectPlay4A_iface; IDirectPlay4 IDirectPlay4_iface; - LONG ulInterfaceRef; + LONG numIfaces; /* "in use interfaces" refcount */ + LONG ref4A, ref4; CRITICAL_SECTION lock; DirectPlay2Data *dp2; } IDirectPlayImpl; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index b7bbac3..840015d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6399,7 +6399,7 @@ static void test_COM(void) 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); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlay2_Release(dp2A); hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2, (void**)&dp2);

1 0

Michael Stefaniuc : dplayx: Merge the DirectPlay QueryInterface helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: cf80379e568a9c4915ba625ed75b47d9a621be28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf80379e568a9c4915ba625ed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:50:11 2013 +0100 dplayx: Merge the DirectPlay QueryInterface helper. --- dlls/dplayx/dplay.c | 74 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b3bb7c6..8a95538 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "config.h" #include "wine/port.h" @@ -363,31 +364,6 @@ static void dplay_destroy(IDirectPlayImpl *obj) HeapFree( GetProcessHeap(), 0, obj ); } -/* Direct Play methods */ - -/* Shared between all dplay types */ -static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, void **ppvObj ) -{ - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); - - if( IsEqualGUID( &IID_IDirectPlay2, riid ) || IsEqualGUID( &IID_IDirectPlay3, riid ) || - IsEqualGUID( &IID_IDirectPlay4, riid ) ) - *ppvObj = &This->IDirectPlay4_iface; - else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) || - IsEqualGUID( &IID_IDirectPlay3A, riid ) || IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - *ppvObj = &This->IDirectPlay4A_iface; - else - { - /* Unsupported interface */ - *ppvObj = NULL; - return E_NOINTERFACE; - } - - IDirectPlayX_AddRef( (LPDIRECTPLAY2)*ppvObj ); - - return S_OK; -} - static inline DPID DP_NextObjectId(void) { return (DPID)InterlockedIncrement( &kludgePlayerGroupId ); @@ -574,14 +550,58 @@ static HRESULT WINAPI IDirectPlay4AImpl_QueryInterface( IDirectPlay4A *iface, RE void **ppv ) { IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_QueryInterface( This, riid, ppv ); + return IDirectPlayX_QueryInterface( &This->IDirectPlay4_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFIID riid, void **ppv ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - return DP_QueryInterface( This, riid, ppv ); + + if ( IsEqualGUID( &IID_IUnknown, riid ) ) + { + TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay2A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay2A %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay2, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay2 %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay3A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay3A %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay3, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay3 %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay4A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay4A %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlay4, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay4 %p)\n", This, ppv ); + *ppv = &This->IDirectPlay4_iface; + } + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface)

1 0

Michael Stefaniuc : dplayx: Assimilate the inherited stub methods into IDirectPlay4.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 5e0da57087e9e89366930a2b529dafe6ff599638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0da57087e9e89366930a2b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:51:46 2013 +0100 dplayx: Assimilate the inherited stub methods into IDirectPlay4. --- dlls/dplayx/dplay.c | 144 +++++++++++++++++++++++++-------------------------- 1 files changed, 70 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e0da57087e9e89366930…

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_Close helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 878a6a5a06908ebc97c51c7178756f70c6fb66d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878a6a5a06908ebc97c51c717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:52:03 2013 +0100 dplayx: Merge the IDirectPlay4_Close helper. --- dlls/dplayx/dplay.c | 65 +++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 38 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1f69866..ffaee2d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -156,7 +156,6 @@ static HRESULT DP_IF_SetGroupData static HRESULT DP_IF_GetPlayerCaps ( IDirectPlay2Impl* This, DPID idPlayer, LPDPCAPS lpDPCaps, DWORD dwFlags ); -static HRESULT DP_IF_Close( IDirectPlay2Impl* This, BOOL bAnsi ); static HRESULT DP_IF_CancelMessage ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags, DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi ); @@ -670,49 +669,39 @@ static HRESULT WINAPI DirectPlay2WImpl_AddPlayerToGroup return DP_IF_AddPlayerToGroup( This, NULL, idGroup, idPlayer, FALSE ); } -static HRESULT DP_IF_Close( IDirectPlay2Impl* This, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_Close( IDirectPlay4A *iface ) { - HRESULT hr = DP_OK; - - TRACE("(%p)->(%u)\n", This, bAnsi ); - - /* FIXME: Need to find a new host I assume (how?) */ - /* FIXME: Need to destroy all local groups */ - /* FIXME: Need to migrate all remotely visible players to the new host */ - - /* Invoke the SP callback to inform of session close */ - if( This->dp2->spData.lpCB->CloseEx ) - { - DPSP_CLOSEDATA data; - - TRACE( "Calling SP CloseEx\n" ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_Close( &This->IDirectPlay4_iface); +} - data.lpISP = This->dp2->spData.lpISP; +static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + HRESULT hr = DP_OK; - hr = (*This->dp2->spData.lpCB->CloseEx)( &data ); + TRACE( "(%p)", This ); - } - else if ( This->dp2->spData.lpCB->Close ) /* Try obsolete version */ - { - TRACE( "Calling SP Close (obsolete interface)\n" ); + /* FIXME: Need to find a new host I assume (how?) */ + /* FIXME: Need to destroy all local groups */ + /* FIXME: Need to migrate all remotely visible players to the new host */ - hr = (*This->dp2->spData.lpCB->Close)(); - } - - return hr; -} + /* Invoke the SP callback to inform of session close */ + if( This->dp2->spData.lpCB->CloseEx ) + { + DPSP_CLOSEDATA data; -static HRESULT WINAPI IDirectPlay4AImpl_Close( IDirectPlay4A *iface ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_Close( This, TRUE ); -} + TRACE( "Calling SP CloseEx\n" ); + data.lpISP = This->dp2->spData.lpISP; + hr = (*This->dp2->spData.lpCB->CloseEx)( &data ); + } + else if ( This->dp2->spData.lpCB->Close ) /* Try obsolete version */ + { + TRACE( "Calling SP Close (obsolete interface)\n" ); + hr = (*This->dp2->spData.lpCB->Close)(); + } -static HRESULT WINAPI DirectPlay2WImpl_Close - ( LPDIRECTPLAY2 iface ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_Close( This, FALSE ); + return hr; } static @@ -4596,7 +4585,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_Release, XCAST(AddPlayerToGroup)DirectPlay2WImpl_AddPlayerToGroup, - XCAST(Close)DirectPlay2WImpl_Close, + IDirectPlay4Impl_Close, XCAST(CreateGroup)DirectPlay2WImpl_CreateGroup, XCAST(CreatePlayer)DirectPlay2WImpl_CreatePlayer, XCAST(DeletePlayerFromGroup)DirectPlay2WImpl_DeletePlayerFromGroup,

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_DeletePlayerFromGroup helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: dfe8563d92af1528c1f86b6e73f956e8ad59d45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe8563d92af1528c1f86b6e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:52:30 2013 +0100 dplayx: Merge the IDirectPlay4_DeletePlayerFromGroup helper. --- dlls/dplayx/dplay.c | 119 +++++++++++++++++++------------------------------- 1 files changed, 45 insertions(+), 74 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ffaee2d..ddbba48 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -78,9 +78,6 @@ static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); /* Helper methods for player/group interfaces */ -static HRESULT DP_IF_DeletePlayerFromGroup - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, - DPID idPlayer, BOOL bAnsi ); static HRESULT DP_IF_CreatePlayer ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, LPDPID lpidPlayer, LPDPNAME lpPlayerName, HANDLE hEvent, LPVOID lpData, @@ -1448,76 +1445,60 @@ static DPID DP_GetRemoteNextObjectId(void) return DP_NextObjectId(); } -static HRESULT DP_IF_DeletePlayerFromGroup - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, - DPID idPlayer, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_DeletePlayerFromGroup( IDirectPlay4A *iface, DPID group, + DPID player ) { - HRESULT hr = DP_OK; - - lpGroupData lpGData; - lpPlayerList lpPList; - - TRACE( "(%p)->(%p,0x%08x,0x%08x,%u)\n", - This, lpMsgHdr, idGroup, idPlayer, bAnsi ); - - /* Find the group */ - if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) - { - return DPERR_INVALIDGROUP; - } + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_DeletePlayerFromGroup( &This->IDirectPlay4_iface, group, player ); +} - /* Find the player */ - if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL ) - { - return DPERR_INVALIDPLAYER; - } +static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *iface, DPID group, + DPID player ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + HRESULT hr = DP_OK; - /* Remove the player shortcut from the group */ - DPQ_REMOVE_ENTRY( lpGData->players, players, lpPData->dpid, ==, idPlayer, lpPList ); + lpGroupData gdata; + lpPlayerList plist; - if( lpPList == NULL ) - { - return DPERR_INVALIDPLAYER; - } + TRACE( "(%p)->(0x%08x,0x%08x)\n", This, group, player ); - /* One less reference */ - lpPList->lpPData->uRef--; + /* Find the group */ + if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL ) + return DPERR_INVALIDGROUP; - /* Delete the Player List element */ - HeapFree( GetProcessHeap(), 0, lpPList ); + /* Find the player */ + if ( ( plist = DP_FindPlayer( This, player ) ) == NULL ) + return DPERR_INVALIDPLAYER; - /* Inform the SP if they care */ - if( This->dp2->spData.lpCB->RemovePlayerFromGroup ) - { - DPSP_REMOVEPLAYERFROMGROUPDATA data; + /* Remove the player shortcut from the group */ + DPQ_REMOVE_ENTRY( gdata->players, players, lpPData->dpid, ==, player, plist ); - TRACE( "Calling SP RemovePlayerFromGroup\n" ); + if ( !plist ) + return DPERR_INVALIDPLAYER; - data.idPlayer = idPlayer; - data.idGroup = idGroup; - data.lpISP = This->dp2->spData.lpISP; + /* One less reference */ + plist->lpPData->uRef--; - hr = (*This->dp2->spData.lpCB->RemovePlayerFromGroup)( &data ); - } + /* Delete the Player List element */ + HeapFree( GetProcessHeap(), 0, plist ); - /* Need to send a DELETEPLAYERFROMGROUP message */ - FIXME( "Need to send a message\n" ); + /* Inform the SP if they care */ + if ( This->dp2->spData.lpCB->RemovePlayerFromGroup ) + { + DPSP_REMOVEPLAYERFROMGROUPDATA data; - return hr; -} + TRACE( "Calling SP RemovePlayerFromGroup\n" ); + data.idPlayer = player; + data.idGroup = group; + data.lpISP = This->dp2->spData.lpISP; + hr = (*This->dp2->spData.lpCB->RemovePlayerFromGroup)( &data ); + } -static HRESULT WINAPI IDirectPlay4AImpl_DeletePlayerFromGroup( IDirectPlay4A *iface, DPID idGroup, - DPID idPlayer ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, TRUE ); -} + /* Need to send a DELETEPLAYERFROMGROUP message */ + FIXME( "Need to send a message\n" ); -static HRESULT WINAPI DirectPlay2WImpl_DeletePlayerFromGroup - ( LPDIRECTPLAY2 iface, DPID idGroup, DPID idPlayer ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_DeletePlayerFromGroup( This, NULL, idGroup, idPlayer, FALSE ); + return hr; } typedef struct _DPRGOPContext @@ -1551,18 +1532,9 @@ cbRemoveGroupOrPlayer( dpId, lpCtxt->idGroup ); } } - else - { - if( FAILED( DP_IF_DeletePlayerFromGroup( (IDirectPlay2Impl*)lpCtxt->This, - NULL, lpCtxt->idGroup, - dpId, lpCtxt->bAnsi ) - ) - ) - { - ERR( "Unable to delete player 0x%08x from grp 0x%08x\n", - dpId, lpCtxt->idGroup ); - } - } + else if ( FAILED( IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface, + lpCtxt->idGroup, dpId ) ) ) + ERR( "Unable to delete player 0x%08x from grp 0x%08x\n", dpId, lpCtxt->idGroup ); return TRUE; /* Continue enumeration */ } @@ -1708,8 +1680,7 @@ cbDeletePlayerFromAllGroups( if( dwPlayerType == DPPLAYERTYPE_GROUP ) { - DP_IF_DeletePlayerFromGroup( lpCtxt->This, NULL, dpId, lpCtxt->idPlayer, - lpCtxt->bAnsi ); + IDirectPlayX_DeletePlayerFromGroup( &lpCtxt->This->IDirectPlay4_iface, dpId, lpCtxt->idPlayer ); /* Enumerate all groups in this group since this will normally only * be called for top level groups @@ -4588,7 +4559,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_Close, XCAST(CreateGroup)DirectPlay2WImpl_CreateGroup, XCAST(CreatePlayer)DirectPlay2WImpl_CreatePlayer, - XCAST(DeletePlayerFromGroup)DirectPlay2WImpl_DeletePlayerFromGroup, + IDirectPlay4Impl_DeletePlayerFromGroup, XCAST(DestroyGroup)DirectPlay2WImpl_DestroyGroup, XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer, XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers,

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_EnumGroupPlayers helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 7cd17803d52c15860e70f3cc7dd14e66c5a5772b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd17803d52c15860e70f3cc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:53:07 2013 +0100 dplayx: Merge the IDirectPlay4_EnumGroupPlayers helper. --- dlls/dplayx/dplay.c | 122 +++++++++++++++++---------------------------------- 1 files changed, 41 insertions(+), 81 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ddbba48..d21ac89 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -86,10 +86,6 @@ static HRESULT DP_IF_DestroyGroup ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi ); static HRESULT DP_IF_DestroyPlayer ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi ); -static HRESULT DP_IF_EnumGroupPlayers - ( IDirectPlay2Impl* This, DPID idGroup, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ); static HRESULT DP_IF_GetGroupData ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize, DWORD dwFlags, BOOL bAnsi ); @@ -1559,8 +1555,8 @@ static HRESULT DP_IF_DestroyGroup context.idGroup = idGroup; /* Remove all players that this group has */ - DP_IF_EnumGroupPlayers( This, idGroup, NULL, - cbRemoveGroupOrPlayer, &context, 0, bAnsi ); + IDirectPlayX_EnumGroupPlayers( &This->IDirectPlay4_iface, idGroup, NULL, cbRemoveGroupOrPlayer, + &context, 0 ); /* Remove all links to groups that this group has since this is dp3 */ DP_IF_EnumGroupsInGroup( (IDirectPlay3Impl*)This, idGroup, NULL, @@ -1713,90 +1709,54 @@ static HRESULT WINAPI DirectPlay2WImpl_DestroyPlayer return DP_IF_DestroyPlayer( This, NULL, idPlayer, FALSE ); } -static HRESULT DP_IF_EnumGroupPlayers - ( IDirectPlay2Impl* This, DPID idGroup, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_EnumGroupPlayers( IDirectPlay4A *iface, DPID group, + GUID *instance, LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) { - lpGroupData lpGData; - lpPlayerList lpPList; - - FIXME("(%p)->(0x%08x,%p,%p,%p,0x%08x,%u): semi stub\n", - This, idGroup, lpguidInstance, lpEnumPlayersCallback2, - lpContext, dwFlags, bAnsi ); - - if( This->dp2->connectionInitialized == NO_PROVIDER ) - { - return DPERR_UNINITIALIZED; - } - - /* Find the group */ - if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) - { - return DPERR_INVALIDGROUP; - } + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_EnumGroupPlayers( &This->IDirectPlay4_iface, group, instance, enumplayercb, + context, flags ); +} - if( DPQ_IS_EMPTY( lpGData->players ) ) - { - return DP_OK; - } +static HRESULT WINAPI IDirectPlay4Impl_EnumGroupPlayers( IDirectPlay4 *iface, DPID group, + GUID *instance, LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + lpGroupData gdata; + lpPlayerList plist; - lpPList = DPQ_FIRST( lpGData->players ); + FIXME( "(%p)->(0x%08x,%p,%p,%p,0x%08x): semi stub\n", This, group, instance, enumplayercb, + context, flags ); - /* Walk the players in this group */ - for( ;; ) - { - /* We do not enum the name server or app server as they are of no - * consequence to the end user. - */ - if( ( lpPList->lpPData->dpid != DPID_NAME_SERVER ) && - ( lpPList->lpPData->dpid != DPID_SERVERPLAYER ) - ) - { + if ( This->dp2->connectionInitialized == NO_PROVIDER ) + return DPERR_UNINITIALIZED; - /* FIXME: Need to add stuff for dwFlags checking */ + /* Find the group */ + if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL ) + return DPERR_INVALIDGROUP; - if( !lpEnumPlayersCallback2( lpPList->lpPData->dpid, DPPLAYERTYPE_PLAYER, - &lpPList->lpPData->name, - lpPList->lpPData->dwFlags, - lpContext ) - ) - { - /* User requested break */ + if ( DPQ_IS_EMPTY( gdata->players ) ) return DP_OK; - } - } - if( DPQ_IS_ENDOFLIST( lpPList->players ) ) + /* Walk the players in this group */ + for( plist = DPQ_FIRST( gdata->players ); ; plist = DPQ_NEXT( plist->players ) ) { - break; - } - - lpPList = DPQ_NEXT( lpPList->players ); - } - - return DP_OK; -} - -static HRESULT WINAPI IDirectPlay4AImpl_EnumGroupPlayers( IDirectPlay4A *iface, DPID idGroup, - GUID *lpguidInstance, LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - void *lpContext, DWORD dwFlags ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_EnumGroupPlayers( This, idGroup, lpguidInstance, - lpEnumPlayersCallback2, lpContext, - dwFlags, TRUE ); -} + /* We do not enum the name server or app server as they are of no + * consequence to the end user. + */ + if ( ( plist->lpPData->dpid != DPID_NAME_SERVER ) && + ( plist->lpPData->dpid != DPID_SERVERPLAYER ) ) + { + /* FIXME: Need to add stuff for flags checking */ + if ( !enumplayercb( plist->lpPData->dpid, DPPLAYERTYPE_PLAYER, + &plist->lpPData->name, plist->lpPData->dwFlags, context ) ) + /* User requested break */ + return DP_OK; + } -static HRESULT WINAPI DirectPlay2WImpl_EnumGroupPlayers - ( LPDIRECTPLAY2 iface, DPID idGroup, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_EnumGroupPlayers( This, idGroup, lpguidInstance, - lpEnumPlayersCallback2, lpContext, - dwFlags, FALSE ); + if ( DPQ_IS_ENDOFLIST( plist->players ) ) + break; + } + return DP_OK; } /* NOTE: This only enumerates top level groups (created with CreateGroup) */ @@ -4562,7 +4522,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_DeletePlayerFromGroup, XCAST(DestroyGroup)DirectPlay2WImpl_DestroyGroup, XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer, - XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers, + IDirectPlay4Impl_EnumGroupPlayers, IDirectPlay4Impl_EnumGroups, IDirectPlay4Impl_EnumPlayers, XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions,

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_GetGroupData helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 4ccd8720d516302dca204fe9a46bf0f8f5292e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccd8720d516302dca204fe9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:54:00 2013 +0100 dplayx: Merge the IDirectPlay4_GetGroupData helper. --- dlls/dplayx/dplay.c | 88 ++++++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 53 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index d21ac89..3bc5402 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -86,9 +86,6 @@ static HRESULT DP_IF_DestroyGroup ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi ); static HRESULT DP_IF_DestroyPlayer ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi ); -static HRESULT DP_IF_GetGroupData - ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, - LPDWORD lpdwDataSize, DWORD dwFlags, BOOL bAnsi ); static HRESULT DP_IF_GetGroupName ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi ); @@ -2113,63 +2110,48 @@ static HRESULT WINAPI DirectPlay2WImpl_GetCaps return DP_IF_GetCaps( This, lpDPCaps, dwFlags ); } -static HRESULT DP_IF_GetGroupData - ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, - LPDWORD lpdwDataSize, DWORD dwFlags, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupData( IDirectPlay4A *iface, DPID group, + void *data, DWORD *size, DWORD flags ) { - lpGroupData lpGData; - DWORD dwRequiredBufferSize; - LPVOID lpCopyDataFrom; - - TRACE( "(%p)->(0x%08x,%p,%p,0x%08x,%u)\n", - This, idGroup, lpData, lpdwDataSize, dwFlags, bAnsi ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupData( &This->IDirectPlay4_iface, group, data, size, flags ); +} - if( ( lpGData = DP_FindAnyGroup( This, idGroup ) ) == NULL ) - { - return DPERR_INVALIDGROUP; - } +static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID group, + void *data, DWORD *size, DWORD flags ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + lpGroupData gdata; + DWORD bufsize; + void *src; - /* How much buffer is required? */ - if( dwFlags & DPSET_LOCAL ) - { - dwRequiredBufferSize = lpGData->dwLocalDataSize; - lpCopyDataFrom = lpGData->lpLocalData; - } - else - { - dwRequiredBufferSize = lpGData->dwRemoteDataSize; - lpCopyDataFrom = lpGData->lpRemoteData; - } + TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, group, data, size, flags ); - /* Is the user requesting to know how big a buffer is required? */ - if( ( lpData == NULL ) || - ( *lpdwDataSize < dwRequiredBufferSize ) - ) - { - *lpdwDataSize = dwRequiredBufferSize; - return DPERR_BUFFERTOOSMALL; - } + if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL ) + return DPERR_INVALIDGROUP; - CopyMemory( lpData, lpCopyDataFrom, dwRequiredBufferSize ); + /* How much buffer is required? */ + if ( flags & DPSET_LOCAL ) + { + bufsize = gdata->dwLocalDataSize; + src = gdata->lpLocalData; + } + else + { + bufsize = gdata->dwRemoteDataSize; + src = gdata->lpRemoteData; + } - return DP_OK; -} + /* Is the user requesting to know how big a buffer is required? */ + if ( !data || *size < bufsize ) + { + *size = bufsize; + return DPERR_BUFFERTOOSMALL; + } -static HRESULT WINAPI IDirectPlay4AImpl_GetGroupData( IDirectPlay4A *iface, DPID idGroup, - void *lpData, DWORD *lpdwDataSize, DWORD dwFlags ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_GetGroupData( This, idGroup, lpData, lpdwDataSize, - dwFlags, TRUE ); -} + CopyMemory( data, src, bufsize ); -static HRESULT WINAPI DirectPlay2WImpl_GetGroupData - ( LPDIRECTPLAY2 iface, DPID idGroup, LPVOID lpData, - LPDWORD lpdwDataSize, DWORD dwFlags ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_GetGroupData( This, idGroup, lpData, lpdwDataSize, - dwFlags, FALSE ); + return DP_OK; } static HRESULT DP_IF_GetGroupName @@ -4527,7 +4509,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_EnumPlayers, XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions, XCAST(GetCaps)DirectPlay2WImpl_GetCaps, - XCAST(GetGroupData)DirectPlay2WImpl_GetGroupData, + IDirectPlay4Impl_GetGroupData, XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName, IDirectPlay4Impl_GetMessageCount, IDirectPlay4Impl_GetPlayerAddress,

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlay::GetCaps to ::GetPlayerCaps .
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 47cde46c43f2fd0f9c03f69fc4c0e3a819026355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cde46c43f2fd0f9c03f69fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:54:37 2013 +0100 dplayx: Forward IDirectPlay::GetCaps to ::GetPlayerCaps. --- dlls/dplayx/dplay.c | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 3bc5402..bc34f03 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -156,8 +156,6 @@ static HRESULT DP_IF_EnumGroupsInGroup static HRESULT DP_IF_GetGroupParent ( IDirectPlay3AImpl* This, DPID idGroup, LPDPID lpidGroup, BOOL bAnsi ); -static HRESULT DP_IF_GetCaps - ( IDirectPlay2Impl* This, LPDPCAPS lpDPCaps, DWORD dwFlags ); static HRESULT DP_IF_EnumSessions ( IDirectPlay2Impl* This, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout, LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2, @@ -1953,7 +1951,7 @@ static HRESULT DP_IF_EnumSessions DPCAPS spCaps; spCaps.dwSize = sizeof( spCaps ); - DP_IF_GetCaps( This, &spCaps, 0 ); + IDirectPlayX_GetCaps( &This->IDirectPlay4_iface, &spCaps, 0 ); dwTimeout = spCaps.dwTimeout; /* The service provider doesn't provide one either! */ @@ -2090,24 +2088,14 @@ static HRESULT DP_IF_GetPlayerCaps return (*This->dp2->spData.lpCB->GetCaps)( &data ); } -static HRESULT DP_IF_GetCaps - ( IDirectPlay2Impl* This, LPDPCAPS lpDPCaps, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *caps, DWORD flags ) { - return DP_IF_GetPlayerCaps( This, DPID_ALLPLAYERS, lpDPCaps, dwFlags ); + return IDirectPlayX_GetPlayerCaps( iface, DPID_ALLPLAYERS, caps, flags ); } -static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *lpDPCaps, - DWORD dwFlags ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_GetCaps( This, lpDPCaps, dwFlags ); -} - -static HRESULT WINAPI DirectPlay2WImpl_GetCaps - ( LPDIRECTPLAY2 iface, LPDPCAPS lpDPCaps, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_GetCaps( IDirectPlay4 *iface, DPCAPS *caps, DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_GetCaps( This, lpDPCaps, dwFlags ); + return IDirectPlayX_GetPlayerCaps( iface, DPID_ALLPLAYERS, caps, flags ); } static HRESULT WINAPI IDirectPlay4AImpl_GetGroupData( IDirectPlay4A *iface, DPID group, @@ -4508,7 +4496,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_EnumGroups, IDirectPlay4Impl_EnumPlayers, XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions, - XCAST(GetCaps)DirectPlay2WImpl_GetCaps, + IDirectPlay4Impl_GetCaps, IDirectPlay4Impl_GetGroupData, XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName, IDirectPlay4Impl_GetMessageCount,

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_GetPlayerCaps helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: a784e23917a3ca8055b7efeb51b3356ee636eb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a784e23917a3ca8055b7efeb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:55:04 2013 +0100 dplayx: Merge the IDirectPlay4_GetPlayerCaps helper. --- dlls/dplayx/dplay.c | 57 +++++++++++++++++++------------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index bc34f03..609d6ad 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -143,9 +143,6 @@ static HRESULT DP_SP_SendEx static HRESULT DP_IF_SetGroupData ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_GetPlayerCaps - ( IDirectPlay2Impl* This, DPID idPlayer, LPDPCAPS lpDPCaps, - DWORD dwFlags ); static HRESULT DP_IF_CancelMessage ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags, DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi ); @@ -2066,28 +2063,6 @@ static HRESULT WINAPI DirectPlay2WImpl_EnumSessions lpContext, dwFlags, FALSE ); } -static HRESULT DP_IF_GetPlayerCaps - ( IDirectPlay2Impl* This, DPID idPlayer, LPDPCAPS lpDPCaps, - DWORD dwFlags ) -{ - DPSP_GETCAPSDATA data; - - TRACE("(%p)->(0x%08x,%p,0x%08x)\n", This, idPlayer, lpDPCaps, dwFlags); - - if ( This->dp2->connectionInitialized == NO_PROVIDER ) - { - return DPERR_UNINITIALIZED; - } - - /* Query the service provider */ - data.idPlayer = idPlayer; - data.dwFlags = dwFlags; - data.lpCaps = lpDPCaps; - data.lpISP = This->dp2->spData.lpISP; - - return (*This->dp2->spData.lpCB->GetCaps)( &data ); -} - static HRESULT WINAPI IDirectPlay4AImpl_GetCaps( IDirectPlay4A *iface, DPCAPS *caps, DWORD flags ) { return IDirectPlayX_GetPlayerCaps( iface, DPID_ALLPLAYERS, caps, flags ); @@ -2247,19 +2222,31 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAddress( IDirectPlay4 *iface, DP return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerCaps( IDirectPlay4A *iface, DPID idPlayer, - DPCAPS *lpPlayerCaps, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerCaps( IDirectPlay4A *iface, DPID player, + DPCAPS *caps, DWORD flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_GetPlayerCaps( This, idPlayer, lpPlayerCaps, dwFlags ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetPlayerCaps( &This->IDirectPlay4_iface, player, caps, flags ); } -static HRESULT WINAPI DirectPlay2WImpl_GetPlayerCaps - ( LPDIRECTPLAY2 iface, DPID idPlayer, LPDPCAPS lpPlayerCaps, - DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID player, + DPCAPS *caps, DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_GetPlayerCaps( This, idPlayer, lpPlayerCaps, dwFlags ); + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + DPSP_GETCAPSDATA data; + + TRACE( "(%p)->(0x%08x,%p,0x%08x)\n", This, player, caps, flags); + + if ( This->dp2->connectionInitialized == NO_PROVIDER ) + return DPERR_UNINITIALIZED; + + /* Query the service provider */ + data.idPlayer = player; + data.dwFlags = flags; + data.lpCaps = caps; + data.lpISP = This->dp2->spData.lpISP; + + return (*This->dp2->spData.lpCB->GetCaps)( &data ); } static HRESULT DP_IF_GetPlayerData @@ -4501,7 +4488,7 @@ static const IDirectPlay4Vtbl dp4_vt = XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName, IDirectPlay4Impl_GetMessageCount, IDirectPlay4Impl_GetPlayerAddress, - XCAST(GetPlayerCaps)DirectPlay2WImpl_GetPlayerCaps, + IDirectPlay4Impl_GetPlayerCaps, XCAST(GetPlayerData)DirectPlay2WImpl_GetPlayerData, XCAST(GetPlayerName)DirectPlay2WImpl_GetPlayerName, XCAST(GetSessionDesc)DirectPlay2WImpl_GetSessionDesc,

1 0