September 2023 - Wine-commits

Connor McAdams : uiautomationcore: Add WinEvent hook on the UIA event thread.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 2a2c4cd7b984be5db239a7ea930ede59207560cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2c4cd7b984be5db239a7ea930ede… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 13 12:48:10 2023 -0400 uiautomationcore: Add WinEvent hook on the UIA event thread. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_event.c | 121 +++++++++++++++++++++++++++++++++----- 1 file changed, 105 insertions(+), 16 deletions(-) diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 10dc1934844..04067f39e0e 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -50,6 +50,20 @@ static SAFEARRAY *uia_get_desktop_rt_id(void) return uia_desktop_node_rt_id; } +static int win_event_to_uia_event_id(int win_event) +{ + switch (win_event) + { + case EVENT_OBJECT_FOCUS: return UIA_AutomationFocusChangedEventId; + case EVENT_SYSTEM_ALERT: return UIA_SystemAlertEventId; + + default: + break; + } + + return 0; +} + /* * UI Automation event map. */ @@ -247,6 +261,7 @@ struct uia_event_thread LONG ref; struct list *event_queue; + HWINEVENTHOOK hook; }; #define WM_UIA_EVENT_THREAD_STOP (WM_USER + 1) @@ -264,12 +279,18 @@ static CRITICAL_SECTION event_thread_cs = { &event_thread_cs_debug, -1, 0, 0, 0, enum uia_queue_event_type { QUEUE_EVENT_TYPE_SERVERSIDE, QUEUE_EVENT_TYPE_CLIENTSIDE, + QUEUE_EVENT_TYPE_WIN_EVENT, }; struct uia_queue_event { struct list event_queue_entry; int queue_event_type; +}; + +struct uia_queue_uia_event +{ + struct uia_queue_event queue_entry; struct uia_event_args *args; struct uia_event *event; @@ -285,14 +306,40 @@ struct uia_queue_event } u; }; -static void uia_event_queue_push(struct uia_queue_event *event) +struct uia_queue_win_event +{ + struct uia_queue_event queue_entry; + + HWINEVENTHOOK hook; + DWORD event_id; + HWND hwnd; + LONG obj_id; + LONG child_id; + DWORD thread_id; + DWORD event_time; +}; + +static void uia_event_queue_push(struct uia_queue_event *event, int queue_event_type) { + event->queue_event_type = queue_event_type; EnterCriticalSection(&event_thread_cs); + if (queue_event_type == QUEUE_EVENT_TYPE_WIN_EVENT) + { + struct uia_queue_win_event *win_event = (struct uia_queue_win_event *)event; + + if (win_event->hook != event_thread.hook) + { + free(event); + goto exit; + } + } + assert(event_thread.event_queue); list_add_tail(event_thread.event_queue, &event->event_queue_entry); PostMessageW(event_thread.hwnd, WM_UIA_EVENT_THREAD_PROCESS_QUEUE, 0, 0); +exit: LeaveCriticalSection(&event_thread_cs); } @@ -322,7 +369,7 @@ static void uia_node_lresult_release(LRESULT lr) static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct uia_event_args *args, struct uia_event *event); -static HRESULT uia_raise_clientside_event(struct uia_queue_event *event) +static HRESULT uia_raise_clientside_event(struct uia_queue_uia_event *event) { HUIANODE node, nav_start_node; HRESULT hr; @@ -354,7 +401,7 @@ static HRESULT uia_raise_clientside_event(struct uia_queue_event *event) return hr; } -static HRESULT uia_raise_serverside_event(struct uia_queue_event *event) +static HRESULT uia_raise_serverside_event(struct uia_queue_uia_event *event) { HRESULT hr = S_OK; LRESULT lr, lr2; @@ -397,29 +444,70 @@ static void uia_event_thread_process_queue(struct list *event_queue) while (1) { struct uia_queue_event *event; - HRESULT hr; + HRESULT hr = S_OK; if (!(event = uia_event_queue_pop(event_queue))) break; - if (event->queue_event_type == QUEUE_EVENT_TYPE_SERVERSIDE) - hr = uia_raise_serverside_event(event); - else - hr = uia_raise_clientside_event(event); + switch (event->queue_event_type) + { + case QUEUE_EVENT_TYPE_SERVERSIDE: + case QUEUE_EVENT_TYPE_CLIENTSIDE: + { + struct uia_queue_uia_event *uia_event = (struct uia_queue_uia_event *)event; + + if (event->queue_event_type == QUEUE_EVENT_TYPE_SERVERSIDE) + hr = uia_raise_serverside_event(uia_event); + else + hr = uia_raise_clientside_event(uia_event); + + uia_event_args_release(uia_event->args); + IWineUiaEvent_Release(&uia_event->event->IWineUiaEvent_iface); + break; + } + + default: + break; + } if (FAILED(hr)) WARN("Failed to raise event type %d with hr %#lx\n", event->queue_event_type, hr); - uia_event_args_release(event->args); - IWineUiaEvent_Release(&event->event->IWineUiaEvent_iface); free(event); } } +static void CALLBACK uia_event_thread_win_event_proc(HWINEVENTHOOK hook, DWORD event_id, HWND hwnd, LONG obj_id, + LONG child_id, DWORD thread_id, DWORD event_time) +{ + struct uia_queue_win_event *win_event; + + TRACE("%p, %ld, %p, %ld, %ld, %ld, %ld\n", hook, event_id, hwnd, obj_id, child_id, thread_id, event_time); + + if (!win_event_to_uia_event_id(event_id)) + return; + + if (!(win_event = calloc(1, sizeof(*win_event)))) + { + ERR("Failed to allocate uia_queue_win_event structure\n"); + return; + } + + win_event->hook = hook; + win_event->event_id = event_id; + win_event->hwnd = hwnd; + win_event->obj_id = obj_id; + win_event->child_id = child_id; + win_event->thread_id = thread_id; + win_event->event_time = event_time; + uia_event_queue_push(&win_event->queue_entry, QUEUE_EVENT_TYPE_WIN_EVENT); +} + static DWORD WINAPI uia_event_thread_proc(void *arg) { HANDLE initialized_event = arg; struct list event_queue; + HWINEVENTHOOK hook; HWND hwnd; MSG msg; @@ -435,6 +523,8 @@ static DWORD WINAPI uia_event_thread_proc(void *arg) event_thread.hwnd = hwnd; event_thread.event_queue = &event_queue; + event_thread.hook = hook = SetWinEventHook(EVENT_MIN, EVENT_MAX, 0, uia_event_thread_win_event_proc, 0, 0, + WINEVENT_OUTOFCONTEXT); /* Initialization complete, thread can now process window messages. */ SetEvent(initialized_event); @@ -455,6 +545,7 @@ static DWORD WINAPI uia_event_thread_proc(void *arg) TRACE("Shutting down UI Automation event thread.\n"); + UnhookWinEvent(hook); DestroyWindow(hwnd); CoUninitialize(); FreeLibraryAndExitThread(huia_module, 0); @@ -664,7 +755,7 @@ static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID static HRESULT WINAPI uia_event_raise_event(IWineUiaEvent *iface, VARIANT in_node, VARIANT in_nav_start_node) { struct uia_event *event = impl_from_IWineUiaEvent(iface); - struct uia_queue_event *queue_event; + struct uia_queue_uia_event *queue_event; struct uia_event_args *args; TRACE("%p, %s, %s\n", iface, debugstr_variant(&in_node), debugstr_variant(&in_nav_start_node)); @@ -680,7 +771,6 @@ static HRESULT WINAPI uia_event_raise_event(IWineUiaEvent *iface, VARIANT in_nod return E_OUTOFMEMORY; } - queue_event->queue_event_type = QUEUE_EVENT_TYPE_CLIENTSIDE; queue_event->args = args; queue_event->event = event; queue_event->u.clientside.node = V_I4(&in_node); @@ -688,7 +778,7 @@ static HRESULT WINAPI uia_event_raise_event(IWineUiaEvent *iface, VARIANT in_nod queue_event->u.clientside.nav_start_node = V_I4(&in_nav_start_node); IWineUiaEvent_AddRef(&event->IWineUiaEvent_iface); - uia_event_queue_push(queue_event); + uia_event_queue_push(&queue_event->queue_entry, QUEUE_EVENT_TYPE_CLIENTSIDE); return S_OK; } @@ -1277,7 +1367,7 @@ static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct u } else { - struct uia_queue_event *queue_event; + struct uia_queue_uia_event *queue_event; HUIANODE node2, nav_start_node2; if (!(queue_event = calloc(1, sizeof(*queue_event)))) @@ -1302,7 +1392,6 @@ static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct u } } - queue_event->queue_event_type = QUEUE_EVENT_TYPE_SERVERSIDE; queue_event->args = args; queue_event->event = event; queue_event->u.serverside.node = node2; @@ -1310,7 +1399,7 @@ static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct u InterlockedIncrement(&args->ref); IWineUiaEvent_AddRef(&event->IWineUiaEvent_iface); - uia_event_queue_push(queue_event); + uia_event_queue_push(&queue_event->queue_entry, QUEUE_EVENT_TYPE_SERVERSIDE); } return hr;

1 0

Connor McAdams : uiautomationcore: Track HWNDs that need WinEvent translation.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 81caccbf840d14abede843d4399b650e73bc52ba URL: https://gitlab.winehq.org/wine/wine/-/commit/81caccbf840d14abede843d4399b65… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 13 13:49:31 2023 -0400 uiautomationcore: Track HWNDs that need WinEvent translation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 4 ++ dlls/uiautomationcore/uia_event.c | 25 ++++++++++++ dlls/uiautomationcore/uia_private.h | 7 ++++ dlls/uiautomationcore/uia_utils.c | 79 +++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 6ec675e197e..09e0d179172 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1870,6 +1870,9 @@ static HRESULT WINAPI uia_provider_attach_event(IWineUiaProvider *iface, LONG_PT &IID_IProxyProviderWinEventHandler, (void **)&winevent_handler))) { FIXME("MSAA to UIA event bridge currently unimplemented\n"); + hr = uia_event_add_win_event_hwnd(event, prov->hwnd); + if (FAILED(hr)) + WARN("Failed to add hwnd for win_event, hr %#lx\n", hr); IProxyProviderWinEventHandler_Release(winevent_handler); } else if (SUCCEEDED(IRawElementProviderFragmentRoot_QueryInterface(elroot, &IID_IRawElementProviderAdviseEvents, @@ -1954,6 +1957,7 @@ static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProvid prov->IWineUiaProvider_iface.lpVtbl = &uia_provider_vtbl; prov->elprov = elprov; prov->ref = 1; + prov->hwnd = node->hwnd; node->prov[prov_type] = &prov->IWineUiaProvider_iface; if (!node->prov_count) node->creator_prov_type = prov_type; diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 04067f39e0e..796a74d86fc 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -64,6 +64,29 @@ static int win_event_to_uia_event_id(int win_event) return 0; } +static BOOL CALLBACK uia_win_event_enum_top_level_hwnds(HWND hwnd, LPARAM lparam) +{ + struct rb_tree *hwnd_map = (struct rb_tree *)lparam; + HRESULT hr; + + if (!uia_hwnd_is_visible(hwnd)) + return TRUE; + + hr = uia_hwnd_map_add_hwnd(hwnd_map, hwnd); + if (FAILED(hr)) + WARN("Failed to add hwnd to map, hr %#lx\n", hr); + + return TRUE; +} + +HRESULT uia_event_add_win_event_hwnd(struct uia_event *event, HWND hwnd) +{ + if (hwnd == GetDesktopWindow()) + EnumWindows(uia_win_event_enum_top_level_hwnds, (LPARAM)&event->u.clientside.win_event_hwnd_map); + + return uia_hwnd_map_add_hwnd(&event->u.clientside.win_event_hwnd_map, hwnd); +} + /* * UI Automation event map. */ @@ -658,6 +681,7 @@ static ULONG WINAPI uia_event_Release(IWineUiaEvent *iface) uia_cache_request_destroy(&event->u.clientside.cache_req); if (event->u.clientside.git_cookie) uia_stop_event_thread(); + uia_hwnd_map_destroy(&event->u.clientside.win_event_hwnd_map); } else { @@ -834,6 +858,7 @@ static HRESULT create_clientside_uia_event(struct uia_event **out_event, int eve event->scope = scope; event->u.clientside.event_callback = cback; event->u.clientside.callback_data = cback_data; + uia_hwnd_map_init(&event->u.clientside.win_event_hwnd_map); *out_event = event; return S_OK; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index e8bb4845189..bd88dff30e3 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -95,6 +95,7 @@ struct uia_provider { BOOL return_nested_node; BOOL parent_check_ran; BOOL has_parent; + HWND hwnd; }; static inline struct uia_provider *impl_from_IWineUiaProvider(IWineUiaProvider *iface) @@ -140,6 +141,7 @@ struct uia_event HRESULT (*event_callback)(struct uia_event *, struct uia_event_args *, SAFEARRAY *, BSTR); void *callback_data; + struct rb_tree win_event_hwnd_map; DWORD git_cookie; } clientside; struct { @@ -218,6 +220,7 @@ BOOL uia_condition_matched(HRESULT hr) DECLSPEC_HIDDEN; HRESULT create_uia_iface(IUnknown **iface, BOOL is_cui8) DECLSPEC_HIDDEN; /* uia_event.c */ +HRESULT uia_event_add_win_event_hwnd(struct uia_event *event, HWND hwnd) DECLSPEC_HIDDEN; HRESULT create_serverside_uia_event(struct uia_event **out_event, LONG process_id, LONG event_cookie) DECLSPEC_HIDDEN; HRESULT uia_event_add_provider_event_adviser(IRawElementProviderAdviseEvents *advise_events, struct uia_event *event) DECLSPEC_HIDDEN; @@ -250,3 +253,7 @@ HRESULT uia_cache_request_clone(struct UiaCacheRequest *dst, struct UiaCacheRequ HRESULT get_safearray_dim_bounds(SAFEARRAY *sa, UINT dim, LONG *lbound, LONG *elems) DECLSPEC_HIDDEN; HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) DECLSPEC_HIDDEN; int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) DECLSPEC_HIDDEN; +BOOL uia_hwnd_is_visible(HWND hwnd) DECLSPEC_HIDDEN; +HRESULT uia_hwnd_map_add_hwnd(struct rb_tree *hwnd_map, HWND hwnd) DECLSPEC_HIDDEN; +void uia_hwnd_map_init(struct rb_tree *hwnd_map) DECLSPEC_HIDDEN; +void uia_hwnd_map_destroy(struct rb_tree *hwnd_map) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_utils.c b/dlls/uiautomationcore/uia_utils.c index 9f27d6a0b34..9840fe4fe40 100644 --- a/dlls/uiautomationcore/uia_utils.c +++ b/dlls/uiautomationcore/uia_utils.c @@ -384,3 +384,82 @@ int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) return 0; } + +/* + * HWND related helper functions. + */ +BOOL uia_hwnd_is_visible(HWND hwnd) +{ + RECT rect; + + if (!IsWindowVisible(hwnd)) + return FALSE; + + if (!GetWindowRect(hwnd, &rect)) + return FALSE; + + if ((rect.right - rect.left) <= 0 || (rect.bottom - rect.top) <= 0) + return FALSE; + + return TRUE; +} + +/* + * rbtree to efficiently store a collection of HWNDs. + */ +struct uia_hwnd_map_entry +{ + struct rb_entry entry; + HWND hwnd; +}; + +static int uia_hwnd_map_hwnd_compare(const void *key, const struct rb_entry *entry) +{ + struct uia_hwnd_map_entry *hwnd_entry = RB_ENTRY_VALUE(entry, struct uia_hwnd_map_entry, entry); + HWND hwnd = (HWND)key; + + return (hwnd_entry->hwnd > hwnd) - (hwnd_entry->hwnd < hwnd); +} + +static void uia_hwnd_map_free(struct rb_entry *entry, void *context) +{ + struct uia_hwnd_map_entry *hwnd_entry = RB_ENTRY_VALUE(entry, struct uia_hwnd_map_entry, entry); + + TRACE("Removing hwnd %p from map %p\n", hwnd_entry->hwnd, context); + free(hwnd_entry); +} + +static BOOL uia_hwnd_map_check_hwnd(struct rb_tree *hwnd_map, HWND hwnd) +{ + return !!rb_get(hwnd_map, hwnd); +} + +HRESULT uia_hwnd_map_add_hwnd(struct rb_tree *hwnd_map, HWND hwnd) +{ + struct uia_hwnd_map_entry *entry; + + if (uia_hwnd_map_check_hwnd(hwnd_map, hwnd)) + { + TRACE("hwnd %p already in map %p\n", hwnd, hwnd_map); + return S_OK; + } + + if (!(entry = calloc(1, sizeof(*entry)))) + return E_OUTOFMEMORY; + + TRACE("Adding hwnd %p to map %p\n", hwnd, hwnd_map); + entry->hwnd = hwnd; + rb_put(hwnd_map, hwnd, &entry->entry); + + return S_OK; +} + +void uia_hwnd_map_init(struct rb_tree *hwnd_map) +{ + rb_init(hwnd_map, uia_hwnd_map_hwnd_compare); +} + +void uia_hwnd_map_destroy(struct rb_tree *hwnd_map) +{ + rb_destroy(hwnd_map, uia_hwnd_map_free, hwnd_map); +}

