November 2023 - Wine-Commits

Alex Henrie : msasn1: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7b246524cfb6e43899b3c433d172d0451129889d URL: https://gitlab.winehq.org/wine/wine/-/commit/7b246524cfb6e43899b3c433d172d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:37:22 2023 -0600 msasn1: Use CRT allocation functions. --- dlls/msasn1/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 4614a5b292e..480683c3bb5 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "msasn1.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -41,7 +40,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, if (!encoder || !decoder || !freemem || !size) return module; - module = heap_alloc(sizeof(*module)); + module = malloc(sizeof(*module)); if (module) { module->nModuleName = magic; @@ -75,7 +74,7 @@ void WINAPI ASN1_CloseModule(ASN1module_t module) { TRACE("(%p)\n", module); - heap_free(module); + free(module); } ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encoder, ASN1octet_t *buf, @@ -88,7 +87,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod if (!module || !encoder) return ASN1_ERR_BADARGS; - enc = heap_alloc(sizeof(*enc)); + enc = malloc(sizeof(*enc)); if (!enc) { return ASN1_ERR_MEMORY; @@ -138,7 +137,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod if (!module || !decoder) return ASN1_ERR_BADARGS; - dec = heap_alloc(sizeof(*dec)); + dec = malloc(sizeof(*dec)); if (!dec) { return ASN1_ERR_MEMORY;

1 0

Alex Henrie : mstask: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: abbc88f4a194ae773567be8ab3e6b4be8813e117 URL: https://gitlab.winehq.org/wine/wine/-/commit/abbc88f4a194ae773567be8ab3e6b4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:47:27 2023 -0600 mstask: Use CRT allocation functions. --- dlls/mstask/mstask_main.c | 4 ++-- dlls/mstask/mstask_private.h | 2 -- dlls/mstask/task_scheduler.c | 8 ++++---- dlls/mstask/task_trigger.c | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index 481c26e9c2e..ab854f0a2b3 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -74,12 +74,12 @@ DWORD WINAPI NetrJobGetInfo_wrapper(ATSVC_HANDLE server_name, DWORD jobid, LPAT_ DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { - return HeapAlloc(GetProcessHeap(), 0, n); + return malloc(n); } DECLSPEC_HIDDEN void __RPC_USER MIDL_user_free(void __RPC_FAR *p) { - HeapFree(GetProcessHeap(), 0, p); + free(p); } DECLSPEC_HIDDEN handle_t __RPC_USER ATSVC_HANDLE_bind(ATSVC_HANDLE str) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 326cd4743bd..34d34d65f61 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -19,8 +19,6 @@ #ifndef __MSTASK_PRIVATE_H__ #define __MSTASK_PRIVATE_H__ -#include "wine/heap.h" - extern LONG dll_ref DECLSPEC_HIDDEN; typedef struct ClassFactoryImpl ClassFactoryImpl; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index d8ccee37f59..4e4953654f3 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -60,7 +60,7 @@ static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); ITaskService_Release(This->service); - heap_free(This); + free(This); InterlockedDecrement(&dll_ref); } @@ -100,7 +100,7 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) { if (This->handle != INVALID_HANDLE_VALUE) FindClose(This->handle); - heap_free(This); + free(This); InterlockedDecrement(&dll_ref); } @@ -259,7 +259,7 @@ static HRESULT create_task_enum(IEnumWorkItems **ret) *ret = NULL; - tasks = heap_alloc(sizeof(*tasks)); + tasks = malloc(sizeof(*tasks)); if (!tasks) return E_OUTOFMEMORY; @@ -523,7 +523,7 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) { ITaskService_Release(service); diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index e3f190a315a..6cf470642bb 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -87,7 +87,7 @@ static ULONG WINAPI MSTASK_ITaskTrigger_Release( if (ref == 0) { ITask_Release(This->parent_task); - heap_free(This); + free(This); InterlockedDecrement(&dll_ref); } return ref; @@ -139,7 +139,7 @@ HRESULT TaskTriggerConstructor(ITask *task, WORD idx, ITaskTrigger **trigger) TRACE("(%p, %u, %p)\n", task, idx, trigger); - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0

