Alex Henrie : dpnet: Use standard C functions for memory allocation in server.c.
Module: wine Branch: master Commit: e2d94b5cdf7aa5ff8f145ba841fe8a79eb0aad5f URL: https://gitlab.winehq.org/wine/wine/-/commit/e2d94b5cdf7aa5ff8f145ba841fe8a7... Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 16 22:08:27 2022 -0700 dpnet: Use standard C functions for memory allocation in server.c. --- dlls/dpnet/server.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 8a8ed04642d..923d0d5bfa5 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -95,9 +95,9 @@ static ULONG WINAPI IDirectPlay8ServerImpl_Release(IDirectPlay8Server *iface) if (!ref) { - heap_free(This->servername); - heap_free(This->data); - heap_free(This); + free(This->servername); + free(This->data); + free(This); } return ref; @@ -182,12 +182,12 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_NAME) { - heap_free(This->servername); + free(This->servername); This->servername = NULL; if(pdpnPlayerInfo->pwszName) { - This->servername = heap_strdupW(pdpnPlayerInfo->pwszName); + This->servername = wcsdup(pdpnPlayerInfo->pwszName); if (!This->servername) return E_OUTOFMEMORY; } @@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if (pdpnPlayerInfo->dwInfoFlags & DPNINFO_DATA) { - heap_free(This->data); + free(This->data); This->data = NULL; This->datasize = 0; @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_SetServerInfo(IDirectPlay8Server *i if(pdpnPlayerInfo->dwDataSize && pdpnPlayerInfo->pvData) { - This->data = heap_alloc(pdpnPlayerInfo->dwDataSize); + This->data = malloc(pdpnPlayerInfo->dwDataSize); if (!This->data) return E_OUTOFMEMORY; @@ -460,7 +460,7 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter, if(pUnkOuter) return CLASS_E_NOAGGREGATION; - server = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ServerImpl)); + server = calloc(1, sizeof(IDirectPlay8ServerImpl)); if (!server) return E_OUTOFMEMORY;
participants (1)
-
Alexandre Julliard