1 0

Connor McAdams : uiautomationcore: Make sure event thread is started when listening for WinEvents.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: fded7c1d713c943e7e28e3d51143a5da23f20fbb URL: https://gitlab.winehq.org/wine/wine/-/commit/fded7c1d713c943e7e28e3d51143a5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 14 11:24:41 2023 -0400 uiautomationcore: Make sure event thread is started when listening for WinEvents. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_event.c | 19 ++++++++++++++----- dlls/uiautomationcore/uia_private.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 796a74d86fc..96b6ac448aa 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -79,8 +79,12 @@ static BOOL CALLBACK uia_win_event_enum_top_level_hwnds(HWND hwnd, LPARAM lparam return TRUE; } +static BOOL uia_clientside_event_start_event_thread(struct uia_event *event); HRESULT uia_event_add_win_event_hwnd(struct uia_event *event, HWND hwnd) { + if (!uia_clientside_event_start_event_thread(event)) + return E_FAIL; + if (hwnd == GetDesktopWindow()) EnumWindows(uia_win_event_enum_top_level_hwnds, (LPARAM)&event->u.clientside.win_event_hwnd_map); @@ -630,6 +634,14 @@ static void uia_stop_event_thread(void) LeaveCriticalSection(&event_thread_cs); } +static BOOL uia_clientside_event_start_event_thread(struct uia_event *event) +{ + if (!event->u.clientside.event_thread_started) + event->u.clientside.event_thread_started = uia_start_event_thread(); + + return event->u.clientside.event_thread_started; +} + /* * IWineUiaEvent interface. */ @@ -679,7 +691,7 @@ static ULONG WINAPI uia_event_Release(IWineUiaEvent *iface) if (event->event_type == EVENT_TYPE_CLIENTSIDE) { uia_cache_request_destroy(&event->u.clientside.cache_req); - if (event->u.clientside.git_cookie) + if (event->u.clientside.event_thread_started) uia_stop_event_thread(); uia_hwnd_map_destroy(&event->u.clientside.win_event_hwnd_map); } @@ -1160,16 +1172,13 @@ HRESULT uia_event_add_serverside_event_adviser(IWineUiaEvent *serverside_event, */ if (!event->u.clientside.git_cookie) { - if (!uia_start_event_thread()) + if (!uia_clientside_event_start_event_thread(event)) return E_FAIL; hr = register_interface_in_git((IUnknown *)&event->IWineUiaEvent_iface, &IID_IWineUiaEvent, &event->u.clientside.git_cookie); if (FAILED(hr)) - { - uia_stop_event_thread(); return hr; - } } if (!(adv_events = calloc(1, sizeof(*adv_events)))) diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index bd88dff30e3..c298967be00 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -142,6 +142,7 @@ struct uia_event void *callback_data; struct rb_tree win_event_hwnd_map; + BOOL event_thread_started; DWORD git_cookie; } clientside; struct {

