Skip to content

W
wine-cw
Commit 7eaafd01 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

dplayx/tests: Get rid of the LPDIRECTPLAY type usage.

parent c1907b5f
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 37 deletions
dlls/dplayx/tests/dplayx.c
View file @ 7eaafd01
...@@ -63,7 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); ...@@ -63,7 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
typedef struct tagCallbackData typedef struct tagCallbackData
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
UINT dwCounter1, dwCounter2; UINT dwCounter1, dwCounter2;
DWORD dwFlags; DWORD dwFlags;
char szTrace1[1024], szTrace2[1024]; char szTrace1[1024], szTrace2[1024];
...@@ -581,10 +581,8 @@ static char dpid2char(DPID* dpid, DWORD dpidSize, DPID idPlayer) ...@@ -581,10 +581,8 @@ static char dpid2char(DPID* dpid, DWORD dpidSize, DPID idPlayer)
return '?'; return '?';
} }
static void check_messages( LPDIRECTPLAY4 pDP, static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize,
DPID *dpid, lpCallbackData callbackData )
DWORD dpidSize,
lpCallbackData callbackData )
{ {
/* Retrieves all messages from the queue of pDP, performing tests /* Retrieves all messages from the queue of pDP, performing tests
* to check if we are receiving what we expect. * to check if we are receiving what we expect.
...@@ -647,9 +645,7 @@ static void check_messages( LPDIRECTPLAY4 pDP, ...@@ -647,9 +645,7 @@ static void check_messages( LPDIRECTPLAY4 pDP,
HeapFree( GetProcessHeap(), 0, lpData ); HeapFree( GetProcessHeap(), 0, lpData );
} }
static void init_TCPIP_provider( LPDIRECTPLAY4 pDP, static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port )
LPCSTR strIPAddressString,
WORD port )
{ {
DPCOMPOUNDADDRESSELEMENT addressElements[3]; DPCOMPOUNDADDRESSELEMENT addressElements[3];
...@@ -732,7 +728,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, ...@@ -732,7 +728,7 @@ static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD,
static void test_DirectPlayCreate(void) static void test_DirectPlayCreate(void)
{ {
LPDIRECTPLAY pDP; IDirectPlay *pDP;
HRESULT hr; HRESULT hr;
/* TODO: Check how it behaves with pUnk!=NULL */ /* TODO: Check how it behaves with pUnk!=NULL */
...@@ -833,7 +829,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, ...@@ -833,7 +829,7 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP,
static void test_EnumConnections(void) static void test_EnumConnections(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
CallbackData callbackData; CallbackData callbackData;
HRESULT hr; HRESULT hr;
...@@ -936,7 +932,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP, ...@@ -936,7 +932,7 @@ static BOOL CALLBACK EnumConnections_cb2( LPCGUID lpguidSP,
static void test_InitializeConnection(void) static void test_InitializeConnection(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
HRESULT hr; HRESULT hr;
hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL,
...@@ -955,7 +951,7 @@ static void test_InitializeConnection(void) ...@@ -955,7 +951,7 @@ static void test_InitializeConnection(void)
static void test_GetCaps(void) static void test_GetCaps(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
DPCAPS dpcaps; DPCAPS dpcaps;
DWORD dwFlags; DWORD dwFlags;
HRESULT hr; HRESULT hr;
...@@ -1068,7 +1064,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD, ...@@ -1068,7 +1064,7 @@ static BOOL CALLBACK EnumSessions_cb2( LPCDPSESSIONDESC2 lpThisSD,
static void test_Open(void) static void test_Open(void)
{ {
LPDIRECTPLAY4 pDP, pDP_server; IDirectPlay4 *pDP, *pDP_server;
DPSESSIONDESC2 dpsd, dpsd_server; DPSESSIONDESC2 dpsd, dpsd_server;
HRESULT hr; HRESULT hr;
...@@ -1228,10 +1224,10 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD, ...@@ -1228,10 +1224,10 @@ static BOOL CALLBACK EnumSessions_cb( LPCDPSESSIONDESC2 lpThisSD,
return TRUE; return TRUE;
} }
static LPDIRECTPLAY4 create_session(DPSESSIONDESC2 *lpdpsd) static IDirectPlay4 *create_session(DPSESSIONDESC2 *lpdpsd)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
DPNAME name; DPNAME name;
DPID dpid; DPID dpid;
HRESULT hr; HRESULT hr;
...@@ -1266,7 +1262,7 @@ static void test_EnumSessions(void) ...@@ -1266,7 +1262,7 @@ static void test_EnumSessions(void)
#define N_SESSIONS 6 #define N_SESSIONS 6
LPDIRECTPLAY4 pDP, pDPserver[N_SESSIONS]; IDirectPlay4 *pDP, *pDPserver[N_SESSIONS];
DPSESSIONDESC2 dpsd, dpsd_server[N_SESSIONS]; DPSESSIONDESC2 dpsd, dpsd_server[N_SESSIONS];
CallbackData callbackData; CallbackData callbackData;
HRESULT hr; HRESULT hr;
...@@ -1636,7 +1632,7 @@ static void test_EnumSessions(void) ...@@ -1636,7 +1632,7 @@ static void test_EnumSessions(void)
static void test_SessionDesc(void) static void test_SessionDesc(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
LPDPSESSIONDESC2 lpData[2]; LPDPSESSIONDESC2 lpData[2];
LPVOID lpDataMsg; LPVOID lpDataMsg;
...@@ -1814,7 +1810,7 @@ static void test_SessionDesc(void) ...@@ -1814,7 +1810,7 @@ static void test_SessionDesc(void)
static void test_CreatePlayer(void) static void test_CreatePlayer(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPNAME name; DPNAME name;
DPID dpid; DPID dpid;
...@@ -1987,7 +1983,7 @@ static void test_CreatePlayer(void) ...@@ -1987,7 +1983,7 @@ static void test_CreatePlayer(void)
static void test_GetPlayerCaps(void) static void test_GetPlayerCaps(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2]; DPID dpid[2];
HRESULT hr; HRESULT hr;
...@@ -2149,7 +2145,7 @@ static void test_GetPlayerCaps(void) ...@@ -2149,7 +2145,7 @@ static void test_GetPlayerCaps(void)
static void test_PlayerData(void) static void test_PlayerData(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid; DPID dpid;
HRESULT hr; HRESULT hr;
...@@ -2415,7 +2411,7 @@ static void test_PlayerData(void) ...@@ -2415,7 +2411,7 @@ static void test_PlayerData(void)
static void test_PlayerName(void) static void test_PlayerName(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2]; DPID dpid[2];
HRESULT hr; HRESULT hr;
...@@ -2695,7 +2691,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD, ...@@ -2695,7 +2691,7 @@ static BOOL CALLBACK EnumSessions_cb_join_secure( LPCDPSESSIONDESC2 lpThisSD,
static void test_GetPlayerAccount(void) static void test_GetPlayerAccount(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2]; DPID dpid[2];
HRESULT hr; HRESULT hr;
...@@ -2879,7 +2875,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType, ...@@ -2879,7 +2875,7 @@ static BOOL CALLBACK EnumAddress_cb( REFGUID guidDataType,
static void test_GetPlayerAddress(void) static void test_GetPlayerAddress(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
LPDIRECTPLAYLOBBY3 pDPL; LPDIRECTPLAYLOBBY3 pDPL;
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2]; DPID dpid[2];
...@@ -3017,7 +3013,7 @@ static void test_GetPlayerAddress(void) ...@@ -3017,7 +3013,7 @@ static void test_GetPlayerAddress(void)
static void test_GetPlayerFlags(void) static void test_GetPlayerFlags(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[4]; DPID dpid[4];
HRESULT hr; HRESULT hr;
...@@ -3125,7 +3121,7 @@ static void test_GetPlayerFlags(void) ...@@ -3125,7 +3121,7 @@ static void test_GetPlayerFlags(void)
static void test_CreateGroup(void) static void test_CreateGroup(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID idFrom, idTo, dpid, idGroup, idGroupParent; DPID idFrom, idTo, dpid, idGroup, idGroupParent;
DPNAME groupName; DPNAME groupName;
...@@ -3434,7 +3430,7 @@ static void test_CreateGroup(void) ...@@ -3434,7 +3430,7 @@ static void test_CreateGroup(void)
static void test_GroupOwner(void) static void test_GroupOwner(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2], idGroup, idOwner; DPID dpid[2], idGroup, idOwner;
HRESULT hr; HRESULT hr;
...@@ -3602,7 +3598,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD, ...@@ -3602,7 +3598,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumPlayers( LPCDPSESSIONDESC2 lpThisSD,
static void test_EnumPlayers(void) static void test_EnumPlayers(void)
{ {
LPDIRECTPLAY4 pDP[3]; IDirectPlay4 *pDP[3];
DPSESSIONDESC2 dpsd[3]; DPSESSIONDESC2 dpsd[3];
DPID dpid[5+2]; /* 5 players, 2 groups */ DPID dpid[5+2]; /* 5 players, 2 groups */
CallbackData callbackData; CallbackData callbackData;
...@@ -3925,7 +3921,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD, ...@@ -3925,7 +3921,7 @@ static BOOL CALLBACK EnumSessions_cb_EnumGroups( LPCDPSESSIONDESC2 lpThisSD,
static void test_EnumGroups(void) static void test_EnumGroups(void)
{ {
LPDIRECTPLAY4 pDP[3]; IDirectPlay4 *pDP[3];
DPSESSIONDESC2 dpsd[3]; DPSESSIONDESC2 dpsd[3];
DPID dpid[5]; DPID dpid[5];
CallbackData callbackData; CallbackData callbackData;
...@@ -4152,7 +4148,7 @@ static void test_EnumGroups(void) ...@@ -4152,7 +4148,7 @@ static void test_EnumGroups(void)
static void test_EnumGroupsInGroup(void) static void test_EnumGroupsInGroup(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd[2]; DPSESSIONDESC2 dpsd[2];
DPID dpid[6]; DPID dpid[6];
CallbackData callbackData; CallbackData callbackData;
...@@ -4387,7 +4383,7 @@ static void test_EnumGroupsInGroup(void) ...@@ -4387,7 +4383,7 @@ static void test_EnumGroupsInGroup(void)
static void test_groups_p2p(void) static void test_groups_p2p(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID idPlayer[6], idGroup[3]; DPID idPlayer[6], idGroup[3];
HRESULT hr; HRESULT hr;
...@@ -4622,7 +4618,7 @@ static void test_groups_p2p(void) ...@@ -4622,7 +4618,7 @@ static void test_groups_p2p(void)
static void test_groups_cs(void) static void test_groups_cs(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID idPlayer[6], idGroup[3]; DPID idPlayer[6], idGroup[3];
CallbackData callbackData; CallbackData callbackData;
...@@ -4859,7 +4855,7 @@ static void test_groups_cs(void) ...@@ -4859,7 +4855,7 @@ static void test_groups_cs(void)
static void test_Send(void) static void test_Send(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[4], idFrom, idTo; DPID dpid[4], idFrom, idTo;
CallbackData callbackData; CallbackData callbackData;
...@@ -5194,7 +5190,7 @@ static void test_Send(void) ...@@ -5194,7 +5190,7 @@ static void test_Send(void)
static void test_Receive(void) static void test_Receive(void)
{ {
LPDIRECTPLAY4 pDP; IDirectPlay4 *pDP;
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[4], idFrom, idTo; DPID dpid[4], idFrom, idTo;
HRESULT hr; HRESULT hr;
...@@ -5479,7 +5475,7 @@ static void test_Receive(void) ...@@ -5479,7 +5475,7 @@ static void test_Receive(void)
static void test_GetMessageCount(void) static void test_GetMessageCount(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[4]; DPID dpid[4];
HRESULT hr; HRESULT hr;
...@@ -5702,7 +5698,7 @@ static void test_GetMessageCount(void) ...@@ -5702,7 +5698,7 @@ static void test_GetMessageCount(void)
static void test_GetMessageQueue(void) static void test_GetMessageQueue(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[4]; DPID dpid[4];
CallbackData callbackData; CallbackData callbackData;
...@@ -6011,7 +6007,7 @@ static void test_GetMessageQueue(void) ...@@ -6011,7 +6007,7 @@ static void test_GetMessageQueue(void)
static void test_remote_data_replication(void) static void test_remote_data_replication(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2], idFrom, idTo; DPID dpid[2], idFrom, idTo;
CallbackData callbackData; CallbackData callbackData;
...@@ -6239,7 +6235,7 @@ static void test_remote_data_replication(void) ...@@ -6239,7 +6235,7 @@ static void test_remote_data_replication(void)
static void test_host_migration(void) static void test_host_migration(void)
{ {
LPDIRECTPLAY4 pDP[2]; IDirectPlay4 *pDP[2];
DPSESSIONDESC2 dpsd; DPSESSIONDESC2 dpsd;
DPID dpid[2], idFrom, idTo; DPID dpid[2], idFrom, idTo;
HRESULT hr; HRESULT hr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment