- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore: Add support for invoking serverside event callbacks.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 317d113af7afcc2ff1c9889b831b0cbeb54bd5bc URL: https://gitlab.winehq.org/wine/wine/-/commit/317d113af7afcc2ff1c9889b831b0c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 26 13:43:01 2023 -0400 uiautomationcore: Add support for invoking serverside event callbacks. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 12 +-- dlls/uiautomationcore/uia_event.c | 114 +++++++++++++++++++++++------ 2 files changed, 97 insertions(+), 29 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 788eb1a4eba..4845fe7ab33 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13974,8 +13974,8 @@ static void test_UiaAddEvent_client_proc(void) SET_EXPECT(prov_callback_proxy); SET_EXPECT(uia_event_callback); post_event_message(hwnd, WM_UIA_TEST_RAISE_EVENT, HandleToUlong(hwnd), PROVIDER_ID, ProviderOptions_ServerSideProvider); - todo_wine ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); - todo_wine CHECK_CALLED(uia_event_callback); + ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); + CHECK_CALLED(uia_event_callback); CHECK_CALLED(prov_callback_base_hwnd); CHECK_CALLED(prov_callback_nonclient); todo_wine CHECK_CALLED(prov_callback_proxy); @@ -13995,8 +13995,8 @@ static void test_UiaAddEvent_client_proc(void) SET_EXPECT(uia_event_callback); post_event_message(hwnd, WM_UIA_TEST_RAISE_EVENT, 0, PROVIDER2_ID, ProviderOptions_ServerSideProvider); - todo_wine ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); - todo_wine CHECK_CALLED(uia_event_callback); + ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); + CHECK_CALLED(uia_event_callback); hr = UiaRemoveEvent(event); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -14109,8 +14109,8 @@ static void test_UiaAddEvent_client_proc(void) set_event_data(0, 0, 1, 1, &exp_node_desc, L"P)"); SET_EXPECT(uia_event_callback); post_event_message(hwnd, WM_UIA_TEST_RAISE_EVENT_RT_ID, 0xbeef, PROVIDER2_ID, 0x1337); - todo_wine ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); - todo_wine CHECK_CALLED(uia_event_callback); + ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); + CHECK_CALLED(uia_event_callback); hr = UiaRemoveEvent(event); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index a77fe3dd30f..be3e422c313 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -267,13 +267,26 @@ static CRITICAL_SECTION_DEBUG event_thread_cs_debug = }; static CRITICAL_SECTION event_thread_cs = { &event_thread_cs_debug, -1, 0, 0, 0, 0 }; +enum uia_queue_event_type { + QUEUE_EVENT_TYPE_SERVERSIDE, + QUEUE_EVENT_TYPE_CLIENTSIDE, +}; + struct uia_queue_event { struct list event_queue_entry; + int queue_event_type; struct uia_event_args *args; struct uia_event *event; - HUIANODE node; + union { + struct { + HUIANODE node; + } serverside; + struct { + LRESULT node; + } clientside; + } u; }; static void uia_event_queue_push(struct uia_queue_event *event) @@ -303,31 +316,73 @@ static struct uia_queue_event *uia_event_queue_pop(struct list *event_queue) return queue_event; } +static HRESULT uia_event_invoke(HUIANODE node, struct uia_event_args *args, struct uia_event *event); +static HRESULT uia_raise_clientside_event(struct uia_queue_event *event) +{ + HUIANODE node; + HRESULT hr; + + hr = uia_node_from_lresult(event->u.clientside.node, &node); + if (SUCCEEDED(hr)) + { + hr = uia_event_invoke(node, event->args, event->event); + UiaNodeRelease(node); + } + + return hr; +} + +static HRESULT uia_raise_serverside_event(struct uia_queue_event *event) +{ + HRESULT hr = S_OK; + LRESULT lr; + + /* + * uia_lresult_from_node is expected to release the node here upon + * failure. + */ + if ((lr = uia_lresult_from_node(event->u.serverside.node))) + { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = lr; + hr = IWineUiaEvent_raise_event(event->event->u.serverside.event_iface, v); + if (FAILED(hr)) + { + IWineUiaNode *node; + + /* + * If the method returned failure, make sure we don't leave a + * dangling IWineUiaNode. + */ + if (SUCCEEDED(ObjectFromLresult(lr, &IID_IWineUiaNode, 0, (void **)&node))) + IWineUiaNode_Release(node); + } + } + else + hr = E_FAIL; + + return hr; +} + static void uia_event_thread_process_queue(struct list *event_queue) { while (1) { struct uia_queue_event *event; - LRESULT lr; HRESULT hr; if (!(event = uia_event_queue_pop(event_queue))) break; - /* - * uia_lresult_from_node is expected to release the node here upon - * failure. - */ - if ((lr = uia_lresult_from_node(event->node))) - { - VARIANT v; + if (event->queue_event_type == QUEUE_EVENT_TYPE_SERVERSIDE) + hr = uia_raise_serverside_event(event); + else + hr = uia_raise_clientside_event(event); - V_VT(&v) = VT_I4; - V_I4(&v) = lr; - hr = IWineUiaEvent_raise_event(event->event->u.serverside.event_iface, v); - if (FAILED(hr)) - WARN("IWineUiaEvent_raise_event failed with hr %#lx\n", hr); - } + 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); @@ -583,18 +638,30 @@ static HRESULT WINAPI uia_event_set_event_data(IWineUiaEvent *iface, const GUID static HRESULT WINAPI uia_event_raise_event(IWineUiaEvent *iface, VARIANT in_node) { struct uia_event *event = impl_from_IWineUiaEvent(iface); - HUIANODE node; - HRESULT hr; + struct uia_queue_event *queue_event; + struct uia_event_args *args; - FIXME("%p, %s: stub\n", iface, debugstr_variant(&in_node)); + TRACE("%p, %s\n", iface, debugstr_variant(&in_node)); assert(event->event_type != EVENT_TYPE_SERVERSIDE); - hr = uia_node_from_lresult((LRESULT)V_I4(&in_node), &node); - if (FAILED(hr)) - return hr; + if (!(queue_event = heap_alloc_zero(sizeof(*queue_event)))) + return E_OUTOFMEMORY; + + if (!(args = create_uia_event_args(uia_event_info_from_id(event->event_id)))) + { + heap_free(queue_event); + 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); + + IWineUiaEvent_AddRef(&event->IWineUiaEvent_iface); + uia_event_queue_push(queue_event); - UiaNodeRelease(node); return S_OK; } @@ -1159,9 +1226,10 @@ static HRESULT uia_event_invoke(HUIANODE node, struct uia_event_args *args, stru return hr; } + queue_event->queue_event_type = QUEUE_EVENT_TYPE_SERVERSIDE; queue_event->args = args; queue_event->event = event; - queue_event->node = node2; + queue_event->u.serverside.node = node2; InterlockedIncrement(&args->ref); IWineUiaEvent_AddRef(&event->IWineUiaEvent_iface);