1 0

Jactry Zeng : cabinet/tests: Initialize CURR_DIR globally.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 316b5bc9b3e5aa39da05397523bd8e26e0b17170 URL: https://gitlab.winehq.org/wine/wine/-/commit/316b5bc9b3e5aa39da05397523bd8e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 25 02:15:09 2023 -0500 cabinet/tests: Initialize CURR_DIR globally. So that we can run each test function independently. --- dlls/cabinet/tests/fdi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index a44f9eeae2d..9cd7a1e93bf 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -409,13 +409,6 @@ static void createTestFile(const CHAR *name) static void create_test_files(void) { - DWORD len; - - len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - - if(len && (CURR_DIR[len-1] == '\\')) - CURR_DIR[len-1] = 0; - createTestFile("a.txt"); createTestFile("b.txt"); CreateDirectoryA("testdir", NULL); @@ -944,6 +937,12 @@ static void test_FDICopy(void) START_TEST(fdi) { + int len; + + len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; + test_FDICreate(); test_FDIDestroy(); test_FDIIsCabinet();

1 0

Alexandre Julliard : server: Don't zero out the PE optional header regardless of specified size.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 4d417076e4378efb613f8519fdc57119fb1df635 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d417076e4378efb613f8519fdc571… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:01:29 2023 +0200 server: Don't zero out the PE optional header regardless of specified size. --- dlls/kernel32/tests/loader.c | 17 ++++++++--------- server/mapping.c | 27 ++++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e360c24ee63..0d611990fd4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -144,13 +144,13 @@ static const IMAGE_NT_HEADERS nt_header_template = sizeof(dos_header) + sizeof(nt_header_template), /* SizeOfHeaders */ 0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ - 0, /* DllCharacteristics */ - 0, /* SizeOfStackReserve */ - 0, /* SizeOfStackCommit */ - 0, /* SizeOfHeapReserve */ - 0, /* SizeOfHeapCommit */ + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | IMAGE_DLLCHARACTERISTICS_NX_COMPAT, /* DllCharacteristics */ + 0x100000, /* SizeOfStackReserve */ + 0x1000, /* SizeOfStackCommit */ + 0x100000, /* SizeOfHeapReserve */ + 0x1000, /* SizeOfHeapCommit */ 0, /* LoaderFlags */ - 0, /* NumberOfRvaAndSizes */ + IMAGE_NUMBEROF_DIRECTORY_ENTRIES, /* NumberOfRvaAndSizes */ { { 0 } } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ } }; @@ -401,7 +401,6 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE "%u: MaximumStackSize wrong %Ix / %Ix\n", id, image.MaximumStackSize, max_stack ); ok( image.CommittedStackSize == commit_stack, "%u: CommittedStackSize wrong %Ix / %Ix\n", id, image.CommittedStackSize, commit_stack ); - todo_wine_if( truncated ) ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem, "%u: SubSystemType wrong %08lx / %08x\n", id, image.SubSystemType, nt_header->OptionalHeader.Subsystem ); @@ -481,7 +480,7 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE if (!(nt_header->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE)) ok( !image.ImageDynamicallyRelocated || broken( image.ComPlusILOnly ), /* <= win7 */ "%u: wrong ImageDynamicallyRelocated flags %02x\n", id, image.ImageFlags ); - else if (image.ImageContainsCode && !cor_header) + else if (image.ImageContainsCode && !image.ImageMappedFlat && !cor_header) ok( image.ImageDynamicallyRelocated, "%u: wrong ImageDynamicallyRelocated flags %02x\n", id, image.ImageFlags ); else @@ -866,7 +865,7 @@ static void test_Loader(void) { 0x04, 0, 0x08, 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, - 0x200000, + 0x2000, 0x40, { ERROR_SUCCESS } } diff --git a/server/mapping.c b/server/mapping.c index 5d4df2050e4..0a69261c0ee 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,8 +695,8 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } opt; } nt; off_t pos; - int size, opt_size; - size_t mz_size, clr_va, clr_size; + int size; + size_t mz_size, clr_va = 0, clr_size = 0; unsigned int i; /* load the headers */ @@ -710,9 +710,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; - /* zero out Optional header in the case it's not present or partial */ - opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); - size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); if (nt.Signature != IMAGE_NT_SIGNATURE) { @@ -729,9 +726,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_32bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; - clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; - + if (nt.opt.hdr32.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) + { + clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + } mapping->image.base = nt.opt.hdr32.ImageBase; mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); @@ -751,7 +750,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && + else if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && mapping->image.contains_code && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break; @@ -761,9 +760,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; - clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; - + if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) + { + clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + } mapping->image.base = nt.opt.hdr64.ImageBase; mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); @@ -783,7 +784,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && + else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && mapping->image.contains_code && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break;

1 0

Alexandre Julliard : winedump: Don't zero out the PE optional header regardless of specified size.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: af25f29cd2406e524b0c5f4aecddfc095de34d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/af25f29cd2406e524b0c5f4aecddfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:37:31 2023 +0200 winedump: Don't zero out the PE optional header regardless of specified size. --- tools/winedump/lib.c | 2 +- tools/winedump/pe.c | 17 ++++++++--------- tools/winedump/winedump.h | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index e2d25b04d24..0b94adb9b33 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -264,7 +264,7 @@ void lib_dump(void) if (fh->SizeOfOptionalHeader) { const IMAGE_OPTIONAL_HEADER32 *oh = (const IMAGE_OPTIONAL_HEADER32 *)((const char *)fh + sizeof(*fh)); - dump_optional_header(oh, fh->SizeOfOptionalHeader); + dump_optional_header(oh); } } /* Sanity check */ diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index fbcd9f5c6a5..f361e1d86bd 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -275,14 +275,14 @@ static inline void print_datadirectory(DWORD n, const IMAGE_DATA_DIRECTORY *dire } } -static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh, UINT header_size) +static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh) { IMAGE_OPTIONAL_HEADER32 oh; const IMAGE_OPTIONAL_HEADER32 *optionalHeader; /* in case optional header is missing or partial */ memset(&oh, 0, sizeof(oh)); - memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + memcpy(&oh, image_oh, min(dump_total_len - ((char *)image_oh - (char *)dump_base), sizeof(oh))); optionalHeader = &oh; print_word("Magic", optionalHeader->Magic); @@ -320,14 +320,14 @@ static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh, UINT printf("\n"); } -static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh, UINT header_size) +static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh) { IMAGE_OPTIONAL_HEADER64 oh; const IMAGE_OPTIONAL_HEADER64 *optionalHeader; /* in case optional header is missing or partial */ memset(&oh, 0, sizeof(oh)); - memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + memcpy(&oh, image_oh, min(dump_total_len - ((char *)image_oh - (char *)dump_base), sizeof(oh))); optionalHeader = &oh; print_word("Magic", optionalHeader->Magic); @@ -364,16 +364,16 @@ static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh, UINT printf("\n"); } -void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *optionalHeader, UINT header_size) +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *optionalHeader) { printf("Optional Header (%s)\n", get_magic_type(optionalHeader->Magic)); switch(optionalHeader->Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - dump_optional_header32(optionalHeader, header_size); + dump_optional_header32(optionalHeader); break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - dump_optional_header64((const IMAGE_OPTIONAL_HEADER64 *)optionalHeader, header_size); + dump_optional_header64((const IMAGE_OPTIONAL_HEADER64 *)optionalHeader); break; default: printf(" Unknown optional header magic: 0x%-4X\n", optionalHeader->Magic); @@ -428,8 +428,7 @@ void dump_file_header(const IMAGE_FILE_HEADER *fileHeader, BOOL is_hybrid) static void dump_pe_header(void) { dump_file_header(&PE_nt_headers->FileHeader, get_hybrid_metadata() != NULL); - dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, - PE_nt_headers->FileHeader.SizeOfOptionalHeader); + dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader); } void dump_section_characteristics(DWORD characteristics, const char* sep) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index fe1acca7976..e2b3f7b1ca6 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -233,7 +233,7 @@ const char* get_unicode_str( const WCHAR *str, int len ); const char* get_symbol_str(const char* symname); void print_fake_dll(void); void dump_file_header(const IMAGE_FILE_HEADER *, BOOL); -void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *); void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable); void dump_section_characteristics(DWORD characteristics, const char* sep);

