November 2023 - Wine-commits

Alex Henrie : mstask: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

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 : msvfw32/tests: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

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 : quartz: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: f73a8396124d237dee5d012bace3610f81bc3c48 URL: https://gitlab.winehq.org/wine/wine/-/commit/f73a8396124d237dee5d012bace361… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:04:45 2023 -0600 quartz: Use debugstr_fourcc instead of debugstr_an. --- dlls/quartz/filtermapper.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 69755c3648e..87d7c4bb5d5 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -373,7 +373,7 @@ struct REG_RF struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ + DWORD signature; /* e.g. '0pi3' */ DWORD dwFlags; DWORD dwInstances; DWORD dwMediaTypes; @@ -384,7 +384,7 @@ struct REG_RFP struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ + DWORD signature; /* e.g. '0ty3' */ DWORD dwUnused; DWORD dwOffsetMajor; DWORD dwOffsetMinor; @@ -613,11 +613,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG REGFILTERPINS2 rgPin2 = prf2->rgPins2[i]; unsigned int j; - rrfp.signature[0] = '0'; - rrfp.signature[1] = 'p'; - rrfp.signature[2] = 'i'; - rrfp.signature[3] = '3'; - rrfp.signature[0] += i; + rrfp.signature = MAKEFOURCC('0'+i,'p','i','3'); rrfp.dwFlags = rgPin2.dwFlags; rrfp.dwInstances = rgPin2.cInstances; rrfp.dwMediaTypes = rgPin2.nMediaTypes; @@ -639,11 +635,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG { struct REG_TYPE rt; const CLSID * clsMinorType = rgPin2.lpMediaType[j].clsMinorType ? rgPin2.lpMediaType[j].clsMinorType : &MEDIASUBTYPE_NULL; - rt.signature[0] = '0'; - rt.signature[1] = 't'; - rt.signature[2] = 'y'; - rt.signature[3] = '3'; - rt.signature[0] += j; + rt.signature = MAKEFOURCC('0'+j,'t','y','3'); rt.dwUnused = 0; rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) @@ -726,7 +718,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) /* FIXME: check signature */ - TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4)); + TRACE("\tsignature = %s\n", debugstr_fourcc(prrfp->signature)); TRACE("\tPin %lu: dwFlags %#lx, dwInstances %lu, dwMediaTypes %lu, dwMediums %lu.\n", i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums); @@ -760,7 +752,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) CLSID * clsMinor = CoTaskMemAlloc(sizeof(CLSID)); /* FIXME: check signature */ - TRACE("\t\tsignature = %s\n", debugstr_an((const char*)prt->signature, 4)); + TRACE("\t\tsignature = %s\n", debugstr_fourcc(prt->signature)); memcpy(clsMajor, pData + prt->dwOffsetMajor, sizeof(CLSID)); memcpy(clsMinor, pData + prt->dwOffsetMinor, sizeof(CLSID));

1 0

Zhiyi Zhang : ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: 9092a4ccca9d9da93a5fb0d611c05c3aae4882c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9092a4ccca9d9da93a5fb0d611c05c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 19 17:30:23 2023 +0800 ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed. Tests show that there is a ~1.5s timer that checks for the presence of WS_EX_TOPMOST and restore it if it got removed when the timer times out. Manual tests that skip WM_TIMER handling show there is a 1.5s timer of ID 0x4242 keeps firing. The timer stops when its WM_TIMER message gets handled. Fix Deus Ex: Game of the Year Edition missing WS_EX_TOPMOST after changing resolutions in fullscreen mode. The application removes WS_EX_TOPMOST from its game window after entering fullscreen. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- dlls/wined3d/swapchain.c | 28 ++++++++++++++++++++++++++++ include/wine/wined3d.h | 1 + 8 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 94b38258acd..5887854556b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -587,7 +587,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + swapchain_desc.flags = DDRAW_WINED3D_SWAPCHAIN_FLAGS; if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetForegroundWindow()) swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d8bd335f615..f40188f75ef 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -64,6 +64,9 @@ struct FvfToDecl | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR \ | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NO_DRAW_INDIRECT) +#define DDRAW_WINED3D_SWAPCHAIN_FLAGS (WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH \ + | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER) + #define DDRAW_MAX_ACTIVE_LIGHTS 32 #define DDRAW_MAX_TEXTURES 8 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e7483c30863..02d6adbb433 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2807,7 +2807,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b51ebff0006..f4cc5df0558 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2893,7 +2893,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0b1eb1e197b..4811053a231 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3131,7 +3131,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 68b96ff6e7c..ab43c1bbb2d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2850,7 +2850,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 99d717641e1..c30c43734c0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2151,8 +2151,20 @@ struct wined3d_window_state int x, y, width, height; uint32_t flags; bool set_style; + bool register_topmost_timer; + bool set_topmost_timer; }; +#define WINED3D_WINDOW_TOPMOST_TIMER_ID 0x4242 + +static void CALLBACK topmost_timer_proc(HWND hwnd, UINT msg, UINT_PTR id, DWORD time) +{ + if (!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + KillTimer(hwnd, WINED3D_WINDOW_TOPMOST_TIMER_ID); +} + static DWORD WINAPI set_window_state_thread(void *ctx) { struct wined3d_window_state *s = ctx; @@ -2176,6 +2188,7 @@ static DWORD WINAPI set_window_state_thread(void *ctx) static void set_window_state(struct wined3d_window_state *s) { + static const UINT timeout = 1500; DWORD window_tid = GetWindowThreadProcessId(s->window, NULL); DWORD tid = GetCurrentThreadId(); HANDLE thread; @@ -2187,6 +2200,17 @@ static void set_window_state(struct wined3d_window_state *s) if (window_tid == tid) { set_window_state_thread(s); + + /* Deus Ex: Game of the Year Edition removes WS_EX_TOPMOST after changing resolutions in + * exclusive fullscreen mode. Tests show that WS_EX_TOPMOST will be restored when a ~1.5s + * timer times out */ + if (s->register_topmost_timer) + { + if (s->set_topmost_timer) + SetTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID, timeout, topmost_timer_proc); + else + KillTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID); + } } else if ((thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) { @@ -2239,6 +2263,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state s->style = fullscreen_style(state->style); s->exstyle = fullscreen_exstyle(state->exstyle); s->set_style = true; + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = true; TRACE("Old style was %08lx, %08lx, setting to %08lx, %08lx.\n", state->style, state->exstyle, s->style, s->exstyle); @@ -2293,6 +2319,8 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = false; if (window_rect) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ad90c0d6b36..7c51c9cfef9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -902,6 +902,7 @@ enum wined3d_memory_segment_group #define WINED3D_SWAPCHAIN_REGISTER_STATE 0x00020000u #define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u +#define WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER 0x00100000u #define WINED3DDP_MAXTEXCOORD 8

1 0

Alex Henrie : ninput: Use CRT allocation functions.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: bd4b49782ddc4d3ea483561dc15b26d2a2333dd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd4b49782ddc4d3ea483561dc15b26… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 00:04:38 2023 -0600 ninput: Use CRT allocation functions. --- dlls/ninput/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ninput/main.c b/dlls/ninput/main.c index 56d82b08ac5..e89e71968c7 100644 --- a/dlls/ninput/main.c +++ b/dlls/ninput/main.c @@ -21,7 +21,6 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -#include "wine/heap.h" #include "interactioncontext.h" @@ -46,7 +45,7 @@ HRESULT WINAPI CreateInteractionContext(HINTERACTIONCONTEXT *handle) if (!handle) return E_POINTER; - if (!(context = heap_alloc(sizeof(*context)))) + if (!(context = malloc(sizeof(*context)))) return E_OUTOFMEMORY; context->filter_pointers = TRUE; @@ -67,7 +66,7 @@ HRESULT WINAPI DestroyInteractionContext(HINTERACTIONCONTEXT handle) if (!context) return E_HANDLE; - heap_free(context); + free(context); return S_OK; }

1 0

