- Wine-Commits - list.winehq.org

Alexandre Julliard : include: Use proper dllimports for iphlpapi functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 6a863965562dda37c1ec2b9f2cbf511f3f44b9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a863965562dda37c1ec2b9f2cbf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:16:29 2023 +0100 include: Use proper dllimports for iphlpapi functions. --- dlls/iphlpapi/iphlpapi_main.c | 1 + include/iphlpapi.h | 200 +++++++++++++++--------------------------- include/netioapi.h | 56 ++++++------ 3 files changed, 100 insertions(+), 157 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for dbghelp functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f6d808477bdc34063667e56b7a97ac3e1e649167 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d808477bdc34063667e56b7a97ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:05:26 2023 +0100 include: Use proper dllimports for dbghelp functions. --- include/dbghelp.h | 368 +++++++++++++-------------- include/imagehlp.h | 731 +++++++++++++---------------------------------------- 2 files changed, 359 insertions(+), 740 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for win32u functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7999f40b38d26837fcb4098035f742621f22389b URL: https://gitlab.winehq.org/wine/wine/-/commit/7999f40b38d26837fcb4098035f742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:33:59 2023 +0100 include: Use proper dllimports for win32u functions. --- dlls/opengl32/make_opengl | 2 - dlls/opengl32/unix_private.h | 1 + dlls/win32u/Makefile.in | 2 +- dlls/win32u/font.c | 2 +- dlls/winevulkan/make_vulkan | 2 - dlls/winevulkan/vulkan.c | 1 + include/ntgdi.h | 496 ++++++++++++++++++++------------------- include/ntuser.h | 546 ++++++++++++++++++++++--------------------- include/wine/gdi_driver.h | 6 +- include/wine/vulkan_driver.h | 2 - include/wine/wgl_driver.h | 2 - 11 files changed, 537 insertions(+), 525 deletions(-)

1 0

Alexandre Julliard : include: Use NTSYSAPI for all ntdll exports.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1f769067a3f45e2f51ab597b46bd041120d1f413 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f769067a3f45e2f51ab597b46bd04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:15:18 2023 +0100 include: Use NTSYSAPI for all ntdll exports. --- include/ddk/wdm.h | 2 +- include/ip2string.h | 35 ++++++++++++++++------------------- include/wine/debug.h | 2 +- include/wine/server.h | 6 +++--- include/wine/unixlib.h | 26 +++++++++++++------------- include/winnt.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 37 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : include: Make sure that Unix function tables are always const.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1771716528d2a863e1146e5e98efefa4b5cf14e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1771716528d2a863e1146e5e98efef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:34:00 2023 +0100 include: Make sure that Unix function tables are always const. --- dlls/win32u/syscall.c | 2 +- include/wine/unixlib.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5a20409437e..13a15f8c6dc 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -465,7 +465,7 @@ static NTSTATUS init( void *dispatcher ) return ntdll_init_syscalls( &syscall_table, dispatcher ); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { init, }; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 8a9522ec532..935baa0d5ba 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -29,6 +29,9 @@ typedef UINT64 unixlib_handle_t; typedef NTSTATUS (*unixlib_entry_t)( void *args ); +extern const unixlib_entry_t __wine_unix_call_funcs[]; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void);

1 0

Alexandre Julliard : odbc32: Make the Unix function table const.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 30dc5d28d199a9232a7d14943d0b59f7ee25d4c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30dc5d28d199a9232a7d14943d0b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:45:17 2023 +0100 odbc32: Make the Unix function table const. --- dlls/odbc32/unixlib.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 7 deletions(-)

1 0