1 0

Alex Henrie : regedit: Use the wcsdup function instead or reimplementing it.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 33ce8e046d519303bc561416fb4e2078dbef8178 URL: https://gitlab.winehq.org/wine/wine/-/commit/33ce8e046d519303bc561416fb4e20… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:24:10 2023 -0600 regedit: Use the wcsdup function instead or reimplementing it. --- programs/regedit/edit.c | 3 +-- programs/regedit/listview.c | 11 ++--------- programs/regedit/regproc.c | 11 +++-------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 947a6071e0f..b92d1c615b3 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -637,8 +637,7 @@ BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName) } else { LPWSTR srcSubKey_copy; - parentPath = malloc((lstrlenW(keyPath) + 1) * sizeof(WCHAR)); - lstrcpyW(parentPath, keyPath); + parentPath = wcsdup(keyPath); srcSubKey_copy = wcsrchr(parentPath, '\\'); *srcSubKey_copy = 0; srcSubKey = srcSubKey_copy + 1; diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index c7a301929c2..757ce41855c 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -73,8 +73,7 @@ BOOL update_listview_path(const WCHAR *path) { free(g_currentPath); - g_currentPath = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); - lstrcpyW(g_currentPath, path); + g_currentPath = wcsdup(path); return TRUE; } @@ -154,13 +153,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR linfo = malloc(sizeof(LINE_INFO)); linfo->dwValType = dwValType; linfo->val_len = dwCount; - - if (Name) - { - linfo->name = malloc((lstrlenW(Name) + 1) * sizeof(WCHAR)); - lstrcpyW(linfo->name, Name); - } - else linfo->name = NULL; + linfo->name = wcsdup(Name); if (ValBuf && dwCount) { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 199cd3b6d80..15a64fdf97d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -447,10 +447,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) KEY_ALL_ACCESS, NULL, &parser->hkey, NULL); if (res == ERROR_SUCCESS) - { - parser->key_name = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); - lstrcpyW(parser->key_name, path); - } + parser->key_name = wcsdup(path); else parser->hkey = NULL; @@ -699,8 +696,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = malloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); - lstrcpyW(parser->value_name, val_name); + parser->value_name = wcsdup(val_name); set_state(parser, DATA_START); return p; @@ -1486,8 +1482,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; } - class_name = malloc((lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); - lstrcpyW(class_name, reg_class_namesW[i]); + class_name = wcsdup(reg_class_namesW[i]); export_registry_data(fp, classes[i], class_name, unicode);

