Michael Stefaniuc : dplayx: Merge the IDirectPlay4_GetGroupParent helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 06edee2da763259638c1399a550125f4268e4f39
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06edee2da763259638c1399a55...

Author: Michael Stefaniuc 
Date:   Fri Mar 29 17:03:19 2013 +0100

dplayx: Merge the IDirectPlay4_GetGroupParent helper.

---

dlls/dplayx/dplay.c |   43 ++++++++++++++++---------------------------
 1 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index ff4f469..e01034d 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -133,9 +133,6 @@ static HRESULT DP_SP_SendEx
 static HRESULT DP_IF_CancelMessage
           ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags,
             DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi );
-static HRESULT DP_IF_GetGroupParent
-          ( IDirectPlay3AImpl* This, DPID idGroup, LPDPID lpidGroup,
-            BOOL bAnsi );
 static HRESULT DP_IF_EnumSessions
           ( IDirectPlay2Impl* This, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout,
             LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2,
@@ -3879,35 +3876,27 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID
     return DP_OK;
 }

-static HRESULT DP_IF_GetGroupParent
-          ( IDirectPlay3AImpl* This, DPID idGroup, LPDPID lpidGroup,
-            BOOL bAnsi )
+static HRESULT WINAPI IDirectPlay4AImpl_GetGroupParent( IDirectPlay4A *iface, DPID group,
+        DPID *parent )
 {
-  lpGroupData lpGData;
+    IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
+    return IDirectPlayX_GetGroupParent( &This->IDirectPlay4_iface, group, parent );
+}

-  TRACE("(%p)->(0x%08x,%p,%u)\n", This, idGroup, lpidGroup, bAnsi );
+static HRESULT WINAPI IDirectPlay4Impl_GetGroupParent( IDirectPlay4 *iface, DPID group,
+        DPID *parent )
+{
+    IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
+    lpGroupData gdata;

-  if( ( lpGData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idGroup ) ) == NULL )
-  {
-    return DPERR_INVALIDGROUP;
-  }
+    TRACE( "(%p)->(0x%08x,%p)\n", This, group, parent );

-  *lpidGroup = lpGData->dpid;
+    if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
+        return DPERR_INVALIDGROUP;

-  return DP_OK;
-}
+    *parent = gdata->dpid;

-static HRESULT WINAPI IDirectPlay4AImpl_GetGroupParent( IDirectPlay4A *iface, DPID idGroup,
-        DPID *lpidGroup )
-{
-  IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface );
-  return DP_IF_GetGroupParent( This, idGroup, lpidGroup, TRUE );
-}
-static HRESULT WINAPI DirectPlay3WImpl_GetGroupParent
-          ( LPDIRECTPLAY3 iface, DPID idGroup, LPDPID lpidGroup )
-{
-  IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface;
-  return DP_IF_GetGroupParent( This, idGroup, lpidGroup, FALSE );
+    return DP_OK;
 }

static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerAccount( IDirectPlay4A *iface, DPID player,
@@ -4337,7 +4326,7 @@ static const IDirectPlay4Vtbl dp4_vt =
     IDirectPlay4Impl_SetGroupConnectionSettings,
     IDirectPlay4Impl_StartSession,
     IDirectPlay4Impl_GetGroupFlags,
-  XCAST(GetGroupParent)DirectPlay3WImpl_GetGroupParent,
+    IDirectPlay4Impl_GetGroupParent,
     IDirectPlay4Impl_GetPlayerAccount,
     IDirectPlay4Impl_GetPlayerFlags,
     IDirectPlay4Impl_GetGroupOwner,