- Wine-Commits - list.winehq.org

Rémi Bernon : server: Keep a list of threads connected to each desktop.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: f7303cf7b6f57c7b0baa1dc4f1a1f600d5ce0f61 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7303cf7b6f57c7b0baa1dc4f1a1f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 22:00:12 2024 +0100 server: Keep a list of threads connected to each desktop. --- server/thread.h | 1 + server/user.h | 1 + server/winstation.c | 53 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/server/thread.h b/server/thread.h index 8dcf966a90a..766ed78a72f 100644 --- a/server/thread.h +++ b/server/thread.h @@ -51,6 +51,7 @@ struct thread struct object obj; /* object header */ struct list entry; /* entry in system-wide thread list */ struct list proc_entry; /* entry in per-process thread list */ + struct list desktop_entry; /* entry in per-desktop thread list */ struct process *process; thread_id_t id; /* thread id */ struct list mutex_list; /* list of currently owned mutexes */ diff --git a/server/user.h b/server/user.h index 1acd0638520..c3ca90d5a77 100644 --- a/server/user.h +++ b/server/user.h @@ -70,6 +70,7 @@ struct desktop struct winstation *winstation; /* winstation this desktop belongs to */ timeout_t input_time; /* last time this desktop had the input */ struct list entry; /* entry in winstation list of desktops */ + struct list threads; /* list of threads connected to this desktop */ struct window *top_window; /* desktop window for this desktop */ struct window *msg_window; /* HWND_MESSAGE top window */ struct hook_table *global_hooks; /* table of global hooks on this desktop */ diff --git a/server/winstation.c b/server/winstation.c index 00afe0119ff..f6fe5fd9e57 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -273,6 +273,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned desktop->close_timeout = NULL; desktop->foreground_input = NULL; desktop->users = 0; + list_init( &desktop->threads ); memset( &desktop->cursor, 0, sizeof(desktop->cursor) ); memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); @@ -362,26 +363,37 @@ static void close_desktop_timeout( void *private ) } /* add a user of the desktop and cancel the close timeout */ -static void add_desktop_user( struct desktop *desktop ) +static void add_desktop_thread( struct desktop *desktop, struct thread *thread ) { - desktop->users++; - if (desktop->close_timeout) + list_add_tail( &desktop->threads, &thread->desktop_entry ); + + if (!thread->process->is_system) { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } } } /* remove a user of the desktop and start the close timeout if necessary */ -static void remove_desktop_user( struct desktop *desktop ) +static void remove_desktop_thread( struct desktop *desktop, struct thread *thread ) { struct process *process; - assert( desktop->users > 0 ); - desktop->users--; - /* if we have one remaining user, it has to be the manager of the desktop window */ - if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) - desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + list_remove( &thread->desktop_entry ); + + if (!thread->process->is_system) + { + assert( desktop->users > 0 ); + desktop->users--; + + /* if we have one remaining user, it has to be the manager of the desktop window */ + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) + desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); + } } /* set the thread default desktop handle */ @@ -390,7 +402,7 @@ void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, if (thread->desktop) return; /* nothing to do */ thread->desktop = handle; - if (!thread->process->is_system) add_desktop_user( desktop ); + add_desktop_thread( desktop, thread ); } /* set the process default desktop handle */ @@ -500,14 +512,11 @@ void release_thread_desktop( struct thread *thread, int close ) if (!(handle = thread->desktop)) return; - if (!thread->process->is_system) + if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ + else { - if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ - else - { - remove_desktop_user( desktop ); - release_object( desktop ); - } + remove_desktop_thread( desktop, thread ); + release_object( desktop ); } if (close) @@ -730,10 +739,10 @@ DECL_HANDLER(set_thread_desktop) else { current->desktop = req->handle; /* FIXME: should we close the old one? */ - if (!current->process->is_system && old_desktop != new_desktop) + if (old_desktop != new_desktop) { - add_desktop_user( new_desktop ); - if (old_desktop) remove_desktop_user( old_desktop ); + if (old_desktop) remove_desktop_thread( old_desktop, current ); + add_desktop_thread( new_desktop, current ); } }

1 0

