Michael Stefaniuc : dplayx: Forward IDirectPlay::EnumPlayers to :: EnumGroupPlayers.
Alexandre Julliard
julliard at winehq.org
Mon Apr 1 13:48:39 CDT 2013
Module: wine
Branch: master
Commit: cd8460821ec831cdeab84dc7070789c9b7ce1982
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8460821ec831cdeab84dc7070789c9b7ce1982
Author: Michael Stefaniuc <mstefani at 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,
More information about the wine-cvs
mailing list