From: Anton Baskanov baskanov@gmail.com
--- dlls/dplayx/tests/dplayx.c | 88 +++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 48 deletions(-)
diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 98ed63846c9..e7c2d0b5258 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -624,7 +624,7 @@ static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize, DPID idFrom, idTo; UINT i; DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize ); HRESULT hr; char temp[5];
@@ -652,7 +652,7 @@ static void check_messages( IDirectPlay4 *pDP, DPID *dpid, DWORD dpidSize, callbackData->dwCounter1 = i;
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); }
static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port ) @@ -694,7 +694,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W
if( hr == DPERR_BUFFERTOOSMALL ) { - pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + pAddress = calloc( 1, dwAddressSize ); hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, pAddress, &dwAddressSize ); checkHR( DP_OK, hr ); @@ -703,7 +703,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); checkHR( DP_OK, hr );
- HeapFree( GetProcessHeap(), 0, pAddress ); + free( pAddress ); IDirectPlayLobby_Release(pDPL); }
@@ -1169,7 +1169,7 @@ static void test_EnumAddressTypes(void)
if( hr == DPERR_BUFFERTOOSMALL ) { - pAddress = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwAddressSize ); + pAddress = calloc( 1, dwAddressSize ); hr = IDirectPlayLobby_CreateCompoundAddress( pDPL, addressElements, 2, pAddress, &dwAddressSize ); checkHR( DP_OK, hr ); @@ -1179,7 +1179,7 @@ static void test_EnumAddressTypes(void) IDirectPlayX_Release(pDP); IDirectPlayLobby_Release(pDPL);
- HeapFree( GetProcessHeap(), 0, pAddress ); + free( pAddress ); }
/* Open */ @@ -1859,9 +1859,9 @@ static void test_SessionDesc(void) /* Players, only to receive messages */ IDirectPlayX_CreatePlayer( pDP[i], &dpid[i], NULL, NULL, NULL, 0, 0 );
- lpData[i] = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 1024 ); + lpData[i] = calloc( 1, 1024 ); } - lpDataMsg = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 1024 ); + lpDataMsg = calloc( 1, 1024 );
/* Incorrect parameters */ @@ -1965,10 +1965,10 @@ if(0) checkStr( "S1,S1,S1,S1,S1,S1,", callbackData.szTrace1 ); checkStr( "90,90,90,90,90,90,", callbackData.szTrace2 );
- HeapFree( GetProcessHeap(), 0, lpDataMsg ); + free( lpDataMsg ); for (i=0; i<2; i++) { - HeapFree( GetProcessHeap(), 0, lpData[i] ); + free( lpData[i] ); IDirectPlayX_Release( pDP[i] ); }
@@ -2330,8 +2330,7 @@ static void test_PlayerData(void) LPCSTR lpDataLocal = "local_data"; DWORD dwDataSizeLocal = strlen(lpDataLocal)+1;
- LPSTR lpDataGet = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - dwDataSizeFake ); + LPSTR lpDataGet = calloc( 1, dwDataSizeFake ); DWORD dwDataSizeGet = dwDataSizeFake;
@@ -2571,7 +2570,7 @@ static void test_PlayerData(void) checkStr( lpDataFake, lpDataGet );
- HeapFree( GetProcessHeap(), 0, lpDataGet ); + free( lpDataGet ); IDirectPlayX_Release( pDP ); }
@@ -2589,7 +2588,7 @@ static void test_PlayerName(void)
DPNAME playerName; DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize ); CallbackData callbackData;
@@ -2821,7 +2820,7 @@ if(0) checkStr( "28,57,28,57,57,59,", callbackData.szTrace2 );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -2872,7 +2871,7 @@ static void test_GetPlayerAccount(void) UINT i;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize );
for (i=0; i<2; i++) @@ -2998,7 +2997,7 @@ static void test_GetPlayerAccount(void) check( 1024, dwDataSize );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -3058,7 +3057,7 @@ static void test_GetPlayerAddress(void) UINT i;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize );
for (i=0; i<2; i++) @@ -3176,7 +3175,7 @@ static void test_GetPlayerAddress(void) check( 8, callbackData.dwCounter1 );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData );
cleanup: IDirectPlayX_Release( pDP[0] ); @@ -3306,9 +3305,7 @@ static void test_CreateGroup(void)
LPCSTR lpData = "data"; DWORD dwDataSize = strlen(lpData)+1; - LPDPMSG_CREATEPLAYERORGROUP lpDataGet = HeapAlloc( GetProcessHeap(), - HEAP_ZERO_MEMORY, - 1024 ); + LPDPMSG_CREATEPLAYERORGROUP lpDataGet = calloc( 1, 1024 ); DWORD dwDataSizeGet = 1024; CallbackData callbackData;
@@ -3596,7 +3593,7 @@ static void test_CreateGroup(void) shouldn't be messages... */
- HeapFree( GetProcessHeap(), 0, lpDataGet ); + free( lpDataGet ); IDirectPlayX_Release( pDP );
} @@ -4566,7 +4563,7 @@ static void test_groups_p2p(void) UINT i;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 1024 ); + LPVOID lpData = calloc( 1, 1024 ); CallbackData callbackData;
@@ -4785,7 +4782,7 @@ static void test_groups_p2p(void) checkStr( "54,", callbackData.szTrace1 );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -4802,7 +4799,7 @@ static void test_groups_cs(void) UINT i;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 1024 ); + LPVOID lpData = calloc( 1, 1024 );
for (i=0; i<2; i++) @@ -5020,7 +5017,7 @@ static void test_groups_cs(void) checkStr( "54,", callbackData.szTrace1 );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -5039,7 +5036,7 @@ static void test_Send(void) LPCSTR message = "message"; DWORD messageSize = strlen(message) + 1; DWORD dwDataSize = 1024; - LPDPMSG_GENERIC lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPDPMSG_GENERIC lpData = calloc( 1, dwDataSize ); LPDPMSG_SECUREMESSAGE lpDataSecure; UINT i;
@@ -5355,7 +5352,7 @@ static void test_Send(void) checkHR( DPERR_INVALIDPARAMS, hr );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -5373,8 +5370,7 @@ static void test_Receive(void) LPCSTR message = "message"; DWORD messageSize = strlen(message) + 1; DWORD dwDataSize = 1024; - LPDPMSG_GENERIC lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - dwDataSize ); + LPDPMSG_GENERIC lpData = calloc( 1, dwDataSize ); LPDPMSG_CREATEPLAYERORGROUP lpDataCreate; LPDPMSG_DESTROYPLAYERORGROUP lpDataDestroy;
@@ -5641,7 +5637,7 @@ static void test_Receive(void) checkHR( DPERR_NOMESSAGES, hr );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP );
} @@ -5659,7 +5655,7 @@ static void test_GetMessageCount(void) DWORD dwCount;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize ); CallbackData callbackData;
@@ -5863,7 +5859,7 @@ static void test_GetMessageCount(void) check( 0, dwCount );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -5883,7 +5879,7 @@ static void test_GetMessageQueue(void) DWORD dwNumMsgs, dwNumBytes;
DWORD dwDataSize = 1024; - LPVOID lpData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwDataSize ); + LPVOID lpData = calloc( 1, dwDataSize );
for (i=0; i<2; i++) @@ -6176,7 +6172,7 @@ if(0) check( 0, dwNumBytes );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -6196,14 +6192,12 @@ static void test_remote_data_replication(void) DWORD dwFlags, dwDataSize = 1024; DWORD dwCount;
- LPDPMSG_SETPLAYERORGROUPDATA lpData = HeapAlloc( GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwDataSize ); + LPDPMSG_SETPLAYERORGROUPDATA lpData = calloc( 1, dwDataSize );
LPCSTR lpDataLocal[] = { "local_0", "local_1" }; LPCSTR lpDataRemote[] = { "remote_0", "remote_1" }; LPCSTR lpDataFake = "ugly_fake_data"; - LPSTR lpDataGet = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); + LPSTR lpDataGet = calloc( 1, 32 ); DWORD dwDataSizeLocal = strlen(lpDataLocal[0])+1, dwDataSizeRemote = strlen(lpDataRemote[0])+1, dwDataSizeFake = strlen(lpDataFake)+1, @@ -6403,8 +6397,8 @@ static void test_remote_data_replication(void) checkStr( "", callbackData.szTrace1 );
- HeapFree( GetProcessHeap(), 0, lpDataGet ); - HeapFree( GetProcessHeap(), 0, lpData ); + free( lpDataGet ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -6423,9 +6417,7 @@ static void test_host_migration(void) DWORD dwCount;
DWORD dwDataSize = 1024; - LPDPMSG_DESTROYPLAYERORGROUP lpData = HeapAlloc( GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwDataSize ); + LPDPMSG_DESTROYPLAYERORGROUP lpData = calloc( 1, dwDataSize );
for (i=0; i<2; i++) @@ -6538,7 +6530,7 @@ static void test_host_migration(void) checkHR( DPERR_NOMESSAGES, hr );
- HeapFree( GetProcessHeap(), 0, lpData ); + free( lpData ); IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] );
@@ -6876,7 +6868,7 @@ static BOOL is_stub_dll(const char *filename) size = GetFileVersionInfoSizeA(filename, &ver); if (!size) return FALSE;
- data = HeapAlloc(GetProcessHeap(), 0, size); + data = malloc(size); if (!data) return FALSE;
if (GetFileVersionInfoA(filename, ver, size, data)) @@ -6887,7 +6879,7 @@ static BOOL is_stub_dll(const char *filename) if (VerQueryValueA(data, buf, (void**)&p, &size)) isstub = !lstrcmpiA("wcodstub.dll", p); } - HeapFree(GetProcessHeap(), 0, data); + free(data);
return isstub; }