Rémi Bernon : server: Keep track of the winstation input desktop.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: a1d63d109d10c80837b9bb8aff3af8648a2ee375 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d63d109d10c80837b9bb8aff3af8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 21:03:41 2024 +0100 server: Keep track of the winstation input desktop. --- dlls/user32/tests/msg.c | 1 - dlls/user32/tests/winstation.c | 2 -- dlls/win32u/winstation.c | 10 ++++++++- include/wine/server_protocol.h | 17 ++++++++++++++- server/protocol.def | 6 ++++++ server/request.h | 4 ++++ server/trace.c | 8 +++++++ server/user.h | 2 ++ server/winstation.c | 48 +++++++++++++++++++++++++++++++++++++++++- 9 files changed, 92 insertions(+), 6 deletions(-)

1 0

Rémi Bernon : server: Send hardware input to the visible input desktop.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: 496eed7aafdb4bce0963bd4258b9a8096e8b4696 URL: https://gitlab.winehq.org/wine/wine/-/commit/496eed7aafdb4bce0963bd4258b9a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 25 09:33:06 2024 +0100 server: Send hardware input to the visible input desktop. When hwnd is specified, it is because it received a direct host input, so switch the input desktop to match the one that is receiving it. We don't validate that the sending thread uses the same desktop as the target window: it may not even be the case for drivers with a separate thread that listens on input events. --- dlls/user32/tests/winstation.c | 6 ++---- server/queue.c | 40 ++++++++++++++++++++++++++++------------ server/user.h | 3 +++ server/winstation.c | 13 +++++++++++-- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 11ad7685e97..bcbb55ee918 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -652,9 +652,8 @@ static void test_inputdesktop(void) win_skip("Skip tests on NT4\n"); return; } - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); + ok(ret == 0 || broken(ret == 1) /* Win32 */, "unexpected return count %ld\n", ret); /* Set thread desktop back to the old thread desktop, SendInput should success. */ ret = SetThreadDesktop(old_thread_desk); @@ -699,9 +698,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); + ok(ret == 0 || broken(ret == 1) /* Win32 */, "unexpected return count %ld\n", ret); /* Set thread desktop to the new desktop, SendInput should success. */ ret = SetThreadDesktop(new_desk); diff --git a/server/queue.c b/server/queue.c index 6f38227aa84..dbd83c43217 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2598,6 +2598,28 @@ void free_hotkeys( struct desktop *desktop, user_handle_t window ) } } +/* retrieve the desktop which should receive some hardware input event */ +static struct desktop *get_hardware_input_desktop( user_handle_t win ) +{ + struct winstation *winstation; + struct desktop *desktop; + struct thread *thread; + + if (!win || !(thread = get_window_thread( win ))) + { + if (!(winstation = get_visible_winstation())) return NULL; + return get_input_desktop( winstation ); + } + else + { + /* if window is specified, use its desktop to make it the input desktop */ + desktop = (struct desktop *)grab_object( thread->queue->input->desktop ); + release_object( thread ); + } + + return desktop; +} + /* check if the thread owning the window is hung */ DECL_HANDLER(is_window_hung) @@ -2767,22 +2789,17 @@ DECL_HANDLER(send_message) /* send a hardware message to a thread queue */ DECL_HANDLER(send_hardware_message) { - struct thread *thread = NULL; struct desktop *desktop; unsigned int origin = (req->flags & SEND_HWMSG_INJECTED ? IMO_INJECTED : IMO_HARDWARE); struct msg_queue *sender = get_current_queue(); - if (!(desktop = get_thread_desktop( current, 0 ))) return; - - if (req->win) + if (!(desktop = get_hardware_input_desktop( req->win ))) return; + if ((origin == IMO_INJECTED && desktop != current->queue->input->desktop) || + !set_input_desktop( desktop->winstation, desktop )) { - if (!(thread = get_window_thread( req->win ))) return; - if (desktop != thread->queue->input->desktop) - { - /* don't allow queuing events to a different desktop */ - release_object( desktop ); - return; - } + release_object( desktop ); + set_error( STATUS_ACCESS_DENIED ); + return; } reply->prev_x = desktop->cursor.x; @@ -2802,7 +2819,6 @@ DECL_HANDLER(send_hardware_message) default: set_error( STATUS_INVALID_PARAMETER ); } - if (thread) release_object( thread ); reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; diff --git a/server/user.h b/server/user.h index 56b0eb685f0..1acd0638520 100644 --- a/server/user.h +++ b/server/user.h @@ -186,6 +186,9 @@ extern client_ptr_t get_class_client_ptr( struct window_class *class ); /* windows station functions */ +extern struct winstation *get_visible_winstation(void); +extern struct desktop *get_input_desktop( struct winstation *winstation ); +extern int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ); extern struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct winstation *get_process_winstation( struct process *process, unsigned int access ); extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); diff --git a/server/winstation.c b/server/winstation.c index a23cd24261a..00afe0119ff 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -212,8 +212,17 @@ struct winstation *get_process_winstation( struct process *process, unsigned int access, &winstation_ops ); } +/* retrieve the visible winstation */ +struct winstation *get_visible_winstation(void) +{ + struct winstation *winstation; + LIST_FOR_EACH_ENTRY( winstation, &winstation_list, struct winstation, entry ) + if (winstation->flags & WSF_VISIBLE) return winstation; + return NULL; +} + /* retrieve the winstation current input desktop */ -static struct desktop *get_input_desktop( struct winstation *winstation ) +struct desktop *get_input_desktop( struct winstation *winstation ) { struct desktop *desktop; if (!(desktop = winstation->input_desktop)) return NULL; @@ -221,7 +230,7 @@ static struct desktop *get_input_desktop( struct winstation *winstation ) } /* changes the winstation current input desktop and update its input time */ -static int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) +int set_input_desktop( struct winstation *winstation, struct desktop *new_desktop ) { if (!(winstation->flags & WSF_VISIBLE)) return 0; if (new_desktop) new_desktop->input_time = current_time;

1 0

Rémi Bernon : win32u: Introduce new NtUserSwitchDesktop syscall stub.
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: c77261dd5c3000175434dc2c7dbc1f0ade9dc0e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c77261dd5c3000175434dc2c7dbc1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 11:03:02 2024 +0100 win32u: Introduce new NtUserSwitchDesktop syscall stub. --- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 12 ------ dlls/win32u/main.c | 5 +++ dlls/win32u/win32syscalls.h | 98 +++++++++++++++++++++++---------------------- dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 6 +++ dlls/wow64win/user.c | 7 ++++ include/ntuser.h | 1 + 8 files changed, 71 insertions(+), 62 deletions(-)

1 0

Zhiyi Zhang : Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()."
by Alexandre Julliard Feb. 28, 2024

Feb. 28, 2024

Module: wine Branch: master Commit: d287548c77350b81faa946b0977dffcbfcce9b83 URL: https://gitlab.winehq.org/wine/wine/-/commit/d287548c77350b81faa946b0977dff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 28 10:22:23 2024 +0800 Revert "winex11.drv: Handle X error from vkGetRandROutputDisplayEXT()." This reverts commit 6f9d20806e821ab07c8adf81ae6630fae94b00ef. 6f9d208 was committed to work around a Nvidia driver bug that can cause vkGetRandROutputDisplayEXT() to generate an X exception and crash applications. The bug is later fixed in Nvidia driver 450.56.11 and newer. Thus 6f9d208 is no longer necessary on the newer Nvidia drivers. Then after 18ae96e, another bug in the Nvidia driver can cause vkGetRandROutputDisplayEXT() to hang forever when XLockDisplay() is called before vkGetRandROutputDisplayEXT() and this bug is still not fixed and affects multiple applications. Reverting 6f9d208 allows us to work around the vkGetRandROutputDisplayEXT() hang bug because then it no longer calls XLockDisplay() before vkGetRandROutputDisplayEXT(). Nvidia driver 455 was released on September 9th 2020 so hopefully the fix is already widespread. We could theoretically still keep 6f9d208 on older Nvidia drivers by doing version checks. But it's more straightforward to remove the workaround since it's not a bug of Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53428 --- dlls/winex11.drv/xrandr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5c0269f3550..d77eb1a0163 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,11 +707,9 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid { for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) { - X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); - XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) );