Alex Henrie : browseui: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: 699694b23886044612250d0c11c5809da46a5c06 URL: https://gitlab.winehq.org/wine/wine/-/commit/699694b23886044612250d0c11c580… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:36:14 2023 -0600 browseui: Use the wcsdup function instead of reimplementing it. --- dlls/browseui/progressdlg.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 1e22ef636e1..9834a4089f2 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -100,12 +100,8 @@ struct create_params static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) { WCHAR string[256]; - LPWSTR ret; - LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = malloc((lstrlenW(string) + 1) * sizeof(WCHAR)); - lstrcpyW(ret, string); - return ret; + return wcsdup(string); } static void set_progress_marquee(ProgressDialog *This)

1 0

Alex Henrie : fsutil/tests: Use CRT allocation functions.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: 1798540cb79a38563121b4c40d2dc469aeb42e46 URL: https://gitlab.winehq.org/wine/wine/-/commit/1798540cb79a38563121b4c40d2dc4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:31:21 2023 -0600 fsutil/tests: Use CRT allocation functions. --- programs/fsutil/tests/fsutil.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 0e02d8cac65..aae311b79c4 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -45,11 +45,10 @@ static DWORD runcmd(const char* cmd) DWORD rc; /* Create a writable copy for CreateProcessA() */ - wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); - strcpy(wcmd, cmd); + wcmd = strdup(cmd); rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - HeapFree(GetProcessHeap(), 0, wcmd); + free(wcmd); if (!rc) return 260;

1 0

Alex Henrie : user32/tests: Use CRT allocation functions.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: faae2162b89e951a94f74f65986f6a1015366cf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/faae2162b89e951a94f74f65986f6a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:16:10 2023 -0600 user32/tests: Use CRT allocation functions. --- dlls/user32/tests/clipboard.c | 8 +++---- dlls/user32/tests/cursoricon.c | 50 +++++++++++++++++++++--------------------- dlls/user32/tests/dde.c | 10 ++++----- dlls/user32/tests/input.c | 4 ++-- dlls/user32/tests/listbox.c | 8 +++---- dlls/user32/tests/monitor.c | 7 +++--- dlls/user32/tests/msg.c | 26 +++++++++++----------- 7 files changed, 56 insertions(+), 57 deletions(-)

1 0

Alex Henrie : sechost: Use CRT allocation functions.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: fdc3e50634174225a1e9ca72f8014447e0f96a3f URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc3e50634174225a1e9ca72f80144… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 22:41:14 2023 -0600 sechost: Use CRT allocation functions. --- dlls/sechost/security.c | 5 +- dlls/sechost/service.c | 196 ++++++++++++++++++++++++------------------------ 2 files changed, 99 insertions(+), 102 deletions(-)

1 0

Jacek Caban : configure: Disable -Wmicrosoft-enum-forward-reference warnings.
by Alexandre Julliard 02 Nov '23

02 Nov '23

Module: wine Branch: master Commit: 6f1ed05bad82944a843e45dd0680ea7804de634a URL: https://gitlab.winehq.org/wine/wine/-/commit/6f1ed05bad82944a843e45dd0680ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 23:57:30 2023 +0100 configure: Disable -Wmicrosoft-enum-forward-reference warnings. --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 34 insertions(+) diff --git a/configure b/configure index 9a98c212059..646f44ede24 100755 --- a/configure +++ b/configure @@ -11003,6 +11003,39 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-pragma-pack" +fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wmicrosoft-enum-forward-reference" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wmicrosoft-enum-forward-reference" >&5 +printf %s "checking whether $CC supports -Wmicrosoft-enum-forward-reference... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wmicrosoft-enum-forward-reference" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-microsoft-enum-forward-reference" fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wshift-overflow=2" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index 3b6a590a6cd..fd1a58b9170 100644 --- a/configure.ac +++ b/configure.ac @@ -960,6 +960,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Winit-self]) WINE_TRY_PE_CFLAGS([-Wpacked-not-aligned],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-packed-not-aligned"])]) WINE_TRY_PE_CFLAGS([-Wpragma-pack],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-pragma-pack"])]) + WINE_TRY_PE_CFLAGS([-Wmicrosoft-enum-forward-reference],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-microsoft-enum-forward-reference"])]) WINE_TRY_PE_CFLAGS([-Wshift-overflow=2]) WINE_TRY_PE_CFLAGS([-Wstrict-prototypes]) WINE_TRY_PE_CFLAGS([-Wtype-limits])

1 0