1 0

Alex Henrie : sc: Use CRT allocation functions.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: e130ef40a12cb3040a4b6c62f22c75ce2bdb0da8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e130ef40a12cb3040a4b6c62f22c75… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:26:44 2023 -0600 sc: Use CRT allocation functions. --- programs/sc/sc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index bd7e093b61d..d1954da1493 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -135,10 +135,9 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f unsigned int i, count; WCHAR *actions, *p; - actions = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( arg ) + 1) * sizeof(WCHAR) ); + actions = wcsdup( arg ); if (!actions) return FALSE; - lstrcpyW( actions, arg ); for (p = actions, count = 0; *p; p++) { if (*p == '/') @@ -150,10 +149,10 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f count = count / 2 + 1; fa->cActions = count; - fa->lpsaActions = HeapAlloc( GetProcessHeap(), 0, fa->cActions * sizeof(SC_ACTION) ); + fa->lpsaActions = malloc( fa->cActions * sizeof(SC_ACTION) ); if (!fa->lpsaActions) { - HeapFree( GetProcessHeap(), 0, actions ); + free( actions ); return FALSE; } @@ -170,7 +169,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f p += lstrlenW( p ) + 1; } - HeapFree( GetProcessHeap(), 0, actions ); + free( actions ); return TRUE; } @@ -333,7 +332,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); - HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); + free( sfa.lpsaActions ); } else WINE_ERR("failed to parse failure parameters\n");