1 0

Vijay Kiran Kamuju : taskschd: Implement IRegistrationTrigger_putEnabled.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: ea552a6f39771d24061b5bdd88e10371883645fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ea552a6f39771d24061b5bdd88e103… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:01:12 2024 +0100 taskschd: Implement IRegistrationTrigger_putEnabled. --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7ed69728b76..6c94c8ec8f3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -326,6 +326,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) typedef struct { IRegistrationTrigger IRegistrationTrigger_iface; + BOOL enabled; LONG ref; } RegistrationTrigger; @@ -502,8 +503,11 @@ static HRESULT WINAPI RegistrationTrigger_get_Enabled(IRegistrationTrigger *ifac static HRESULT WINAPI RegistrationTrigger_put_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL enabled) { RegistrationTrigger *This = impl_from_IRegistrationTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = !!enabled; + return S_OK; } static HRESULT WINAPI RegistrationTrigger_get_Delay(IRegistrationTrigger *iface, BSTR *pDelay) @@ -555,6 +559,7 @@ static HRESULT RegistrationTrigger_create(ITrigger **trigger) registration_trigger->IRegistrationTrigger_iface.lpVtbl = &RegistrationTrigger_vtbl; registration_trigger->ref = 1; + registration_trigger->enabled = FALSE; *trigger = (ITrigger*)&registration_trigger->IRegistrationTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bc7c654e9a2..31f6e586e90 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1406,7 +1406,7 @@ static void test_registration_trigger(ITrigger *trigger) todo_wine ok(enabled == VARIANT_TRUE, "got %d\n", enabled); hr = IRegistrationTrigger_put_Enabled(reg_trigger, VARIANT_FALSE); - todo_wine ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); + ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); enabled = VARIANT_TRUE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled);

1 0

Vijay Kiran Kamuju : taskschd: Implement TaskService_get_ConnectedDomain.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: c2a4f3810b17f9efa3c848b473b19f641f7881f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a4f3810b17f9efa3c848b473b19f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Feb 27 13:28:47 2024 +0100 taskschd: Implement TaskService_get_ConnectedDomain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48110 --- dlls/taskschd/task.c | 26 ++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 21 +++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2fc5e15a599..76cba042164 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3936,6 +3936,7 @@ typedef struct DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -4108,6 +4109,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; DWORD len; HRESULT hr; RPC_WSTR binding_str; @@ -4127,6 +4129,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!GetUserNameW(user_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); + len = ARRAY_SIZE(domain_name); + if(!GetEnvironmentVariableW(L"USERDOMAIN", domain_name, len)) + { + if (!GetComputerNameExW(ComputerNameDnsHostname, domain_name, &len)) + return HRESULT_FROM_WIN32(GetLastError()); + wcsupr(domain_name); + } + if (!is_variant_null(&server)) { const WCHAR *server_name; @@ -4166,6 +4176,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V lstrcpyW(task_svc->comp_name, comp_name); lstrcpyW(task_svc->user_name, user_name); + lstrcpyW(task_svc->domain_name, domain_name); task_svc->connected = TRUE; return S_OK; @@ -4220,8 +4231,19 @@ static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *u static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR *domain) { - FIXME("%p,%p: stub\n", iface, domain); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, domain); + + if (!domain) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *domain = SysAllocString(task_svc->domain_name); + if (!*domain) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_HighestVersion(ITaskService *iface, DWORD *version) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65d34dffd33..31e9878a48a 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -60,11 +60,13 @@ static BOOL check_win_version(int min_major, int min_minor) rtlver.dwMinorVersion >= min_minor); } #define is_win8_plus() check_win_version(6, 2) +#define is_win10_plus() check_win_version(10, 0) static void test_Connect(void) { WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR user_name[256]; + WCHAR domain_name[256]; DWORD len; HRESULT hr; BSTR bstr; @@ -100,6 +102,12 @@ static void test_Connect(void) hr = ITaskService_get_ConnectedUser(service, &bstr); ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + hr = ITaskService_get_ConnectedDomain(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#lx\n", hr); + + hr = ITaskService_get_ConnectedDomain(service, &bstr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ @@ -159,6 +167,19 @@ static void test_Connect(void) ok(!lstrcmpW(user_name, bstr), "username %s != user name %s\n", wine_dbgstr_w(user_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); + len = ARRAY_SIZE(domain_name); + if (!GetEnvironmentVariableW(L"USERDOMAIN", domain_name, len)) + { + GetComputerNameExW(ComputerNameDnsHostname, domain_name, &len); + if (is_win10_plus()) + wcsupr(domain_name); + } + + hr = ITaskService_get_ConnectedDomain(service, &bstr); + ok(hr == S_OK, "get_ConnectedDomain error %#lx\n", hr); + ok(!lstrcmpW(domain_name, bstr), "domainname %s != domain name %s\n", wine_dbgstr_w(domain_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskService_Release(service); }

