- Wine-Commits - list.winehq.org

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

Nov. 3, 2023

Module: wine Branch: master Commit: b1d29765660b5cf7784031d31a84d74fde2f83b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d29765660b5cf7784031d31a84d7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:17:16 2023 -0600 netio: Use CRT allocation functions. --- dlls/netio.sys/netio.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 05b5d6d2a69..46c9541536c 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -31,8 +31,6 @@ #include "winsock2.h" #include "ws2tcpip.h" -#include "wine/heap.h" - WINE_DEFAULT_DEBUG_CHANNEL(netio); struct _WSK_CLIENT @@ -270,7 +268,7 @@ static NTSTATUS WINAPI wsk_close_socket(WSK_SOCKET *socket, IRP *irp) unlock_socket(s); DeleteCriticalSection(&s->cs_socket); - heap_free(socket); + free(socket); irp->IoStatus.Information = 0; dispatch_irp(irp, status); @@ -313,7 +311,7 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ SOCKADDR *local_address, *remote_address; struct wsk_socket_internal *accept_socket; - if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) + if (!(accept_socket = calloc(1, sizeof(*accept_socket)))) { ERR("No memory.\n"); dispatch_pending_io(io, STATUS_NO_MEMORY, 0); @@ -761,7 +759,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam goto done; } - if (!(socket = heap_alloc_zero(sizeof(*socket)))) + if (!(socket = calloc(1, sizeof(*socket)))) { status = STATUS_NO_MEMORY; closesocket(s); @@ -789,7 +787,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam default: FIXME("Flags %#lx not implemented.\n", flags); closesocket(s); - heap_free(socket); + free(socket); status = STATUS_NOT_IMPLEMENTED; goto done; } @@ -855,7 +853,7 @@ static void WINAPI get_address_info_callback(TP_CALLBACK_INSTANCE *instance, voi context->irp->IoStatus.Information = 0; dispatch_irp(context->irp, sock_error_to_ntstatus(ret)); - heap_free(context); + free(context); } static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, @@ -873,7 +871,7 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * if (!irp) return STATUS_INVALID_PARAMETER; - if (!(context = heap_alloc(sizeof(*context)))) + if (!(context = malloc(sizeof(*context)))) { ERR("No memory.\n"); status = STATUS_NO_MEMORY; @@ -894,7 +892,7 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * ERR("Could not submit thread pool callback.\n"); status = STATUS_UNSUCCESSFUL; dispatch_irp(irp, status); - heap_free(context); + free(context); return status; } TRACE("Submitted threadpool callback, context %p.\n", context); @@ -959,7 +957,7 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); - if (!(client = heap_alloc(sizeof(*client)))) + if (!(client = malloc(sizeof(*client)))) { ERR("No memory.\n"); return STATUS_NO_MEMORY; @@ -979,7 +977,7 @@ void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) { TRACE("wsk_registration %p.\n", wsk_registration); - heap_free(wsk_registration->ReservedRegistrationContext); + free(wsk_registration->ReservedRegistrationContext); } static void WINAPI driver_unload(DRIVER_OBJECT *driver)

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: 670d6391c41242aa71fc25e1916add06a05f6b97 URL: https://gitlab.winehq.org/wine/wine/-/commit/670d6391c41242aa71fc25e1916add… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:07:35 2023 -0600 msvfw32/tests: Use CRT allocation functions. --- dlls/msvfw32/tests/drawdib.c | 8 ++++---- dlls/msvfw32/tests/mciwnd.c | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 92e60df264f..dc50429b40d 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -63,7 +63,7 @@ static char *hash_dib(const BITMAPINFO *bmi, const void *bits) CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); CryptDestroyHash(hash); - buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + buf = malloc(hash_size * 2 + 1); for(i = 0; i < hash_size; i++) { @@ -131,7 +131,7 @@ static void test_DrawDib_sizeimage(void) init_bmi(&src_info, WIDTH, HEIGHT, 0); src_dib_size = get_dib_size(&src_info); - src_bits = HeapAlloc(GetProcessHeap(), 0, src_dib_size); + src_bits = malloc(src_dib_size); ok(src_bits != NULL, "Can't allocate memory\n"); memset(src_bits, 0x88, src_dib_size); @@ -160,13 +160,13 @@ static void test_DrawDib_sizeimage(void) ok(strcmp(hash, test_data[i].hash) == 0, "[%u] got %s, expected %s\n", i, hash, test_data[i].hash); - HeapFree(GetProcessHeap(), 0, hash); + free(hash); } r = DrawDibClose(hdd); ok(r, "DrawDibClose failed\n"); - HeapFree(GetProcessHeap(), 0, src_bits); + free(src_bits); DeleteDC(hdc); } diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index 8bf4c103a6c..af368cfcb19 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -23,7 +23,6 @@ #include <windows.h> #include <vfw.h> -#include "wine/heap.h" #include "wine/test.h" static const DWORD file_header[] = /* file_header */ @@ -136,7 +135,7 @@ static BOOL create_avi_file(char *fname) if (hFile == INVALID_HANDLE_VALUE) return FALSE; buffer_length = padding[1]; - buffer = heap_alloc_zero(buffer_length); + buffer = calloc(1, buffer_length); WriteFile(hFile, file_header, sizeof(file_header), &written, NULL); WriteFile(hFile, &main_avi_header, sizeof(MainAVIHeader), &written, NULL); @@ -147,7 +146,7 @@ static BOOL create_avi_file(char *fname) WriteFile(hFile, buffer, buffer_length, &written, NULL); WriteFile(hFile, data, sizeof(data), &written, NULL); - heap_free(buffer); + free(buffer); CloseHandle(hFile); return ret;

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: a76bf99eff09c6618e9882cc828755a0c62e081f URL: https://gitlab.winehq.org/wine/wine/-/commit/a76bf99eff09c6618e9882cc828755… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:41:00 2023 -0600 msident: Use CRT allocation functions. --- dlls/msident/msident.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 2099038ef15..86c05536e15 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,7 +24,6 @@ #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); @@ -76,7 +75,7 @@ static ULONG WINAPI EnumUserIdentity_Release(IEnumUserIdentity *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -166,7 +165,7 @@ static HRESULT WINAPI UserIdentityManager_EnumIdentities(IUserIdentityManager *i TRACE("(%p)\n", ppEnumUser); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY;

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: 3c2ec4ef94efd9fd47b4ed4b6dbd46250ec76f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2ec4ef94efd9fd47b4ed4b6dbd46… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:40:07 2023 -0600 msdasql: Use CRT allocation functions. --- dlls/msdasql/session.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3e6e5f2a0b3..056468f1054 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -25,7 +25,6 @@ #include "objbase.h" #include "rpcproxy.h" #include "msdasc.h" -#include "wine/heap.h" #include "wine/debug.h" #include "msdasql.h" @@ -409,7 +408,7 @@ static ULONG WINAPI session_Release(IUnknown *iface) TRACE( "destroying %p\n", session ); IUnknown_Release(session->datasource); - heap_free( session ); + free(session); } return refs; } @@ -693,15 +692,15 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); - heap_free(command->properties); + free(command->properties); if (command->session) IUnknown_Release(command->session); if (command->hstmt) SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); - heap_free( command->query ); - heap_free( command ); + free(command->query); + free(command); } return refs; } @@ -826,7 +825,7 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) if (rowset->caller) IUnknown_Release(rowset->caller); - heap_free( rowset ); + free(rowset); } return refs; } @@ -1259,7 +1258,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI *rowset = NULL; if (!wcsnicmp( command->query, L"select ", 7 )) { - msrowset = heap_alloc(sizeof(*msrowset)); + msrowset = malloc(sizeof(*msrowset)); if (!msrowset) return E_OUTOFMEMORY; @@ -1326,8 +1325,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, hr = DB_S_DIALECTIGNORED; } - *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); - wcscpy(*commandstr, command->query); + *commandstr = wcsdup(command->query); return hr; } @@ -1339,15 +1337,13 @@ static HRESULT WINAPI command_SetCommandText(ICommandText *iface, REFGUID dialec if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) FIXME("Currently non Default Dialect isn't supported\n"); - heap_free(command->query); + free(command->query); if (commandstr) { - command->query = heap_alloc((lstrlenW(commandstr)+1)*sizeof(WCHAR)); + command->query = wcsdup(commandstr); if (!command->query) return E_OUTOFMEMORY; - - wcscpy(command->query, commandstr); } else command->query = NULL; @@ -1775,7 +1771,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn if (outer) FIXME("Outer not currently supported\n"); - command = heap_alloc(sizeof(*command)); + command = malloc(sizeof(*command)); if (!command) return E_OUTOFMEMORY; @@ -1791,7 +1787,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->hstmt = NULL; command->prop_count = ARRAY_SIZE(msdasql_init_props); - command->properties = heap_alloc(sizeof(msdasql_init_props)); + command->properties = malloc(sizeof(msdasql_init_props)); memcpy(command->properties, msdasql_init_props, sizeof(msdasql_init_props)); IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1915,7 +1911,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **u struct msdasql_session *session; HRESULT hr; - session = heap_alloc(sizeof(*session)); + session = malloc(sizeof(*session)); if (!session) return E_OUTOFMEMORY;