Alex Henrie : iccvid: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f10be2e88ba8c806d754bafbed77d1c77afe6db4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f10be2e88ba8c806d754bafbed77d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:30:32 2023 -0600 iccvid: Use CRT allocation functions. --- dlls/iccvid/iccvid.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index cffc75be58e..a1cfdc1ee21 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,7 +51,6 @@ #include "iccvid_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -353,7 +352,7 @@ static cinepak_info *decode_cinepak_init(void) cinepak_info *cvinfo; int i; - cvinfo = heap_alloc( sizeof (cinepak_info) ); + cvinfo = malloc(sizeof(cinepak_info)); if( !cvinfo ) return NULL; cvinfo->strip_num = 0; @@ -374,10 +373,10 @@ static void free_cvinfo( cinepak_info *cvinfo ) for( i=0; i<cvinfo->strip_num; i++ ) { - heap_free(cvinfo->v4_codebook[i]); - heap_free(cvinfo->v1_codebook[i]); + free(cvinfo->v4_codebook[i]); + free(cvinfo->v1_codebook[i]); } - heap_free( cvinfo ); + free( cvinfo ); } typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit, @@ -481,13 +480,13 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, for(i = cvinfo->strip_num; i < frame.strips; i++) { - if((cvinfo->v4_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) + if((cvinfo->v4_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v4 alloc err\n"); return; } - if((cvinfo->v1_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) + if((cvinfo->v1_codebook[i] = malloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v1 alloc err\n"); return; @@ -941,7 +940,7 @@ static LRESULT ICCVID_Close( ICCVID_Info *info ) return 0; if( info->cvinfo ) free_cvinfo( info->cvinfo ); - heap_free( info ); + free( info ); return 1; } @@ -1001,7 +1000,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; - info = heap_alloc( sizeof (ICCVID_Info) ); + info = malloc(sizeof(ICCVID_Info)); if( info ) { info->dwMagic = ICCVID_MAGIC;

1 0

Alex Henrie : inseng: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 9f3a275d34b72eb4ad365a15a472ee91b9860461 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f3a275d34b72eb4ad365a15a472ee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:31:25 2023 -0600 inseng: Use CRT allocation functions. --- dlls/inseng/inseng_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c72a12955b8..f7ce3f173c2 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -32,7 +32,6 @@ #include "inseng.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); @@ -87,7 +86,7 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -334,7 +333,7 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - engine = heap_alloc(sizeof(*engine)); + engine = malloc(sizeof(*engine)); if(!engine) return E_OUTOFMEMORY;

1 0

Alex Henrie : mp3dmod: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 6d6ea43d386d6b42c01ee8caca5e3afc52a780e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d6ea43d386d6b42c01ee8caca5e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:34:41 2023 -0600 mp3dmod: Use CRT allocation functions. --- dlls/mp3dmod/mp3dmod.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 12c34421ce9..842be5889da 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -31,7 +31,6 @@ #include "rpcproxy.h" #include "wmcodecdsp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "initguid.h" DEFINE_GUID(WMMEDIATYPE_Audio, 0x73647561,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71); @@ -107,7 +106,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) MoFreeMediaType(&This->intype); MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); - heap_free(This); + free(This); } return refcount; } @@ -575,7 +574,7 @@ static HRESULT create_mp3_decoder(IUnknown *outer, REFIID iid, void **obj) HRESULT hr; int err; - if (!(This = heap_alloc_zero(sizeof(*This)))) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IUnknown_inner.lpVtbl = &Unknown_vtbl;

1 0