1 0

Vijay Kiran Kamuju : taskschd: Add IRegistrationTrigger stub implementation.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 4b9e76914aa0573abe3c4e186b9c95b0f859e4d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b9e76914aa0573abe3c4e186b9c95… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 20:49:06 2024 +0100 taskschd: Add IRegistrationTrigger stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46773 --- dlls/taskschd/task.c | 238 ++++++++++++++++++++++++++++++++++++++++ dlls/taskschd/tests/scheduler.c | 31 ++++++ 2 files changed, 269 insertions(+)

1 0

Vijay Kiran Kamuju : taskschd: Implement IRegistrationTrigger_getEnabled.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: e1e0db6ebe18fa8f206246e4a0f572d5b9dd4387 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1e0db6ebe18fa8f206246e4a0f572… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:07:28 2024 +0100 taskschd: Implement IRegistrationTrigger_getEnabled. --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 6c94c8ec8f3..2fc5e15a599 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -496,8 +496,13 @@ static HRESULT WINAPI RegistrationTrigger_put_EndBoundary(IRegistrationTrigger * static HRESULT WINAPI RegistrationTrigger_get_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL *enabled) { RegistrationTrigger *This = impl_from_IRegistrationTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI RegistrationTrigger_put_Enabled(IRegistrationTrigger *iface, VARIANT_BOOL enabled) @@ -559,7 +564,7 @@ static HRESULT RegistrationTrigger_create(ITrigger **trigger) registration_trigger->IRegistrationTrigger_iface.lpVtbl = &RegistrationTrigger_vtbl; registration_trigger->ref = 1; - registration_trigger->enabled = FALSE; + registration_trigger->enabled = TRUE; *trigger = (ITrigger*)&registration_trigger->IRegistrationTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 31f6e586e90..65d34dffd33 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1402,16 +1402,16 @@ static void test_registration_trigger(ITrigger *trigger) enabled = VARIANT_FALSE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled); - todo_wine ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); - todo_wine ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); hr = IRegistrationTrigger_put_Enabled(reg_trigger, VARIANT_FALSE); ok(hr == S_OK, "put_Enabled failed: %08lx\n", hr); enabled = VARIANT_TRUE; hr = IRegistrationTrigger_get_Enabled(reg_trigger, &enabled); - todo_wine ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); - todo_wine ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + ok(hr == S_OK, "get_Enabled failed: %08lx\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); IRegistrationTrigger_Release(reg_trigger); }

1 0

Paul Gofman : wined3d: Force debug info in critical sections.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: f5ba517323e6b3a1930c8a1911c24d788fddf71e URL: https://gitlab.winehq.org/wine/wine/-/commit/f5ba517323e6b3a1930c8a1911c24d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 20:38:02 2024 -0600 wined3d: Force debug info in critical sections. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80994f5f0fd..fbd59e94d22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4145,7 +4145,7 @@ struct wined3d_shader_limits #define wined3d_lock_init(lock, name) wined3d_lock_init_(lock, __FILE__ ": " name) static inline void wined3d_lock_init_(CRITICAL_SECTION *lock, const char *name) { - InitializeCriticalSection(lock); + InitializeCriticalSectionEx(lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); if (lock->DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) lock->DebugInfo->Spare[0] = (DWORD_PTR)name; }

1 0