1 0

Connor McAdams : uiautomationcore: Introduce UI Automation event thread.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 42e058ba5306e01d9c32ec4e2135bdcfe438868e URL: https://gitlab.winehq.org/wine/wine/-/commit/42e058ba5306e01d9c32ec4e2135bd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 1 10:45:49 2023 -0400 uiautomationcore: Introduce UI Automation event thread. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 10 --- dlls/uiautomationcore/uia_event.c | 134 +++++++++++++++++++++++++++++++++--- dlls/uiautomationcore/uia_private.h | 13 +--- 3 files changed, 127 insertions(+), 30 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index e5cdec27e0b..25e76db8128 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -567,16 +567,6 @@ static HRESULT WINAPI uia_node_attach_event(IWineUiaNode *iface, long proc_id, l return hr; } - /* - * Attach this nested node to the serverside event to keep the provider - * thread alive. - */ - if (*ret_event) - { - IWineUiaNode_AddRef(iface); - event->u.serverside.node = iface; - } - /* * Pre-existing serverside event that has already had its initial * advise call and gotten event data - if we've got new advisers, we need diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index dd3578e7bd5..df3f3b9c3a8 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -199,6 +199,119 @@ static void uia_event_map_entry_release(struct uia_event_map_entry *entry) } } +/* + * UI Automation event thread. + */ +struct uia_event_thread +{ + HANDLE hthread; + HWND hwnd; + LONG ref; +}; + +#define WM_UIA_EVENT_THREAD_STOP (WM_USER + 1) +static struct uia_event_thread event_thread; +static CRITICAL_SECTION event_thread_cs; +static CRITICAL_SECTION_DEBUG event_thread_cs_debug = +{ + 0, 0, &event_thread_cs, + { &event_thread_cs_debug.ProcessLocksList, &event_thread_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": event_thread_cs") } +}; +static CRITICAL_SECTION event_thread_cs = { &event_thread_cs_debug, -1, 0, 0, 0, 0 }; + +static DWORD WINAPI uia_event_thread_proc(void *arg) +{ + HANDLE initialized_event = arg; + HWND hwnd; + MSG msg; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hwnd = CreateWindowW(L"Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); + if (!hwnd) + { + WARN("CreateWindow failed: %ld\n", GetLastError()); + CoUninitialize(); + FreeLibraryAndExitThread(huia_module, 1); + } + + event_thread.hwnd = hwnd; + + /* Initialization complete, thread can now process window messages. */ + SetEvent(initialized_event); + TRACE("Event thread started.\n"); + while (GetMessageW(&msg, NULL, 0, 0)) + { + if ((msg.hwnd == hwnd) && (msg.message == WM_UIA_EVENT_THREAD_STOP)) + break; + + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + TRACE("Shutting down UI Automation event thread.\n"); + + DestroyWindow(hwnd); + CoUninitialize(); + FreeLibraryAndExitThread(huia_module, 0); +} + +static BOOL uia_start_event_thread(void) +{ + BOOL started = TRUE; + + EnterCriticalSection(&event_thread_cs); + if (++event_thread.ref == 1) + { + HANDLE ready_event = NULL; + HANDLE events[2]; + HMODULE hmodule; + DWORD wait_obj; + + /* Increment DLL reference count. */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (const WCHAR *)uia_start_event_thread, &hmodule); + + events[0] = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!(event_thread.hthread = CreateThread(NULL, 0, uia_event_thread_proc, + ready_event, 0, NULL))) + { + FreeLibrary(hmodule); + started = FALSE; + goto exit; + } + + events[1] = event_thread.hthread; + wait_obj = WaitForMultipleObjects(2, events, FALSE, INFINITE); + if (wait_obj != WAIT_OBJECT_0) + { + CloseHandle(event_thread.hthread); + started = FALSE; + } + +exit: + if (ready_event) + CloseHandle(ready_event); + if (!started) + memset(&event_thread, 0, sizeof(event_thread)); + } + + LeaveCriticalSection(&event_thread_cs); + return started; +} + +static void uia_stop_event_thread(void) +{ + EnterCriticalSection(&event_thread_cs); + if (!--event_thread.ref) + { + PostMessageW(event_thread.hwnd, WM_UIA_EVENT_THREAD_STOP, 0, 0); + CloseHandle(event_thread.hthread); + memset(&event_thread, 0, sizeof(event_thread)); + } + LeaveCriticalSection(&event_thread_cs); +} + /* * IWineUiaEvent interface. */ @@ -248,8 +361,8 @@ 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.mta_cookie) - CoDecrementMTAUsage(event->u.clientside.mta_cookie); + if (event->u.clientside.git_cookie) + uia_stop_event_thread(); } else { @@ -259,8 +372,7 @@ static ULONG WINAPI uia_event_Release(IWineUiaEvent *iface) LeaveCriticalSection(&event_map_cs); if (event->u.serverside.event_iface) IWineUiaEvent_Release(event->u.serverside.event_iface); - if (event->u.serverside.node) - IWineUiaNode_Release(event->u.serverside.node); + uia_stop_event_thread(); } for (i = 0; i < event->event_advisers_count; i++) @@ -414,6 +526,13 @@ HRESULT create_serverside_uia_event(struct uia_event **out_event, LONG process_i if (FAILED(hr)) goto exit; + if (!uia_start_event_thread()) + { + heap_free(event); + hr = E_FAIL; + goto exit; + } + event->u.serverside.proc_id = process_id; uia_event_map.serverside_event_count++; if (uia_event_map.serverside_event_count == 1) @@ -679,15 +798,14 @@ HRESULT uia_event_add_serverside_event_adviser(IWineUiaEvent *serverside_event, */ if (!event->u.clientside.git_cookie) { - hr = CoIncrementMTAUsage(&event->u.clientside.mta_cookie); - if (FAILED(hr)) - return hr; + if (!uia_start_event_thread()) + return E_FAIL; hr = register_interface_in_git((IUnknown *)&event->IWineUiaEvent_iface, &IID_IWineUiaEvent, &event->u.clientside.git_cookie); if (FAILED(hr)) { - CoDecrementMTAUsage(event->u.clientside.mta_cookie); + uia_stop_event_thread(); return hr; } } diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 60830c7c8a5..5aeab22d3ee 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -125,22 +125,11 @@ struct uia_event struct UiaCacheRequest cache_req; UiaEventCallback *cback; - /* - * This is temporarily used to keep the MTA alive prior to our - * introduction of a dedicated event thread. - */ - CO_MTA_USAGE_COOKIE mta_cookie; DWORD git_cookie; } clientside; struct { - /* - * Similar to the client MTA cookie, used to keep the provider - * thread alive as a temporary measure before introducing the - * event thread. - */ - IWineUiaNode *node; - IWineUiaEvent *event_iface; + struct rb_entry serverside_event_entry; LONG proc_id; } serverside;