1 0

Alex Henrie : msado15: Remove unused heap.h include.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 02634d8351521aa78379a2315341681cf1e180c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/02634d8351521aa78379a231534168… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:36:29 2023 -0600 msado15: Remove unused heap.h include. --- dlls/msado15/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 187c3cf7518..6489ae3f9b7 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -26,7 +26,6 @@ #include "msado15_backcompat.h" #include "wine/debug.h" -#include "wine/heap.h" #include "msado15_private.h"

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: 472ef2881a8f5910a1fd2aef501a7f300f605fb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/472ef2881a8f5910a1fd2aef501a7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:44:27 2023 -0600 mspatcha: Use CRT allocation functions. --- dlls/mspatcha/lzxd_dec.c | 5 ++--- dlls/mspatcha/mspatcha_main.c | 14 +++++++------- dlls/mspatcha/pa19.c | 10 ++-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c index fe04723b3a7..71c70bdf847 100644 --- a/dlls/mspatcha/lzxd_dec.c +++ b/dlls/mspatcha/lzxd_dec.c @@ -25,7 +25,6 @@ #include <assert.h> #include "windef.h" -#include "wine/heap.h" #include "wine/debug.h" #include "patchapi.h" @@ -683,7 +682,7 @@ DWORD decode_lzxd_stream(const BYTE *src, const size_t input_size, if (progress_fn != NULL && !progress_fn(progress_ctx, 0, (ULONG)output_size)) return ERROR_CANCELLED; - dec = heap_alloc(sizeof(*dec)); + dec = malloc(sizeof(*dec)); if (dec == NULL) return ERROR_OUTOFMEMORY; @@ -765,7 +764,7 @@ DWORD decode_lzxd_stream(const BYTE *src, const size_t input_size, reverse_e8_transform(dst + predef_size, output_size, e8_file_size); free_dec: - heap_free(dec); + free(dec); return err; } diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 1f6653da161..d8582566e9b 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -48,7 +48,7 @@ static WCHAR *strdupAW(const char *src) if (src) { int len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = malloc(len * sizeof(WCHAR)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); } return dst; @@ -65,12 +65,12 @@ BOOL WINAPI TestApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, ULONG appl if (!(patch_fileW = strdupAW(patch_file))) return FALSE; if (old_file && !(old_fileW = strdupAW(old_file))) { - HeapFree(GetProcessHeap(), 0, patch_fileW); + free(patch_fileW); return FALSE; } ret = apply_patch_to_file(patch_fileW, old_fileW, NULL, apply_flags, NULL, NULL, TRUE); - HeapFree(GetProcessHeap(), 0, patch_fileW); - HeapFree(GetProcessHeap(), 0, old_fileW); + free(patch_fileW); + free(old_fileW); return ret; } @@ -123,10 +123,10 @@ BOOL WINAPI ApplyPatchToFileExA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_f ret = apply_patch_to_file(patch_fileW, old_fileW, new_fileW, apply_flags, progress_fn, progress_ctx, FALSE); - HeapFree(GetProcessHeap(), 0, new_fileW); + free(new_fileW); free_wstrs: - HeapFree(GetProcessHeap(), 0, patch_fileW); - HeapFree(GetProcessHeap(), 0, old_fileW); + free(patch_fileW); + free(old_fileW); return ret; } diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index dc6ef79e2b2..4b21b199ed8 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -37,7 +37,6 @@ #include "windef.h" #include "winternl.h" -#include "wine/heap.h" #include "wine/debug.h" #include "patchapi.h" @@ -319,7 +318,7 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz if (ph->err != ERROR_SUCCESS) return -1; - ph->file_table = heap_calloc(ph->input_file_count, sizeof(struct input_file_info)); + ph->file_table = calloc(ph->input_file_count, sizeof(struct input_file_info)); if (ph->file_table == NULL) { ph->err = ERROR_OUTOFMEMORY; @@ -436,11 +435,6 @@ static int read_header(struct patch_file_header *ph, const BYTE *buf, size_t siz return (ph->err == ERROR_SUCCESS) ? 0 : -1; } -static void free_header(struct patch_file_header *ph) -{ - heap_free(ph->file_table); -} - #define TICKS_PER_SEC 10000000 #define SEC_TO_UNIX_EPOCH ((369 * 365 + 89) * (ULONGLONG)86400) @@ -787,7 +781,7 @@ free_decode_buf: VirtualFree(decode_buf, 0, MEM_RELEASE); free_patch_header: - free_header(&ph); + free(ph.file_table); return err; }

1 0

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