1 0

Alex Henrie : wordpad: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 4059c6ece270f565248da25549c4ced51bcd03b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4059c6ece270f565248da25549c4ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:31:24 2023 -0600 wordpad: Use the wcsdup function instead of reimplementing it. --- programs/wordpad/wordpad.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ed55a1d2268..042cc04f4ad 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -627,8 +627,7 @@ static void add_font(struct font_array *fonts, LPCWSTR fontName, DWORD fontType, fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; idx = fonts->count; - fonts->fonts[idx].name = malloc((lstrlenW(fontName) + 1)*sizeof(WCHAR) ); - lstrcpyW( fonts->fonts[idx].name, fontName ); + fonts->fonts[idx].name = wcsdup(fontName); fonts->fonts[idx].lParam = MAKELONG(fontType, fontHeight); fonts->count++;

1 0

Alex Henrie : avifil32: Use CRT allocation functions.
by Alexandre Julliard 25 Sep '23

25 Sep '23

Module: wine Branch: master Commit: 6b7689cbae1322638ed9eda207f6056586208e1f URL: https://gitlab.winehq.org/wine/wine/-/commit/6b7689cbae1322638ed9eda207f605… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 22 21:49:38 2023 -0600 avifil32: Use CRT allocation functions. --- dlls/avifil32/acmstream.c | 36 ++++++-------- dlls/avifil32/api.c | 68 ++++++++++++------------- dlls/avifil32/avifile.c | 121 ++++++++++++++++++--------------------------- dlls/avifil32/editstream.c | 24 +++++---- dlls/avifil32/extrachunk.c | 12 +---- dlls/avifil32/factory.c | 4 +- dlls/avifil32/getframe.c | 17 +++---- dlls/avifil32/icmstream.c | 32 ++++++------ dlls/avifil32/tmpfile.c | 8 +-- dlls/avifil32/wavfile.c | 24 ++++----- 10 files changed, 151 insertions(+), 195 deletions(-)

1 0