1 0

Andrey Gusev : ntoskrnl.exe: Add PsSetLoadImageNotifyRoutineEx semi-stub.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 5e2c9b12550bc59d40d9ef3779e2d76c39877823 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e2c9b12550bc59d40d9ef3779e2d7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jul 1 17:36:22 2023 +0300 ntoskrnl.exe: Add PsSetLoadImageNotifyRoutineEx semi-stub. BattlEye says it's missing. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 +++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntddk.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7e3ad603549..0c426c821fb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3499,7 +3499,15 @@ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_b */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME("routine %p, semi-stub.\n", routine); + return PsSetLoadImageNotifyRoutineEx(routine, 0); +} + +/***************************************************** + * PsSetLoadImageNotifyRoutineEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE routine, ULONG_PTR flags) +{ + FIXME("routine %p, flags %Ix semi-stub.\n", routine, flags); if (load_image_notify_routine_count == ARRAY_SIZE(load_image_notify_routines)) return STATUS_INSUFFICIENT_RESOURCES; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 068806e52bc..9791b01e237 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -967,6 +967,7 @@ @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine @ stdcall PsSetLoadImageNotifyRoutine(ptr) +@ stdcall PsSetLoadImageNotifyRoutineEx(ptr long) @ stub PsSetProcessPriorityByClass @ stub PsSetProcessPriorityClass @ stub PsSetProcessSecurityPort diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index a6b2974ee6a..9072b9121a0 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE,ULONG_PTR); void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *);