Alex Henrie : jsproxy: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1df98a99cd6a53c4bb842169a639c2644c42b6c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1df98a99cd6a53c4bb842169a639c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:33:04 2023 -0600 jsproxy: Use CRT allocation functions. --- dlls/jsproxy/main.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index b93d1200f42..4e69210dce3 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -31,7 +31,6 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); @@ -50,7 +49,7 @@ static inline WCHAR *strdupAW( const char *src, int len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + if ((dst = malloc( (dst_len + 1) * sizeof(WCHAR) ))) { len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); dst[dst_len] = 0; @@ -65,7 +64,7 @@ static inline char *strdupWA( const WCHAR *src ) if (src) { int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); - if ((dst = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); } return dst; } @@ -85,7 +84,7 @@ BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) EnterCriticalSection( &cs_jsproxy ); - heap_free( global_script->text ); + free( global_script->text ); global_script->text = NULL; LeaveCriticalSection( &cs_jsproxy ); @@ -104,17 +103,17 @@ static WCHAR *load_script( const char *filename ) if (handle == INVALID_HANDLE_VALUE) return NULL; size = GetFileSize( handle, NULL ); - if (!(buffer = heap_alloc( size ))) goto done; + if (!(buffer = malloc( size ))) goto done; if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); - if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + if (!(script = malloc( (len + 1) * sizeof(WCHAR) ))) goto done; MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); script[len] = 0; done: CloseHandle( handle ); - heap_free( buffer ); + free( buffer ); return script; } @@ -141,13 +140,13 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile LeaveCriticalSection( &cs_jsproxy ); return FALSE; } - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; } else { - heap_free( global_script->text ); + free( global_script->text ); if ((global_script->text = load_script( tmpfile ))) ret = TRUE; } @@ -263,10 +262,10 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format ) GetComputerNameExA( format, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = heap_alloc( size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( format, ret, &size )) { - heap_free( ret ); + free( ret ); return NULL; } return ret; @@ -295,7 +294,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) if (!hostnameA) return E_OUTOFMEMORY; res = getaddrinfo( hostnameA, NULL, NULL, &ai ); - heap_free( hostnameA ); + free( hostnameA ); if (res) return S_FALSE; elem = ai; @@ -589,8 +588,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); done: - heap_free( hostnameW ); - heap_free( urlW ); + free( hostnameW ); + free( urlW ); LeaveCriticalSection( &cs_jsproxy ); return ret; }

1 0

Alex Henrie : dhcpcsvc/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 06294b0dbf31b364b79bcad3bd4e3ad68a9da104 URL: https://gitlab.winehq.org/wine/wine/-/commit/06294b0dbf31b364b79bcad3bd4e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:24:20 2023 -0600 dhcpcsvc/tests: Use CRT allocation functions. --- dlls/dhcpcsvc/tests/dhcpcsvc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 52b1b150ad8..8e5d0afa30c 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -27,18 +27,16 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) { ULONG err, size = 1024; - IP_ADAPTER_ADDRESSES *ret = HeapAlloc( GetProcessHeap(), 0, size ); for (;;) { + IP_ADAPTER_ADDRESSES *ret = malloc( size ); err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ret, &size ); - if (err != ERROR_BUFFER_OVERFLOW) break; - ret = HeapReAlloc( GetProcessHeap(), 0, ret, size ); + if (err == ERROR_SUCCESS) return ret; + free( ret ); + if (err != ERROR_BUFFER_OVERFLOW) return NULL; } - if (err == ERROR_SUCCESS) return ret; - HeapFree( GetProcessHeap(), 0, ret ); - return NULL; } static void test_DhcpRequestParams(void) @@ -86,12 +84,12 @@ static void test_DhcpRequestParams(void) recv_params.Params = params; size = 0; - buf = HeapAlloc( GetProcessHeap(), 0, size ); + buf = NULL; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); while (err == ERROR_MORE_DATA) { - buf = HeapReAlloc( GetProcessHeap(), 0, buf, size ); + buf = realloc( buf, size ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); } @@ -117,13 +115,13 @@ static void test_DhcpRequestParams(void) case OPTION_MSFT_IE_PROXY: if (params[i].Data) { - char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); + char *str = malloc( params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); - HeapFree( GetProcessHeap(), 0, str ); + free( str ); } break; default: @@ -132,9 +130,9 @@ static void test_DhcpRequestParams(void) } } } - HeapFree( GetProcessHeap(), 0, buf ); + free( buf ); } - HeapFree( GetProcessHeap(), 0, adapters ); + free( adapters ); } START_TEST(dhcpcsvc)

1 0

