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

Michael Stefaniuc : dplayx: Forward IDirectPlay::Open to ::SecureOpen.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 6f9dc0c2d4558d8f251305e0c86ef33b606e42ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9dc0c2d4558d8f251305e0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:40:40 2013 +0100 dplayx: Forward IDirectPlay::Open to ::SecureOpen. --- dlls/dplayx/dplay.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b2d3bd5..70bb954 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2805,20 +2805,16 @@ static HRESULT DP_SecureOpen return hr; } -static HRESULT WINAPI DirectPlay2AImpl_Open - ( LPDIRECTPLAY2A iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_Open( IDirectPlay4A *iface, DPSESSIONDESC2 *sdesc, + DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - TRACE("(%p)->(%p,0x%08x)\n", This, lpsd, dwFlags ); - return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, TRUE ); + return IDirectPlayX_SecureOpen( iface, sdesc, flags, NULL, NULL ); } -static HRESULT WINAPI DirectPlay2WImpl_Open - ( LPDIRECTPLAY2 iface, LPDPSESSIONDESC2 lpsd, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_Open( IDirectPlay4 *iface, DPSESSIONDESC2 *sdesc, + DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - TRACE("(%p)->(%p,0x%08x)\n", This, lpsd, dwFlags ); - return DP_SecureOpen( This, lpsd, dwFlags, NULL, NULL, FALSE ); + return IDirectPlayX_SecureOpen( iface, sdesc, flags, NULL, NULL ); } static HRESULT DP_IF_Receive @@ -4748,7 +4744,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = XCAST(GetPlayerName)DirectPlay2WImpl_GetPlayerName, XCAST(GetSessionDesc)DirectPlay2WImpl_GetSessionDesc, XCAST(Initialize)DirectPlay2WImpl_Initialize, - XCAST(Open)DirectPlay2WImpl_Open, + IDirectPlay4Impl_Open, XCAST(Receive)DirectPlay2WImpl_Receive, XCAST(Send)DirectPlay2WImpl_Send, XCAST(SetGroupData)DirectPlay2WImpl_SetGroupData, @@ -4816,7 +4812,7 @@ static const IDirectPlay4Vtbl directPlay4AVT = XCAST(GetPlayerName)DirectPlay2AImpl_GetPlayerName, XCAST(GetSessionDesc)DirectPlay2AImpl_GetSessionDesc, XCAST(Initialize)DirectPlay2AImpl_Initialize, - XCAST(Open)DirectPlay2AImpl_Open, + IDirectPlay4AImpl_Open, XCAST(Receive)DirectPlay2AImpl_Receive, XCAST(Send)DirectPlay2AImpl_Send, XCAST(SetGroupData)DirectPlay2AImpl_SetGroupData,

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlay::GetMessageCount to :: GetMessageQueue.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 101dd3a9496197370ed8e28132bbd12a7c0832be URL: http://source.winehq.org/git/wine.git/?a=commit;h=101dd3a9496197370ed8e2813… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:41:22 2013 +0100 dplayx: Forward IDirectPlay::GetMessageCount to ::GetMessageQueue. --- dlls/dplayx/dplay.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 70bb954..ee8f005 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2422,28 +2422,16 @@ static HRESULT WINAPI DirectPlay2WImpl_GetGroupName return DP_IF_GetGroupName( This, idGroup, lpData, lpdwDataSize, FALSE ); } -static HRESULT DP_IF_GetMessageCount - ( IDirectPlay2Impl* This, DPID idPlayer, - LPDWORD lpdwCount, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_GetMessageCount( IDirectPlay4A *iface, DPID player, + DWORD *count ) { - FIXME("(%p)->(0x%08x,%p,%u): stub\n", This, idPlayer, lpdwCount, bAnsi ); - return DP_IF_GetMessageQueue( (IDirectPlay4Impl*)This, 0, idPlayer, - DPMESSAGEQUEUE_RECEIVE, lpdwCount, NULL, - bAnsi ); + return IDirectPlayX_GetMessageQueue( iface, 0, player, DPMESSAGEQUEUE_RECEIVE, count, NULL ); } -static HRESULT WINAPI DirectPlay2AImpl_GetMessageCount - ( LPDIRECTPLAY2A iface, DPID idPlayer, LPDWORD lpdwCount ) +static HRESULT WINAPI IDirectPlay4Impl_GetMessageCount( IDirectPlay4 *iface, DPID player, + DWORD *count ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_GetMessageCount( This, idPlayer, lpdwCount, TRUE ); -} - -static HRESULT WINAPI DirectPlay2WImpl_GetMessageCount - ( LPDIRECTPLAY2 iface, DPID idPlayer, LPDWORD lpdwCount ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_GetMessageCount( This, idPlayer, lpdwCount, FALSE ); + return IDirectPlayX_GetMessageQueue( iface, 0, player, DPMESSAGEQUEUE_RECEIVE, count, NULL ); } static HRESULT WINAPI DirectPlay2AImpl_GetPlayerAddress @@ -4737,7 +4725,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = XCAST(GetCaps)DirectPlay2WImpl_GetCaps, XCAST(GetGroupData)DirectPlay2WImpl_GetGroupData, XCAST(GetGroupName)DirectPlay2WImpl_GetGroupName, - XCAST(GetMessageCount)DirectPlay2WImpl_GetMessageCount, + IDirectPlay4Impl_GetMessageCount, XCAST(GetPlayerAddress)DirectPlay2WImpl_GetPlayerAddress, XCAST(GetPlayerCaps)DirectPlay2WImpl_GetPlayerCaps, XCAST(GetPlayerData)DirectPlay2WImpl_GetPlayerData, @@ -4805,7 +4793,7 @@ static const IDirectPlay4Vtbl directPlay4AVT = XCAST(GetCaps)DirectPlay2AImpl_GetCaps, XCAST(GetGroupData)DirectPlay2AImpl_GetGroupData, XCAST(GetGroupName)DirectPlay2AImpl_GetGroupName, - XCAST(GetMessageCount)DirectPlay2AImpl_GetMessageCount, + IDirectPlay4AImpl_GetMessageCount, XCAST(GetPlayerAddress)DirectPlay2AImpl_GetPlayerAddress, XCAST(GetPlayerCaps)DirectPlay2AImpl_GetPlayerCaps, XCAST(GetPlayerData)DirectPlay2AImpl_GetPlayerData,

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlay::Send to ::SendEx.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: e19620111f31e3c1ef542ef8df1da9aeed43625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19620111f31e3c1ef542ef8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:41:53 2013 +0100 dplayx: Forward IDirectPlay::Send to ::SendEx. --- dlls/dplayx/dplay.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ee8f005..66b4aa6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2881,20 +2881,16 @@ static HRESULT WINAPI DirectPlay2WImpl_Receive lpData, lpdwDataSize, FALSE ); } -static HRESULT WINAPI DirectPlay2AImpl_Send - ( LPDIRECTPLAY2A iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ) +static HRESULT WINAPI IDirectPlay4AImpl_Send( IDirectPlay4A *iface, DPID from, DPID to, + DWORD flags, void *data, DWORD size ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_SendEx( This, idFrom, idTo, dwFlags, lpData, dwDataSize, - 0, 0, NULL, NULL, TRUE ); + return IDirectPlayX_SendEx( iface, from, to, flags, data, size, 0, 0, NULL, NULL ); } -static HRESULT WINAPI DirectPlay2WImpl_Send - ( LPDIRECTPLAY2 iface, DPID idFrom, DPID idTo, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ) +static HRESULT WINAPI IDirectPlay4Impl_Send( IDirectPlay4 *iface, DPID from, DPID to, + DWORD flags, void *data, DWORD size ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_SendEx( This, idFrom, idTo, dwFlags, lpData, dwDataSize, - 0, 0, NULL, NULL, FALSE ); + return IDirectPlayX_SendEx( iface, from, to, flags, data, size, 0, 0, NULL, NULL ); } static HRESULT DP_IF_SetGroupData @@ -4734,7 +4730,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = XCAST(Initialize)DirectPlay2WImpl_Initialize, IDirectPlay4Impl_Open, XCAST(Receive)DirectPlay2WImpl_Receive, - XCAST(Send)DirectPlay2WImpl_Send, + IDirectPlay4Impl_Send, XCAST(SetGroupData)DirectPlay2WImpl_SetGroupData, XCAST(SetGroupName)DirectPlay2WImpl_SetGroupName, XCAST(SetPlayerData)DirectPlay2WImpl_SetPlayerData, @@ -4802,7 +4798,7 @@ static const IDirectPlay4Vtbl directPlay4AVT = XCAST(Initialize)DirectPlay2AImpl_Initialize, IDirectPlay4AImpl_Open, XCAST(Receive)DirectPlay2AImpl_Receive, - XCAST(Send)DirectPlay2AImpl_Send, + IDirectPlay4AImpl_Send, XCAST(SetGroupData)DirectPlay2AImpl_SetGroupData, XCAST(SetGroupName)DirectPlay2AImpl_SetGroupName, XCAST(SetPlayerData)DirectPlay2AImpl_SetPlayerData,

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlay::EnumPlayers to :: EnumGroupPlayers.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: cd8460821ec831cdeab84dc7070789c9b7ce1982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8460821ec831cdeab84dc70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:43:08 2013 +0100 dplayx: Forward IDirectPlay::EnumPlayers to ::EnumGroupPlayers. --- dlls/dplayx/dplay.c | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 66b4aa6..10fde74 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -100,10 +100,6 @@ static HRESULT DP_IF_EnumGroups ( IDirectPlay2Impl* This, LPGUID lpguidInstance, LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_EnumPlayers - ( IDirectPlay2Impl* This, 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 ); @@ -1928,34 +1924,18 @@ static HRESULT WINAPI DirectPlay2WImpl_EnumGroups lpContext, dwFlags, FALSE ); } -static HRESULT DP_IF_EnumPlayers - ( IDirectPlay2Impl* This, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_EnumPlayers( IDirectPlay4A *iface, GUID *instance, + LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) { - return DP_IF_EnumGroupPlayers( This, DPID_SYSTEM_GROUP, lpguidInstance, - lpEnumPlayersCallback2, lpContext, - dwFlags, bAnsi ); + return IDirectPlayX_EnumGroupPlayers( iface, DPID_SYSTEM_GROUP, instance, enumplayercb, + context, flags ); } -static HRESULT WINAPI DirectPlay2AImpl_EnumPlayers - ( LPDIRECTPLAY2A iface, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_EnumPlayers( IDirectPlay4 *iface, GUID *instance, + LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_EnumPlayers( This, lpguidInstance, lpEnumPlayersCallback2, - lpContext, dwFlags, TRUE ); -} - -static HRESULT WINAPI DirectPlay2WImpl_EnumPlayers - ( LPDIRECTPLAY2 iface, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags ) -{ - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_EnumPlayers( This, lpguidInstance, lpEnumPlayersCallback2, - lpContext, dwFlags, FALSE ); + return IDirectPlayX_EnumGroupPlayers( iface, DPID_SYSTEM_GROUP, instance, enumplayercb, + context, flags ); } /* This function should call the registered callback function that the user @@ -4716,7 +4696,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer, XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers, XCAST(EnumGroups)DirectPlay2WImpl_EnumGroups, - XCAST(EnumPlayers)DirectPlay2WImpl_EnumPlayers, + IDirectPlay4Impl_EnumPlayers, XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions, XCAST(GetCaps)DirectPlay2WImpl_GetCaps, XCAST(GetGroupData)DirectPlay2WImpl_GetGroupData, @@ -4784,7 +4764,7 @@ static const IDirectPlay4Vtbl directPlay4AVT = XCAST(DestroyPlayer)DirectPlay2AImpl_DestroyPlayer, XCAST(EnumGroupPlayers)DirectPlay2AImpl_EnumGroupPlayers, XCAST(EnumGroups)DirectPlay2AImpl_EnumGroups, - XCAST(EnumPlayers)DirectPlay2AImpl_EnumPlayers, + IDirectPlay4AImpl_EnumPlayers, XCAST(EnumSessions)DirectPlay2AImpl_EnumSessions, XCAST(GetCaps)DirectPlay2AImpl_GetCaps, XCAST(GetGroupData)DirectPlay2AImpl_GetGroupData,

1 0

Michael Stefaniuc : dplayx: Forward IDirectPlay::EnumGroups to :: EnumGroupsInGroup.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: f19968a57c3b8a722d7b9589c6075cc068329ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f19968a57c3b8a722d7b9589c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:43:37 2013 +0100 dplayx: Forward IDirectPlay::EnumGroups to ::EnumGroupsInGroup. --- dlls/dplayx/dplay.c | 45 ++++++++++++--------------------------------- 1 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 10fde74..bf72a0b 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -96,10 +96,6 @@ static HRESULT DP_IF_EnumGroupPlayers ( IDirectPlay2Impl* This, DPID idGroup, LPGUID lpguidInstance, LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_EnumGroups - ( IDirectPlay2Impl* This, 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 ); @@ -1733,8 +1729,8 @@ static HRESULT DP_IF_DestroyPlayer /* Find each group and call DeletePlayerFromGroup if the player is a member of the group */ - DP_IF_EnumGroups( This, NULL, cbDeletePlayerFromAllGroups, - &cbContext, DPENUMGROUPS_ALL, bAnsi ); + IDirectPlayX_EnumGroups( (IDirectPlay4*)This, NULL, cbDeletePlayerFromAllGroups, &cbContext, + DPENUMGROUPS_ALL ); /* Now delete player and player list from the sys group */ DP_DeletePlayer( This, idPlayer ); @@ -1893,35 +1889,18 @@ static HRESULT WINAPI DirectPlay2WImpl_EnumGroupPlayers } /* NOTE: This only enumerates top level groups (created with CreateGroup) */ -static HRESULT DP_IF_EnumGroups - ( IDirectPlay2Impl* This, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ) -{ - return DP_IF_EnumGroupsInGroup( (IDirectPlay3Impl*)This, - DPID_SYSTEM_GROUP, lpguidInstance, - lpEnumPlayersCallback2, lpContext, - dwFlags, bAnsi ); -} - -static HRESULT WINAPI DirectPlay2AImpl_EnumGroups - ( LPDIRECTPLAY2A iface, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_EnumGroups( IDirectPlay4A *iface, GUID *instance, + LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_EnumGroups( This, lpguidInstance, lpEnumPlayersCallback2, - lpContext, dwFlags, TRUE ); + return IDirectPlayX_EnumGroupsInGroup( iface, DPID_SYSTEM_GROUP, instance, enumplayercb, + context, flags ); } -static HRESULT WINAPI DirectPlay2WImpl_EnumGroups - ( LPDIRECTPLAY2 iface, LPGUID lpguidInstance, - LPDPENUMPLAYERSCALLBACK2 lpEnumPlayersCallback2, - LPVOID lpContext, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_EnumGroups ( IDirectPlay4 *iface, GUID *instance, + LPDPENUMPLAYERSCALLBACK2 enumplayercb, void *context, DWORD flags ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; - return DP_IF_EnumGroups( This, lpguidInstance, lpEnumPlayersCallback2, - lpContext, dwFlags, FALSE ); + return IDirectPlayX_EnumGroupsInGroup( iface, DPID_SYSTEM_GROUP, instance, enumplayercb, + context, flags ); } static HRESULT WINAPI IDirectPlay4AImpl_EnumPlayers( IDirectPlay4A *iface, GUID *instance, @@ -4695,7 +4674,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = XCAST(DestroyGroup)DirectPlay2WImpl_DestroyGroup, XCAST(DestroyPlayer)DirectPlay2WImpl_DestroyPlayer, XCAST(EnumGroupPlayers)DirectPlay2WImpl_EnumGroupPlayers, - XCAST(EnumGroups)DirectPlay2WImpl_EnumGroups, + IDirectPlay4Impl_EnumGroups, IDirectPlay4Impl_EnumPlayers, XCAST(EnumSessions)DirectPlay2WImpl_EnumSessions, XCAST(GetCaps)DirectPlay2WImpl_GetCaps, @@ -4763,7 +4742,7 @@ static const IDirectPlay4Vtbl directPlay4AVT = XCAST(DestroyGroup)DirectPlay2AImpl_DestroyGroup, XCAST(DestroyPlayer)DirectPlay2AImpl_DestroyPlayer, XCAST(EnumGroupPlayers)DirectPlay2AImpl_EnumGroupPlayers, - XCAST(EnumGroups)DirectPlay2AImpl_EnumGroups, + IDirectPlay4AImpl_EnumGroups, IDirectPlay4AImpl_EnumPlayers, XCAST(EnumSessions)DirectPlay2AImpl_EnumSessions, XCAST(GetCaps)DirectPlay2AImpl_GetCaps,

1 0

Michael Stefaniuc : dplayx: Assimilate the inherited methods into IDirectPlay4A.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 5922ad98cb574892982e80dd81369c44a9cc8292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5922ad98cb574892982e80dd8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:44:15 2013 +0100 dplayx: Assimilate the inherited methods into IDirectPlay4A. --- dlls/dplayx/dplay.c | 282 ++++++++++++++++++++++++--------------------------- 1 files changed, 131 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5922ad98cb574892982e8…

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDirectPlay4A().
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: ab987665040f62f8d73429ae62a93a3088069b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab987665040f62f8d73429ae6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:45:09 2013 +0100 dplayx: Introduce impl_from_IDirectPlay4A(). --- dlls/dplayx/dplay.c | 129 ++++++++++++++++++++++++++------------------------- 1 files changed, 66 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab987665040f62f8d7342…

1 0

Michael Stefaniuc : dplayx: Use separate QueryInterface, AddRef and Release methods for IDirectPlay4 + 4A.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 3fa95f33768bfe3daaa4e35311e0ce2b3ceae5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa95f33768bfe3daaa4e3531… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:46:02 2013 +0100 dplayx: Use separate QueryInterface, AddRef and Release methods for IDirectPlay4 + 4A. --- dlls/dplayx/dplay.c | 77 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 52 insertions(+), 25 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 68c5e15..b4e4e45 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -222,6 +222,11 @@ static inline IDirectPlayImpl *impl_from_IDirectPlay4A( IDirectPlay4A *iface ) return (IDirectPlayImpl*)iface; /* What are you gonna do? */ } +static inline IDirectPlayImpl *impl_from_IDirectPlay4( IDirectPlay4 *iface ) +{ + return (IDirectPlayImpl*)iface; /* What are you gonna do? */ +} + static BOOL DP_CreateIUnknown( LPVOID lpDP ) { IDirectPlay2AImpl *This = lpDP; @@ -432,10 +437,8 @@ HRESULT DP_CreateInterface /* Direct Play methods */ /* Shared between all dplay types */ -static HRESULT WINAPI DP_QueryInterface - ( LPDIRECTPLAY2 iface, REFIID riid, LPVOID* ppvObj ) +static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, void **ppvObj ) { - IDirectPlay2Impl *This = (IDirectPlay2Impl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -476,11 +479,9 @@ static HRESULT WINAPI DP_QueryInterface } /* Shared between all dplay types */ -static ULONG WINAPI DP_AddRef - ( LPDIRECTPLAY3 iface ) +static ULONG WINAPI DP_AddRef( IDirectPlayImpl *This ) { ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -491,13 +492,10 @@ static ULONG WINAPI DP_AddRef return ulObjRefCount; } -static ULONG WINAPI DP_Release -( LPDIRECTPLAY3 iface ) +static ULONG WINAPI DP_Release( IDirectPlayImpl *This ) { ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -704,6 +702,44 @@ static HRESULT DP_IF_AddPlayerToGroup return DP_OK; } +static HRESULT WINAPI IDirectPlay4AImpl_QueryInterface( IDirectPlay4A *iface, REFIID riid, + void **ppv ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return DP_QueryInterface( This, 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 ); +} + +static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return DP_AddRef( This ); +} + +static ULONG WINAPI IDirectPlay4Impl_AddRef(IDirectPlay4 *iface) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + return DP_AddRef( This ); +} + +static ULONG WINAPI IDirectPlay4AImpl_Release(IDirectPlay4A *iface) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return DP_Release( This ); +} + +static ULONG WINAPI IDirectPlay4Impl_Release(IDirectPlay4 *iface) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + return DP_Release( This ); +} + static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface, DPID idGroup, DPID idPlayer ) { @@ -4646,9 +4682,9 @@ static HRESULT WINAPI DirectPlay4WImpl_CancelPriority #endif static const IDirectPlay4Vtbl directPlay4WVT = { - XCAST(QueryInterface)DP_QueryInterface, - XCAST(AddRef)DP_AddRef, - XCAST(Release)DP_Release, + IDirectPlay4Impl_QueryInterface, + IDirectPlay4Impl_AddRef, + IDirectPlay4Impl_Release, XCAST(AddPlayerToGroup)DirectPlay2WImpl_AddPlayerToGroup, XCAST(Close)DirectPlay2WImpl_Close, @@ -4705,19 +4741,11 @@ static const IDirectPlay4Vtbl directPlay4WVT = }; #undef XCAST - -/* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay4AVT.fun)) -#else -# define XCAST(fun) (void*) -#endif static const IDirectPlay4Vtbl directPlay4AVT = { - XCAST(QueryInterface)DP_QueryInterface, - XCAST(AddRef)DP_AddRef, - XCAST(Release)DP_Release, - + IDirectPlay4AImpl_QueryInterface, + IDirectPlay4AImpl_AddRef, + IDirectPlay4AImpl_Release, IDirectPlay4AImpl_AddPlayerToGroup, IDirectPlay4AImpl_Close, IDirectPlay4AImpl_CreateGroup, @@ -4770,7 +4798,6 @@ static const IDirectPlay4Vtbl directPlay4AVT = DirectPlay4AImpl_CancelMessage, DirectPlay4AImpl_CancelPriority }; -#undef XCAST HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer,

1 0

Michael Stefaniuc : dplayx: Add both ifaces to the DirectPlay object and stop cloning the object.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: b78f7290fe235c79cd8723e6bb66a2a73bb6eceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78f7290fe235c79cd8723e6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:46:40 2013 +0100 dplayx: Add both ifaces to the DirectPlay object and stop cloning the object. --- dlls/dplayx/dplay.c | 74 +++++++++++++------------------------------- dlls/dplayx/dplay_global.h | 4 +- 2 files changed, 24 insertions(+), 54 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b4e4e45..8220421 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -219,12 +219,12 @@ static LONG kludgePlayerGroupId = 1000; static inline IDirectPlayImpl *impl_from_IDirectPlay4A( IDirectPlay4A *iface ) { - return (IDirectPlayImpl*)iface; /* What are you gonna do? */ + return CONTAINING_RECORD( iface, IDirectPlayImpl, IDirectPlay4A_iface ); } static inline IDirectPlayImpl *impl_from_IDirectPlay4( IDirectPlay4 *iface ) { - return (IDirectPlayImpl*)iface; /* What are you gonna do? */ + return CONTAINING_RECORD( iface, IDirectPlayImpl, IDirectPlay4_iface ); } static BOOL DP_CreateIUnknown( LPVOID lpDP ) @@ -399,12 +399,15 @@ HRESULT DP_CreateInterface 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 ) ) - This->lpVtbl = &directPlay4WVT; + *ppvObj = &This->IDirectPlay4_iface; else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) || IsEqualGUID( &IID_IDirectPlay3A, riid ) || IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - This->lpVtbl = &directPlay4AVT; + *ppvObj = &This->IDirectPlay4A_iface; else { /* Unsupported interface */ @@ -415,8 +418,7 @@ HRESULT DP_CreateInterface } /* Initialize it */ - *ppvObj = This; - if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) ) + if ( DP_CreateIUnknown( This ) && DP_CreateDirectPlay2( This ) ) { IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); @@ -424,10 +426,10 @@ HRESULT DP_CreateInterface } /* Initialize failed, destroy it */ - DP_DestroyDirectPlay2( *ppvObj ); - DP_DestroyIUnknown( *ppvObj ); + DP_DestroyDirectPlay2( This ); + DP_DestroyIUnknown( This ); - HeapFree( GetProcessHeap(), 0, *ppvObj ); + HeapFree( GetProcessHeap(), 0, This ); *ppvObj = NULL; return DPERR_NOMEMORY; @@ -441,35 +443,16 @@ static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, voi { TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( *This ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - CopyMemory( *ppvObj, This, sizeof( *This ) ); - (*(IDirectPlay2Impl**)ppvObj)->ulInterfaceRef = 0; - if( IsEqualGUID( &IID_IDirectPlay2, riid ) || IsEqualGUID( &IID_IDirectPlay3, riid ) || IsEqualGUID( &IID_IDirectPlay4, riid ) ) - { - IDirectPlay4Impl *This = *ppvObj; - This->lpVtbl = &directPlay4WVT; - } + *ppvObj = &This->IDirectPlay4_iface; else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) || IsEqualGUID( &IID_IDirectPlay3A, riid ) || IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - { - IDirectPlay4AImpl *This = *ppvObj; - This->lpVtbl = &directPlay4AVT; - } + *ppvObj = &This->IDirectPlay4A_iface; else { /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); *ppvObj = NULL; - return E_NOINTERFACE; } @@ -481,43 +464,30 @@ static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, voi /* Shared between all dplay types */ static ULONG WINAPI DP_AddRef( IDirectPlayImpl *This ) { - ULONG ulInterfaceRefCount, ulObjRefCount; + ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); + TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - TRACE( "ref count incremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); - - return ulObjRefCount; + return ulInterfaceRefCount; } static ULONG WINAPI DP_Release( IDirectPlayImpl *This ) { - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); + ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - TRACE( "ref count decremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); /* Deallocate if this is the last reference to the object */ - if( ulObjRefCount == 0 ) + if( ulInterfaceRefCount == 0 ) { /* If we're destroying the object, this must be the last ref of the last interface */ DP_DestroyDirectPlay2( This ); DP_DestroyIUnknown( This ); + HeapFree( GetProcessHeap(), 0, This ); } - /* Deallocate the interface */ - if( ulInterfaceRefCount == 0 ) - { - HeapFree( GetProcessHeap(), 0, This ); - } - - return ulObjRefCount; + return ulInterfaceRefCount; } static inline DPID DP_NextObjectId(void) @@ -1766,7 +1736,7 @@ static HRESULT DP_IF_DestroyPlayer /* Find each group and call DeletePlayerFromGroup if the player is a member of the group */ - IDirectPlayX_EnumGroups( (IDirectPlay4*)This, NULL, cbDeletePlayerFromAllGroups, &cbContext, + IDirectPlayX_EnumGroups( &This->IDirectPlay4_iface, NULL, cbDeletePlayerFromAllGroups, &cbContext, DPENUMGROUPS_ALL ); /* Now delete player and player list from the sys group */ diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 94b8f9a..e86c083 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -33,7 +33,6 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, typedef struct tagDirectPlayIUnknownData { - LONG ulObjRef; CRITICAL_SECTION DP_lock; } DirectPlayIUnknownData; @@ -188,7 +187,8 @@ typedef struct tagDirectPlay2Data typedef struct IDirectPlayImpl { - const void *lpVtbl; + IDirectPlay4A IDirectPlay4A_iface; + IDirectPlay4 IDirectPlay4_iface; LONG ulInterfaceRef; DirectPlayIUnknownData *unk; DirectPlay2Data *dp2;

1 0

Francois Gouget : testbot: Add new status values to distinguish bad patches , build errors and TestBot errors.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: tools Branch: master Commit: fab277d195f56acd2e5e6078045077df215fdfa5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fab277d195f56acd2e5e6078… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 14:02:16 2013 +0100 testbot: Add new status values to distinguish bad patches, build errors and TestBot errors. Also rename the 'failed' status to 'boterror' to make its meaning clearer and avoid confusion with test failures. --- testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunTask.pl | 2 +- testbot/ddl/update24.sql | 31 +++++++++++++++++++++++++++++++ testbot/ddl/winetestbot.sql | 6 +++--- testbot/lib/WineTestBot/Jobs.pm | 10 +++++----- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 6 +++--- testbot/web/JobDetails.pl | 2 +- testbot/web/WineTestBot.css | 4 +++- testbot/web/index.pl | 6 ++++-- 11 files changed, 61 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=fab277d195f56acd2e5e…

1 0