1 0

Esme Povirk : win32u: Implement EVENT_OBJECT_SHOW/HIDE for window objects.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 93748f72fdf286c8183fd97b392b2e4222fa0f96 URL: https://gitlab.winehq.org/wine/wine/-/commit/93748f72fdf286c8183fd97b392b2e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Jul 1 15:14:42 2023 -0500 win32u: Implement EVENT_OBJECT_SHOW/HIDE for window objects. --- dlls/user32/tests/msg.c | 181 ++++++++++++++++++++++++------------------------ dlls/win32u/window.c | 8 +++ 2 files changed, 99 insertions(+), 90 deletions(-)

1 0

Esme Povirk : win32u: Implement marshaling for CB_GETCOMBOBOXINFO.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 45ac4ce9c98a833f09bdbc83554b3d99af2203f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/45ac4ce9c98a833f09bdbc83554b3d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Jul 1 14:15:26 2023 -0500 win32u: Implement marshaling for CB_GETCOMBOBOXINFO. --- dlls/win32u/message.c | 40 +++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 11 +++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 7c90935390f..c3f8b65833e 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -80,6 +80,7 @@ C_ASSERT( sizeof(struct packed_NCCALCSIZE_PARAMS) >= sizeof(NCCALCSIZE_PARAMS) + C_ASSERT( sizeof(struct packed_MSG) >= sizeof(MSG) ); C_ASSERT( sizeof(struct packed_MDINEXTMENU) >= sizeof(MDINEXTMENU) ); C_ASSERT( sizeof(struct packed_MDICREATESTRUCTW) >= sizeof(MDICREATESTRUCTW) ); +C_ASSERT( sizeof(struct packed_COMBOBOXINFO) >= sizeof(COMBOBOXINFO) ); C_ASSERT( sizeof(struct packed_hook_extra_info) >= sizeof(struct hook_extra_info) ); union packed_structs @@ -96,6 +97,7 @@ union packed_structs struct packed_MSG msg; struct packed_MDINEXTMENU mnm; struct packed_MDICREATESTRUCTW mcs; + struct packed_COMBOBOXINFO cbi; struct packed_hook_extra_info hook; }; @@ -161,7 +163,7 @@ static const unsigned int message_pointer_flags[] = SET(CB_INSERTSTRING) | SET(CB_FINDSTRING) | SET(CB_SELECTSTRING) | SET(CB_GETDROPPEDCONTROLRECT) | SET(CB_FINDSTRINGEXACT), /* 0x160 - 0x17f */ - 0, + SET(CB_GETCOMBOBOXINFO), /* 0x180 - 0x19f */ SET(LB_ADDSTRING) | SET(LB_INSERTSTRING) | SET(LB_GETTEXT) | SET(LB_SELECTSTRING) | SET(LB_DIR) | SET(LB_FINDSTRING) | @@ -373,6 +375,12 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa memcpy( &ps->hook, &h_extra, sizeof(h_extra) ); break; } + case CB_GETCOMBOBOXINFO: + { + COMBOBOXINFO cbi = { sizeof(COMBOBOXINFO) }; + memcpy( ps, &cbi, sizeof(cbi) ); + break; + } default: return TRUE; /* message doesn't need any unpacking */ } @@ -616,6 +624,8 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case CB_GETLBTEXT: if (!combobox_has_strings( hwnd )) return sizeof(ULONG_PTR); return (send_message( hwnd, CB_GETLBTEXTLEN, wparam, 0 ) + 1) * sizeof(WCHAR); + case CB_GETCOMBOBOXINFO: + return sizeof(data->ps.cbi); case LB_ADDSTRING: case LB_INSERTSTRING: case LB_FINDSTRING: @@ -763,6 +773,18 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, case LB_GETTEXT: push_data( data, (WCHAR *)lparam, (res + 1) * sizeof(WCHAR) ); break; + case CB_GETCOMBOBOXINFO: + { + COMBOBOXINFO *cbi = (COMBOBOXINFO *)lparam; + data->ps.cbi.rcItem = cbi->rcItem; + data->ps.cbi.rcButton = cbi->rcButton; + data->ps.cbi.stateButton = cbi->stateButton; + data->ps.cbi.hwndCombo = wine_server_user_handle( cbi->hwndCombo ); + data->ps.cbi.hwndItem = wine_server_user_handle( cbi->hwndItem ); + data->ps.cbi.hwndList = wine_server_user_handle( cbi->hwndList ); + push_data( data, &data->ps.cbi, sizeof(data->ps.cbi) ); + break; + } case WM_GETMINMAXINFO: push_data( data, (MINMAXINFO *)lparam, sizeof(MINMAXINFO) ); break; @@ -981,6 +1003,19 @@ static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, case CB_GETLBTEXT: memcpy( (WCHAR *)lparam, buffer, size ); break; + case CB_GETCOMBOBOXINFO: + if (lparam && size >= sizeof(ps->cbi) && + ((COMBOBOXINFO*)lparam)->cbSize == sizeof(COMBOBOXINFO)) + { + COMBOBOXINFO *cbi = (COMBOBOXINFO *)lparam; + cbi->rcItem = ps->cbi.rcItem; + cbi->rcButton = ps->cbi.rcButton; + cbi->stateButton = ps->cbi.stateButton; + cbi->hwndCombo = wine_server_ptr_handle( ps->cbi.hwndCombo ); + cbi->hwndItem = wine_server_ptr_handle( ps->cbi.hwndItem ); + cbi->hwndList = wine_server_ptr_handle( ps->cbi.hwndList ); + } + break; case WM_NEXTMENU: if (size >= sizeof(ps->mnm)) { @@ -1088,6 +1123,9 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case WM_WINDOWPOSCHANGED: copy_size = sizeof(WINDOWPOS); break; + case CB_GETCOMBOBOXINFO: + copy_size = sizeof(COMBOBOXINFO); + break; case WM_STYLECHANGING: copy_size = sizeof(STYLESTRUCT); break; diff --git a/include/ntuser.h b/include/ntuser.h index 31317026cd8..cc6126e53db 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -669,6 +669,17 @@ struct packed_MDICREATESTRUCTW ULONGLONG lParam; }; +struct packed_COMBOBOXINFO +{ + DWORD cbSize; + RECT rcItem; + RECT rcButton; + DWORD stateButton; + ULONGLONG hwndCombo; + ULONGLONG hwndItem; + ULONGLONG hwndList; +}; + HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd );

1 0

Mohamad Al-Jaf : pnputil: Add stub program.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 95ea605b10bfcdb6326ba9003b1e911857903479 URL: https://gitlab.winehq.org/wine/wine/-/commit/95ea605b10bfcdb6326ba9003b1e91… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jul 2 22:20:02 2023 -0400 pnputil: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55178 --- configure | 2 ++ configure.ac | 1 + programs/pnputil/Makefile.in | 6 ++++++ programs/pnputil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index d530de3ced1..7d568162159 100755 --- a/configure +++ b/configure @@ -1645,6 +1645,7 @@ enable_notepad enable_oleview enable_ping enable_plugplay +enable_pnputil enable_powershell enable_presentationfontcache enable_progman @@ -22203,6 +22204,7 @@ wine_fn_config_makefile programs/notepad enable_notepad wine_fn_config_makefile programs/oleview enable_oleview wine_fn_config_makefile programs/ping enable_ping wine_fn_config_makefile programs/plugplay enable_plugplay +wine_fn_config_makefile programs/pnputil enable_pnputil wine_fn_config_makefile programs/powershell enable_powershell wine_fn_config_makefile programs/presentationfontcache enable_presentationfontcache wine_fn_config_makefile programs/progman enable_progman diff --git a/configure.ac b/configure.ac index 90c95c89ffb..3ab6d787d61 100644 --- a/configure.ac +++ b/configure.ac @@ -3378,6 +3378,7 @@ WINE_CONFIG_MAKEFILE(programs/notepad) WINE_CONFIG_MAKEFILE(programs/oleview) WINE_CONFIG_MAKEFILE(programs/ping) WINE_CONFIG_MAKEFILE(programs/plugplay) +WINE_CONFIG_MAKEFILE(programs/pnputil) WINE_CONFIG_MAKEFILE(programs/powershell) WINE_CONFIG_MAKEFILE(programs/presentationfontcache) WINE_CONFIG_MAKEFILE(programs/progman) diff --git a/programs/pnputil/Makefile.in b/programs/pnputil/Makefile.in new file mode 100644 index 00000000000..aa22d9b6ce8 --- /dev/null +++ b/programs/pnputil/Makefile.in @@ -0,0 +1,6 @@ +MODULE = pnputil.exe + +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/pnputil/main.c b/programs/pnputil/main.c new file mode 100644 index 00000000000..b955b97a8c2 --- /dev/null +++ b/programs/pnputil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(pnputil); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Alex Henrie : shell32: Don't overallocate in Dde_OnRequest (scan-build).
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 7e68281b25a6e814557036a1b5f83236d651b769 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e68281b25a6e814557036a1b5f832… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 2 17:35:44 2023 -0600 shell32: Don't overallocate in Dde_OnRequest (scan-build). --- dlls/shell32/dde.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index c390f8e3186..dcaf641f8f4 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -176,7 +176,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, } len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); - groups_dataA = malloc(len * sizeof(WCHAR)); + groups_dataA = malloc(len); if (groups_dataA) { WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL);