Alexandre Julliard : opengl32: Make the GL driver function table const.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: c48a3bd349ebead5f7e3a8aa1f30d6dfddfe697c URL: https://gitlab.winehq.org/wine/wine/-/commit/c48a3bd349ebead5f7e3a8aa1f30d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:40:19 2023 +0100 opengl32: Make the GL driver function table const. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_private.h | 4 ++-- dlls/opengl32/unix_wgl.c | 14 +++++++------- dlls/win32u/dc.c | 2 +- include/wine/wgl_driver.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index b1161632f81..6ea8c2b016e 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -920,7 +920,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h index f2a9477f990..693c916ddaa 100644 --- a/dlls/opengl32/unix_private.h +++ b/dlls/opengl32/unix_private.h @@ -43,9 +43,9 @@ extern const int extension_registry_size DECLSPEC_HIDDEN; extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; -static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) +static inline const struct opengl_funcs *get_dc_funcs( HDC hdc ) { - struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); + const struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); if (!funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else if (funcs == (void *)-1) funcs = &null_opengl_funcs; return funcs; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 4cf12893541..f97e3147c15 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -77,7 +77,7 @@ struct opengl_context struct wgl_handle { UINT handle; - struct opengl_funcs *funcs; + const struct opengl_funcs *funcs; union { struct opengl_context *context; /* for HANDLE_CONTEXT */ @@ -117,7 +117,7 @@ static struct wgl_handle *get_handle_ptr( HANDLE handle, enum wgl_handle_type ty return NULL; } -static HANDLE alloc_handle( enum wgl_handle_type type, struct opengl_funcs *funcs, void *user_ptr ) +static HANDLE alloc_handle( enum wgl_handle_type type, const struct opengl_funcs *funcs, void *user_ptr ) { HANDLE handle = 0; struct wgl_handle *ptr = NULL; @@ -647,7 +647,7 @@ static HGLRC wrap_wglCreateContext( HDC hdc ) HGLRC ret = 0; struct wgl_context *drv_ctx; struct opengl_context *context; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs) return 0; if (!(drv_ctx = funcs->wgl.p_wglCreateContext( hdc ))) return 0; @@ -679,7 +679,7 @@ static BOOL wrap_wglMakeCurrent( TEB *teb, HDC hdc, HGLRC hglrc ) teb->glReserved1[0] = hdc; teb->glReserved1[1] = hdc; teb->glCurrentRC = hglrc; - teb->glTable = ptr->funcs; + teb->glTable = (void *)ptr->funcs; } } else @@ -751,7 +751,7 @@ static HGLRC wrap_wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *a struct wgl_context *drv_ctx; struct wgl_handle *share_ptr = NULL; struct opengl_context *context; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs) { @@ -796,7 +796,7 @@ static HPBUFFERARB wrap_wglCreatePbufferARB( HDC hdc, int format, int width, int { HPBUFFERARB ret; struct wgl_pbuffer *pbuffer; - struct opengl_funcs *funcs = get_dc_funcs( hdc ); + const struct opengl_funcs *funcs = get_dc_funcs( hdc ); if (!funcs || !funcs->ext.p_wglCreatePbufferARB) return 0; if (!(pbuffer = funcs->ext.p_wglCreatePbufferARB( hdc, format, width, height, attribs ))) return 0; @@ -842,7 +842,7 @@ static BOOL wrap_wglMakeContextCurrentARB( TEB *teb, HDC draw_hdc, HDC read_hdc, teb->glReserved1[0] = draw_hdc; teb->glReserved1[1] = read_hdc; teb->glCurrentRC = hglrc; - teb->glTable = ptr->funcs; + teb->glTable = (void *)ptr->funcs; } } else diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 0ff624068cb..2b8a56de5bd 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1490,7 +1490,7 @@ BOOL WINAPI __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WC /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) +const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index ed11d8caa0e..daaddf9567d 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) -extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); +extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Alex Henrie : include: Annotate MIDL_user_allocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f27ac1bb777aa74c82d91203a06591299e6fef3d URL: https://gitlab.winehq.org/wine/wine/-/commit/f27ac1bb777aa74c82d91203a06591… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:50:55 2023 -0600 include: Annotate MIDL_user_allocate with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 498aa4ddd40..2d836726a15 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -82,8 +82,8 @@ typedef unsigned char boolean; #define midl_user_free MIDL_user_free #define midl_user_allocate MIDL_user_allocate -void * __RPC_USER MIDL_user_allocate(SIZE_T); void __RPC_USER MIDL_user_free(void *); +void * __RPC_USER MIDL_user_allocate(SIZE_T) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(MIDL_user_free) __WINE_MALLOC; #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8) #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: 48801b6dd7d5a5b5c7d8f4c371bc285a686b6d64 URL: https://gitlab.winehq.org/wine/wine/-/commit/48801b6dd7d5a5b5c7d8f4c371bc28… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 22:24:01 2023 -0600 wtsapi32: Use CRT allocation functions. --- dlls/wtsapi32/wtsapi32.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index f4072e7090b..785082d12a3 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -26,7 +26,6 @@ #include "lmcons.h" #include "wtsapi32.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -149,7 +148,7 @@ BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_ nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)nt_process + nt_process->NextEntryOffset); } - if (!(info = heap_alloc(size))) + if (!(info = malloc(size))) { free(nt_info); SetLastError(ERROR_OUTOFMEMORY); @@ -315,7 +314,7 @@ BOOL WINAPI WTSEnumerateSessionsA(HANDLE server, DWORD reserved, DWORD version, size += sizeof(**session_info) + len; } - if (!(*session_info = heap_alloc(size))) + if (!(*session_info = malloc(size))) { WTSFreeMemory(infoW); SetLastError(ERROR_OUTOFMEMORY); @@ -355,7 +354,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE server, DWORD reserved, DWORD version, if (!session_info || !count) return FALSE; - if (!(*session_info = heap_alloc(sizeof(**session_info) + sizeof(session_name)))) + if (!(*session_info = malloc(sizeof(**session_info) + sizeof(session_name)))) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; @@ -378,7 +377,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE server, DWORD reserved, DWORD version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - heap_free(pMemory); + free(pMemory); } /************************************************************ @@ -387,7 +386,7 @@ void WINAPI WTSFreeMemory(PVOID pMemory) BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) { TRACE("%d %p %ld\n", type, ptr, nmemb); - heap_free(ptr); + free(ptr); return TRUE; } @@ -397,7 +396,7 @@ BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) BOOL WINAPI WTSFreeMemoryExW(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) { TRACE("%d %p %ld\n", type, ptr, nmemb); - heap_free(ptr); + free(ptr); return TRUE; } @@ -481,7 +480,7 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF return FALSE; } - if (!(*buffer = heap_alloc(*count))) + if (!(*buffer = malloc(*count))) { WTSFreeMemory(bufferW); return FALSE; @@ -490,7 +489,7 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF if (!(*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) { WTSFreeMemory(bufferW); - heap_free(*buffer); + free(*buffer); return FALSE; } @@ -515,7 +514,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF { WTS_CONNECTSTATE_CLASS *state; - if (!(state = heap_alloc(sizeof(*state)))) return FALSE; + if (!(state = malloc(sizeof(*state)))) return FALSE; *state = WTSActive; *buffer = (WCHAR *)state; *count = sizeof(*state); @@ -526,7 +525,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF { USHORT *protocol; - if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + if (!(protocol = malloc(sizeof(*protocol)))) return FALSE; FIXME("returning 0 protocol type\n"); *protocol = 0; *buffer = (WCHAR *)protocol; @@ -539,7 +538,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF DWORD size = UNLEN + 1; WCHAR *username; - if (!(username = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + if (!(username = malloc(size * sizeof(WCHAR)))) return FALSE; GetUserNameW(username, &size); *buffer = username; *count = size * sizeof(WCHAR); @@ -551,7 +550,7 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF DWORD size = MAX_COMPUTERNAME_LENGTH + 1; WCHAR *computername; - if (!(computername = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + if (!(computername = malloc(size * sizeof(WCHAR)))) return FALSE; GetComputerNameW(computername, &size); *buffer = computername; /* GetComputerNameW() return size doesn't include terminator */

