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

dplayx: Get rid of the unused DirectPlay3Data / DirectPlay4Data fields.

This commit is contained in:
Michael Stefaniuc 2013-03-29 16:38:52 +01:00 committed by Alexandre Julliard
parent d09d061157
commit 0e7b1a46d5
2 changed files with 2 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dlls/dplayx/dplay.c
View File

@ -391,52 +391,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP )
return TRUE; return TRUE;
} }
static BOOL DP_CreateDirectPlay3( LPVOID lpDP )
{
IDirectPlay3AImpl *This = lpDP;
This->dp3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp3) ) );
if ( This->dp3 == NULL )
{
return FALSE;
}
return TRUE;
}
static BOOL DP_DestroyDirectPlay3( LPVOID lpDP )
{
IDirectPlay3AImpl *This = lpDP;
/* Delete the contents */
HeapFree( GetProcessHeap(), 0, This->dp3 );
return TRUE;
}
static BOOL DP_CreateDirectPlay4( LPVOID lpDP )
{
IDirectPlay4AImpl *This = lpDP;
This->dp4 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dp4) ) );
if ( This->dp4 == NULL )
{
return FALSE;
}
return TRUE;
}
static BOOL DP_DestroyDirectPlay4( LPVOID lpDP )
{
IDirectPlay3AImpl *This = lpDP;
/* Delete the contents */
HeapFree( GetProcessHeap(), 0, This->dp4 );
return TRUE;
}
/* Create a new interface */ /* Create a new interface */
HRESULT DP_CreateInterface HRESULT DP_CreateInterface
@ -492,11 +446,7 @@ HRESULT DP_CreateInterface
} }
/* Initialize it */ /* Initialize it */
if ( DP_CreateIUnknown( *ppvObj ) && if ( DP_CreateIUnknown( *ppvObj ) && DP_CreateDirectPlay2( *ppvObj ) )
DP_CreateDirectPlay2( *ppvObj ) &&
DP_CreateDirectPlay3( *ppvObj ) &&
DP_CreateDirectPlay4( *ppvObj )
)
{ {
IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj );
@ -504,8 +454,6 @@ HRESULT DP_CreateInterface
} }
/* Initialize failed, destroy it */ /* Initialize failed, destroy it */
DP_DestroyDirectPlay4( *ppvObj );
DP_DestroyDirectPlay3( *ppvObj );
DP_DestroyDirectPlay2( *ppvObj ); DP_DestroyDirectPlay2( *ppvObj );
DP_DestroyIUnknown( *ppvObj ); DP_DestroyIUnknown( *ppvObj );
@ -614,8 +562,6 @@ static ULONG WINAPI DP_Release
{ {
/* If we're destroying the object, this must be the last ref /* If we're destroying the object, this must be the last ref
of the last interface */ of the last interface */
DP_DestroyDirectPlay4( This );
DP_DestroyDirectPlay3( This );
DP_DestroyDirectPlay2( This ); DP_DestroyDirectPlay2( This );
DP_DestroyIUnknown( This ); DP_DestroyIUnknown( This );
} }

13
dlls/dplayx/dplay_global.h
View File

@ -196,21 +196,10 @@ typedef struct tagDirectPlay2Data
DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected;
} DirectPlay2Data; } DirectPlay2Data;
typedef struct tagDirectPlay3Data
{
BOOL dummy;
} DirectPlay3Data;
typedef struct tagDirectPlay4Data
{
BOOL dummy;
} DirectPlay4Data;
#define DP_IMPL_FIELDS \ #define DP_IMPL_FIELDS \
LONG ulInterfaceRef; \ LONG ulInterfaceRef; \
DirectPlayIUnknownData* unk; \ DirectPlayIUnknownData* unk; \
DirectPlay2Data* dp2; \ DirectPlay2Data* dp2;
DirectPlay3Data* dp3; \
DirectPlay4Data* dp4;
struct IDirectPlay2Impl struct IDirectPlay2Impl
{ {