1 0

Alistair Leslie-Hughes : msscript.ocx: Fake success in FreezeEvents.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 372e39eaa87418cd7a451758d3c4d56b57973a8b URL: https://gitlab.winehq.org/wine/wine/-/commit/372e39eaa87418cd7a451758d3c4d5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 2 16:30:33 2023 +1000 msscript.ocx: Fake success in FreezeEvents. --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index df484b4069a..402d0290fdc 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -3480,7 +3480,7 @@ static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) FIXME("(%p)->(%d)\n", This, freeze); - return E_NOTIMPL; + return S_OK; } static const IOleControlVtbl OleControlVtbl = {

1 0

Fabian Maurer : dcomp: Add stub for DCompositionCreateDevice3.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 9ffdfe410941478d007a023d0cd06531b83f4fa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ffdfe410941478d007a023d0cd065… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jul 2 22:22:42 2023 +0200 dcomp: Add stub for DCompositionCreateDevice3. This is needed by recent chromium --- dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 8d625cc036a..2120ce8b6f6 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -14,7 +14,7 @@ @ stub DCompositionAttachMouseDragToHwnd @ stub DCompositionAttachMouseWheelToHwnd @ stdcall DCompositionCreateDevice2(ptr ptr ptr) -@ stub DCompositionCreateDevice3 +@ stdcall DCompositionCreateDevice3(ptr ptr ptr) @ stdcall DCompositionCreateDevice(ptr ptr ptr) @ stub DCompositionCreateSurfaceHandle @ stub DeserializeEffectDescription diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c index 2d0600ce50a..2744d758e91 100644 --- a/dlls/dcomp/device.c +++ b/dlls/dcomp/device.c @@ -38,3 +38,10 @@ HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, return E_NOTIMPL; } + +HRESULT WINAPI DCompositionCreateDevice3(IUnknown *rendering_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Alistair Leslie-Hughes : msscript.ocx: Fake success in IPersistStreamInit Load.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: b9527e7874d06e91fa629455bebcec09f1ce0b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9527e7874d06e91fa629455bebcec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 2 16:30:33 2023 +1000 msscript.ocx: Fake success in IPersistStreamInit Load. --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c8a07ddbd1a..df484b4069a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -3381,7 +3381,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream FIXME("(%p)->(%p)\n", This, stream); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *stream, BOOL clear_dirty)

1 0