Alex Henrie : diasymreader: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: c9d4b515f5400f3f24cf1e89f2d7e55ba099732d URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d4b515f5400f3f24cf1e89f2d7e5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:25:39 2023 -0600 diasymreader: Use CRT allocation functions. --- dlls/diasymreader/main.c | 4 ++-- dlls/diasymreader/writer.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/diasymreader/main.c b/dlls/diasymreader/main.c index da64a156714..28e0525d75c 100644 --- a/dlls/diasymreader/main.c +++ b/dlls/diasymreader/main.c @@ -95,7 +95,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -133,7 +133,7 @@ static HRESULT ClassFactoryImpl_Constructor(const classinfo *info, REFIID riid, *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactoryImpl)); + This = malloc(sizeof(ClassFactoryImpl)); if (!This) return E_OUTOFMEMORY; This->IClassFactory_iface.lpVtbl = &ClassFactoryImpl_Vtbl; diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 3c07b77ab81..55e0615c58e 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -28,7 +28,6 @@ #include "wine/mscvpdb.h" #include "wine/debug.h" -#include "wine/heap.h" #include "diasymreader_private.h" @@ -107,7 +106,7 @@ static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface if (ref == 0) { - heap_free(This); + free(This); } return ref; @@ -187,7 +186,7 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface) { This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - heap_free(This); + free(This); } return ref; @@ -205,7 +204,7 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons if (!pRetVal) return E_POINTER; - result = heap_alloc(sizeof(*result)); + result = malloc(sizeof(*result)); if (!result) return E_OUTOFMEMORY; @@ -596,7 +595,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) SymWriter *This; HRESULT hr; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0

Alex Henrie : dsuiext: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: e90e08b5991eaf048b64e70c9053fa7c44f28e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/e90e08b5991eaf048b64e70c9053fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:28:05 2023 -0600 dsuiext: Use CRT allocation functions. --- dlls/dsuiext/dsuiext.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dsuiext/dsuiext.c b/dlls/dsuiext/dsuiext.c index 762f7596e73..5867c677f68 100644 --- a/dlls/dsuiext/dsuiext.c +++ b/dlls/dsuiext/dsuiext.c @@ -28,7 +28,6 @@ #include "iads.h" #include "dsclient.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dsuiext); @@ -76,7 +75,7 @@ static ULONG WINAPI dispspec_Release(IDsDisplaySpecifier *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(dispspec); + free(dispspec); } return ref; @@ -180,7 +179,7 @@ static HRESULT DsDisplaySpecifier_create(REFIID iid, void **obj) DisplaySpec *dispspec; HRESULT hr; - dispspec = heap_alloc(sizeof(*dispspec)); + dispspec = malloc(sizeof(*dispspec)); if (!dispspec) return E_OUTOFMEMORY; dispspec->IDsDisplaySpecifier_iface.lpVtbl = &IDsDisplaySpecifier_vtbl; @@ -250,7 +249,7 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) TRACE("(%p) ref %lu\n", iface, ref); if (!ref) - heap_free(factory); + free(factory); return ref; } @@ -289,7 +288,7 @@ static HRESULT factory_constructor(const struct class_info *info, REFIID riid, v class_factory *factory; HRESULT hr; - factory = heap_alloc(sizeof(*factory)); + factory = malloc(sizeof(*factory)); if (!factory) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &factory_vtbl;

1 0

Alex Henrie : dhcpcsvc: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 2936bb4a2958d52fdb62a1b3996f0d8bea39ae80 URL: https://gitlab.winehq.org/wine/wine/-/commit/2936bb4a2958d52fdb62a1b3996f0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:21:29 2023 -0600 dhcpcsvc: Use CRT allocation functions. --- dlls/dhcpcsvc/dhcpcsvc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 57bb9a9b6ff..37098610760 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -32,7 +32,6 @@ #include "ddk/mountmgr.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -102,7 +101,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); size = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[recv_params.nParams]) + *buflen; - if (!(query = heap_alloc_zero( size ))) + if (!(query = calloc( 1, size ))) { err = ERROR_OUTOFMEMORY; goto done; @@ -146,7 +145,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC err = ERROR_SUCCESS; done: - heap_free( query ); + free( query ); CloseHandle( mgr ); return err; }

1 0