1 0

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

Nov. 3, 2023

Module: wine Branch: master Commit: c2afbc8c0414db624b1a955a3eb063a8bf62f8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2afbc8c0414db624b1a955a3eb063… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 22:55:19 2023 -0600 gdiplus/tests: Use CRT allocation functions. --- dlls/gdiplus/tests/graphics.c | 12 ++++++------ dlls/gdiplus/tests/graphicspath.c | 8 ++++---- dlls/gdiplus/tests/image.c | 20 ++++++++++---------- dlls/gdiplus/tests/metafile.c | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 724be3f1030..de174257994 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -176,7 +176,7 @@ typedef struct node{ /* Linked list prepend function. */ static void log_state(GraphicsState data, node ** log) { - node * new_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(node)); + node * new_entry = malloc(sizeof(node)); new_entry->data = data; new_entry->next = *log; @@ -209,7 +209,7 @@ static void check_no_duplicates(node * log) temp = orig; do{ temp2 = temp->next; - HeapFree(GetProcessHeap(), 0, temp); + free(temp); temp = temp2; }while(temp); @@ -7198,19 +7198,19 @@ static HDC create_printer_dc(void) if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; pGetPrinterA(hprn, 2, NULL, 0, &len); - pbuf = HeapAlloc(GetProcessHeap(), 0, len); + pbuf = malloc(len); if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); - dbuf = HeapAlloc(GetProcessHeap(), 0, len); + dbuf = malloc(len); if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); done: - HeapFree(GetProcessHeap(), 0, dbuf); - HeapFree(GetProcessHeap(), 0, pbuf); + free(dbuf); + free(pbuf); if (hprn) pClosePrinter(hprn); if (winspool) FreeLibrary(winspool); return hdc; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 823e1cf38ed..f6e0264b786 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -94,8 +94,8 @@ static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expect ok_(__FILE__,line)(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); - points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); - types = HeapAlloc(GetProcessHeap(), 0, size); + points = malloc(size * sizeof(GpPointF)); + types = malloc(size); if(GdipGetPathPoints(path, points, size) != Ok || GdipGetPathTypes(path, types, size) != Ok){ skip("Cannot perform path comparisons due to failure to retrieve path.\n"); @@ -125,8 +125,8 @@ static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expect } end: - HeapFree(GetProcessHeap(), 0, types); - HeapFree(GetProcessHeap(), 0, points); + free(types); + free(points); } static void test_constructor_destructor(void) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4d93e28d951..8fc9aa78225 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3797,7 +3797,7 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ if (count_broken != ~0 && count_broken == prop_count) td = td_broken; - prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + prop_id = malloc(prop_count * sizeof(*prop_id)); status = GdipGetPropertyIdList(image, prop_count, prop_id); expect(Ok, status); @@ -3821,7 +3821,7 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ if (prop_size) *prop_size += size; - prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + prop_item = calloc(1, size); status = GdipGetPropertyItem(image, prop_id[i], size, prop_item); size -= sizeof(*prop_item); expect(Ok, status); @@ -3845,12 +3845,12 @@ static void check_properties_id_list(GpImage *image, const struct property_test_ trace("(id %#lx) %s\n", prop_item->id, dbgstr_hexdata(prop_item->value, prop_item->length)); } - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); winetest_pop_context(); } - HeapFree(GetProcessHeap(), 0, prop_id); + free(prop_id); } static void check_properties_get_all(GpImage *image, const struct property_test_data *td, UINT count, @@ -3872,7 +3872,7 @@ static void check_properties_get_all(GpImage *image, const struct property_test_ if (count_broken != ~0 && count_broken == total_count) td = td_broken; - prop_item = HeapAlloc(GetProcessHeap(), 0, total_size); + prop_item = malloc(total_size); status = GdipGetAllPropertyItems(image, total_size, total_count, prop_item); expect(Ok, status); @@ -3902,7 +3902,7 @@ static void check_properties_get_all(GpImage *image, const struct property_test_ winetest_pop_context(); } - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); } static void test_image_properties(void) @@ -4072,7 +4072,7 @@ static void test_image_properties(void) expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); expect(InvalidParameter, status); - prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + prop_item = malloc(prop_size); expected = (image_type == ImageTypeMetafile) ? NotImplemented : InvalidParameter; if (prop_count != 1) { @@ -4091,7 +4091,7 @@ static void test_image_properties(void) status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); ok(status == expected || broken(status == Ok && prop_count == 0), /* XP */ "Expected %d, got %d\n", expected, status); - HeapFree(GetProcessHeap(), 0, prop_item); + free(prop_item); GdipDisposeImage(image); @@ -6132,7 +6132,7 @@ static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) *stride = (*width * 3 + 3) & ~3; trace("width %d, height %d, stride %d\n", *width, *height, *stride); - src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + src = malloc(*stride * *height); scale = 256 / *width; if (!scale) scale = 1; @@ -6263,7 +6263,7 @@ static void test_GdipInitializePalette(void) GdipFree(palette); GdipDisposeImage((GpImage *)bitmap); - HeapFree(GetProcessHeap(), 0, data); + free(data); } static void test_graphics_clear(void) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0b7c8ad9827..f3ab27c0bd2 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3502,19 +3502,19 @@ static HDC create_printer_dc(void) if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; pGetPrinterA(hprn, 2, NULL, 0, &len); - pbuf = HeapAlloc(GetProcessHeap(), 0, len); + pbuf = malloc(len); if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); - dbuf = HeapAlloc(GetProcessHeap(), 0, len); + dbuf = malloc(len); if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); done: - HeapFree(GetProcessHeap(), 0, dbuf); - HeapFree(GetProcessHeap(), 0, pbuf); + free(dbuf); + free(pbuf); if (hprn) pClosePrinter(hprn); if (winspool) FreeLibrary(winspool); return hdc;

1 0