ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dplayx: Remove the duplicated IDirectPlayLobby{2,3}Impl structs.

This commit is contained in:
Michael Stefaniuc 2013-04-09 22:32:53 +02:00 committed by Alexandre Julliard
parent d73231575f
commit dffc8fc5d1
1 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dlls/dplayx/dplobby.c
View File

@ -40,10 +40,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay);
*/ */
typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl;
typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl;
typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2AImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl;
typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2WImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl;
typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3AImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl;
typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3WImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl;
/* Forward declarations for this module helper methods */ /* Forward declarations for this module helper methods */
HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount,
@ -85,28 +85,13 @@ typedef struct tagDirectPlayLobbyData
DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */
} DirectPlayLobbyData; } DirectPlayLobbyData;
#define DPL_IMPL_FIELDS \ typedef struct IDirectPlayLobbyImpl
LONG ulInterfaceRef; \
DirectPlayLobbyIUnknownData* unk; \
DirectPlayLobbyData* dpl;
struct IDirectPlayLobbyImpl
{ {
const IDirectPlayLobbyVtbl *lpVtbl; const void *lpVtbl;
DPL_IMPL_FIELDS LONG ulInterfaceRef;
}; DirectPlayLobbyIUnknownData* unk;
DirectPlayLobbyData* dpl;
struct IDirectPlayLobby2Impl } IDirectPlayLobbyImpl;
{
const IDirectPlayLobby2Vtbl *lpVtbl;
DPL_IMPL_FIELDS
};
struct IDirectPlayLobby3Impl
{
const IDirectPlayLobby3Vtbl *lpVtbl;
DPL_IMPL_FIELDS
};
/* Forward declarations of virtual tables */ /* Forward declarations of virtual tables */
static const IDirectPlayLobbyVtbl directPlayLobbyWVT; static const IDirectPlayLobbyVtbl directPlayLobbyWVT;
@ -203,46 +188,26 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL )
HRESULT DPL_CreateInterface HRESULT DPL_CreateInterface
( REFIID riid, LPVOID* ppvObj ) ( REFIID riid, LPVOID* ppvObj )
{ {
IDirectPlayLobbyImpl *This;
TRACE( " for %s\n", debugstr_guid( riid ) ); TRACE( " for %s\n", debugstr_guid( riid ) );
*ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *This ) );
sizeof( IDirectPlayLobbyWImpl ) ); if ( !This )
if( *ppvObj == NULL )
{
return DPERR_OUTOFMEMORY; return DPERR_OUTOFMEMORY;
}
if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) )
{
IDirectPlayLobbyWImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobbyWVT; This->lpVtbl = &directPlayLobbyWVT;
}
else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) )
{
IDirectPlayLobbyAImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobbyAVT; This->lpVtbl = &directPlayLobbyAVT;
}
else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) )
{
IDirectPlayLobby2WImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobby2WVT; This->lpVtbl = &directPlayLobby2WVT;
}
else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) )
{
IDirectPlayLobby2AImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobby2AVT; This->lpVtbl = &directPlayLobby2AVT;
}
else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) )
{
IDirectPlayLobby3WImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobby3WVT; This->lpVtbl = &directPlayLobby3WVT;
}
else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) )
{
IDirectPlayLobby3AImpl *This = *ppvObj;
This->lpVtbl = &directPlayLobby3AVT; This->lpVtbl = &directPlayLobby3AVT;
}
else else
{ {
/* Unsupported interface */ /* Unsupported interface */
@ -253,6 +218,7 @@ HRESULT DPL_CreateInterface
} }
/* Initialize it */ /* Initialize it */
*ppvObj = This;
if ( DPL_CreateIUnknown( *ppvObj ) && if ( DPL_CreateIUnknown( *ppvObj ) &&
DPL_CreateLobby1( *ppvObj ) DPL_CreateLobby1( *ppvObj )
) )