Commit e2d94b5c authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

dpnet: Use standard C functions for memory allocation in server.c.

parent 8ef070b6
...@@ -95,9 +95,9 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) ...@@ -95,9 +95,9 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface)
if (!ref) if (!ref)
{ {
heap_free(This->servername); free(This->servername);
heap_free(This->data); free(This->data);
heap_free(This); free(This);
} }
return ref; return ref;
...@@ -182,12 +182,12 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i ...@@ -182,12 +182,12 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i
if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME)
{ {
heap_free(This->servername); free(This->servername);
This->servername = NULL; This->servername = NULL;
if(pdpnPlayerInfo->pwszName) if(pdpnPlayerInfo->pwszName)
{ {
This->servername = heap_strdupW(pdpnPlayerInfo->pwszName); This->servername = wcsdup(pdpnPlayerInfo->pwszName);
if (!This->servername) if (!This->servername)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
...@@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i ...@@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i
if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA)
{ {
heap_free(This->data); free(This->data);
This->data = NULL; This->data = NULL;
This->datasize = 0; This->datasize = 0;
...@@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i ...@@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i
if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData)
{ {
This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); This->data = malloc(pdpnPlayerInfo->dwDataSize);
if (!This->data) if (!This->data)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
...@@ -460,7 +460,7 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter, ...@@ -460,7 +460,7 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter,
if(pUnkOuter) if(pUnkOuter)
return CLASS_E_NOAGGREGATION; return CLASS_E_NOAGGREGATION;
server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ServerImpl)); server = calloc(1, sizeof(IDirectPlay8ServerImpl));
if (!server) if (!server)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
......
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