October 2021 - Wine-commits

Rémi Bernon : joy.cpl: Consistently use the 32 buttons limit from DIJOYSTATE.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: f10171251024d779946b6d62ebbf59b26b938c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10171251024d779946b6d62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 14 09:39:54 2021 +0200 joy.cpl: Consistently use the 32 buttons limit from DIJOYSTATE. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 1498021db66..4431669eee8 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -414,7 +414,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM * Joystick testing functions * */ -static void dump_joy_state(DIJOYSTATE* st, int num_buttons) +static void dump_joy_state(DIJOYSTATE* st) { int i; TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ); @@ -423,7 +423,7 @@ static void dump_joy_state(DIJOYSTATE* st, int num_buttons) TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); TRACE("Buttons "); - for(i=0; i < num_buttons; i++) + for(i=0; i < TEST_MAX_BUTTONS; i++) TRACE(" %c",st->rgbButtons[i] ? 'x' : 'o'); TRACE("\n"); } @@ -474,10 +474,10 @@ static DWORD WINAPI input_thread(void *param) poll_input(&data->joysticks[data->chosen_joystick], &state); - dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); + dump_joy_state(&state); /* Indicate pressed buttons */ - for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) + for (i = 0; i < TEST_MAX_BUTTONS; i++) SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0); /* Indicate axis positions, axes showing are hardcoded for now */ @@ -766,7 +766,7 @@ static DWORD WINAPI ff_input_thread(void *param) SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - for (i=0; i < joy->num_buttons; i++) + for (i=0; i < TEST_MAX_BUTTONS; i++) if (state.rgbButtons[i]) { IDirectInputEffect_SetParameters(joy->effects[chosen_effect].effect, dieffect, flags);

1 0

Rémi Bernon : joy.cpl: Better handle effect creation errors.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 960bb3694143bfd4130229bc7ba7e3d315afa084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=960bb3694143bfd4130229bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 14 09:39:55 2021 +0200 joy.cpl: Better handle effect creation errors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 4431669eee8..c96efb17aa3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -867,6 +867,11 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) hr = IDirectInputDevice2_CreateEffect( joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL); + if (FAILED(hr)) + { + FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr); + return DIENUM_CONTINUE; + } joystick->effects[joystick->cur_effect].params = dieffect; joystick->effects[joystick->cur_effect].info = *pdei;

1 0

Nikolay Sivov : d3d10/effect: Get rid of linear search for property information.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 1bc3ca71d6108cc7af2bfbb2a23c43298ac57b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc3ca71d6108cc7af2bfbb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:36 2021 +0300 d3d10/effect: Get rid of linear search for property information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd5f6517c54..71ad3f64a05 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -176,7 +176,7 @@ struct d3d10_effect_state_property_info LONG index_offset; }; -static const struct d3d10_effect_state_property_info property_info[] = +static const struct d3d10_effect_state_property_info property_infos[] = { {0x00, "Pass.RasterizerState", D3D10_SVT_RASTERIZER, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, rasterizer) }, {0x01, "Pass.DepthStencilState", D3D10_SVT_DEPTHSTENCIL, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, depth_stencil) }, @@ -1540,19 +1540,6 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ return S_OK; } -static const struct d3d10_effect_state_property_info *get_property_info(UINT id) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(property_info); ++i) - { - if (property_info[i].id == id) - return &property_info[i]; - } - - return NULL; -} - static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER_VARIABLE_TYPE id) { unsigned int i; @@ -1764,14 +1751,14 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size read_dword(ptr, &operation); read_dword(ptr, &value_offset); - if (!(property_info = get_property_info(id))) + if (id >= ARRAY_SIZE(property_infos)) { - FIXME("Failed to find property info for property %#x.\n", id); + FIXME("Unknown property id %#x.\n", id); return E_FAIL; } + property_info = &property_infos[id]; - TRACE("Property %s[%#x] = value list @ offset %#x.\n", - property_info->name, idx, value_offset); + TRACE("Property %s[%#x] = value list @ offset %#x.\n", property_info->name, idx, value_offset); if (property_info->container_type != container_type) {

1 0

Jacek Caban : win32u: Move NtUserGetProcessWindowStation implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 588dc55e9e089f1939b9ce3fa9caff3cfca1d2ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=588dc55e9e089f1939b9ce3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:52:53 2021 +0200 win32u: Move NtUserGetProcessWindowStation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/winstation.c | 19 +------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 16 ++++++++++++++++ dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 3 ++- 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7de45376740..183e596dcef 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -95,7 +95,7 @@ static const USER_DRIVER *load_driver(void) USEROBJECTFLAGS flags; HWINSTA winstation; - winstation = GetProcessWindowStation(); + winstation = NtUserGetProcessWindowStation(); if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) || (flags.dwFlags & WSF_VISIBLE)) driver->pCreateWindow = nodrv_CreateWindow; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 733acd3d3c6..8572b78a484 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4120,7 +4120,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); /* Report physical monitor information only if window station has visible display surfaces */ - winstation = GetProcessWindowStation(); + winstation = NtUserGetProcessWindowStation(); if (GetUserObjectInformationW( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL )) is_winstation_visible = flags.dwFlags & WSF_VISIBLE; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 21b45c911d1..c50740732e2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -361,7 +361,7 @@ @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) -@ stdcall GetProcessWindowStation() +@ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation @ stdcall GetProgmanWindow () @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 30e5d154d3d..f037d1684c4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -290,7 +290,7 @@ static void winstation_init(void) } /* set winstation if explicitly specified, or if we don't have one yet */ - if (buffer || !GetProcessWindowStation()) + if (buffer || !NtUserGetProcessWindowStation()) { handle = CreateWindowStationW( winstation ? winstation : L"WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); if (handle) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 057f0d75cb8..245cd6c0f40 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -203,23 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces } -/****************************************************************************** - * GetProcessWindowStation (USER32.@) - */ -HWINSTA WINAPI GetProcessWindowStation(void) -{ - HWINSTA ret = 0; - - SERVER_START_REQ( get_process_winstation ) - { - if (!wine_server_call_err( req )) - ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * SetProcessWindowStation (USER32.@) */ @@ -472,7 +455,7 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam NTSTATUS status; if (!winsta) - winsta = GetProcessWindowStation(); + winsta = NtUserGetProcessWindowStation(); while (ret) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 596ec6bbba3..859dda9780d 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -95,6 +95,7 @@ static void * const syscalls[] = NtGdiSwapBuffers, NtGdiTransformPoints, NtUserCloseWindowStation, + NtUserGetProcessWindowStation, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 92f9a143800..7427c8e10d0 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -979,7 +979,7 @@ @ stub NtUserGetPriorityClipboardFormat @ stub NtUserGetProcessDpiAwarenessContext @ stub NtUserGetProcessUIContextInformation -@ stub NtUserGetProcessWindowStation +@ stdcall -syscall NtUserGetProcessWindowStation() @ stub NtUserGetProp @ stub NtUserGetQueueStatus @ stub NtUserGetQueueStatusReadonly diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index f50464f856d..3a6ef8059b4 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -43,3 +43,19 @@ BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUSerGetProcessWindowStation (win32u.@) + */ +HWINSTA WINAPI NtUserGetProcessWindowStation(void) +{ + HWINSTA ret = 0; + + SERVER_START_REQ( get_process_winstation ) + { + if (!wine_server_call_err( req )) + ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 276c83474fe..0a905e131d8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -81,6 +81,7 @@ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ - SYSCALL_ENTRY( NtUserCloseWindowStation ) + SYSCALL_ENTRY( NtUserCloseWindowStation ) \ + SYSCALL_ENTRY( NtUserGetProcessWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7370a3d4940..56156e6fdeb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -33,3 +33,8 @@ NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) return NtUserCloseWindowStation( handle ); } + +NTSTATUS WINAPI wow64_NtUserGetProcessWindowStation( UINT *args ) +{ + return HandleToUlong( NtUserGetProcessWindowStation() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 8b09f732ecd..7ea4ccd4bdf 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -22,6 +22,7 @@ #include <winuser.h> #include <winternl.h> -BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +HWINSTA WINAPI NtUserGetProcessWindowStation(void); #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move NtUserSetProcessWindowStation implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 187b3e2cdf4697f566d6f75c04ae7b7d597ea06c URL: https://source.winehq.org/git/wine.git/?a=commit;h=187b3e2cdf4697f566d6f75c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:53:22 2021 +0200 win32u: Move NtUserSetProcessWindowStation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/winstation.c | 17 ----------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 16 ++++++++++++++++ dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 9 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c50740732e2..19bf5ce1b8e 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -692,7 +692,7 @@ @ stdcall SetProcessDefaultLayout(long) @ stdcall SetProcessDpiAwarenessContext(long) @ stdcall SetProcessDpiAwarenessInternal(long) -@ stdcall SetProcessWindowStation(long) +@ stdcall SetProcessWindowStation(long) NtUserSetProcessWindowStation @ stdcall SetProgmanWindow (long) @ stdcall SetPropA(long str long) @ stdcall SetPropW(long wstr long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f037d1684c4..d7f320575cb 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -295,7 +295,7 @@ static void winstation_init(void) handle = CreateWindowStationW( winstation ? winstation : L"WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); if (handle) { - SetProcessWindowStation( handle ); + NtUserSetProcessWindowStation( handle ); /* only WinSta0 is visible */ if (!winstation || !wcsicmp( winstation, L"WinSta0" )) { diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 245cd6c0f40..37ae9e9ceb2 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -203,23 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces } -/*********************************************************************** - * SetProcessWindowStation (USER32.@) - */ -BOOL WINAPI SetProcessWindowStation( HWINSTA handle ) -{ - BOOL ret; - - SERVER_START_REQ( set_process_winstation ) - { - req->handle = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /****************************************************************************** * EnumWindowStationsA (USER32.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 859dda9780d..132c55117a7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -96,6 +96,7 @@ static void * const syscalls[] = NtGdiTransformPoints, NtUserCloseWindowStation, NtUserGetProcessWindowStation, + NtUserSetProcessWindowStation, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 7427c8e10d0..24625316f9e 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1221,7 +1221,7 @@ @ stub NtUserSetProcessMousewheelRoutingMode @ stub NtUserSetProcessRestrictionExemption @ stub NtUserSetProcessUIAccessZorder -@ stub NtUserSetProcessWindowStation +@ stdcall -syscall NtUserSetProcessWindowStation(long) @ stub NtUserSetProp @ stub NtUserSetScrollInfo @ stub NtUserSetSensorPresence diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 3a6ef8059b4..153a83e313d 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -59,3 +59,19 @@ HWINSTA WINAPI NtUserGetProcessWindowStation(void) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUserSetProcessWindowStation (win32u.@) + */ +BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ) +{ + BOOL ret; + + SERVER_START_REQ( set_process_winstation ) + { + req->handle = wine_server_obj_handle( handle ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 0a905e131d8..ccf0574c639 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -82,6 +82,7 @@ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ - SYSCALL_ENTRY( NtUserGetProcessWindowStation ) + SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ + SYSCALL_ENTRY( NtUserSetProcessWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 56156e6fdeb..cf028383c21 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -38,3 +38,10 @@ NTSTATUS WINAPI wow64_NtUserGetProcessWindowStation( UINT *args ) { return HandleToUlong( NtUserGetProcessWindowStation() ); } + +NTSTATUS WINAPI wow64_NtUserSetProcessWindowStation( UINT *args ) +{ + HWINSTA handle = get_handle( &args ); + + return NtUserSetProcessWindowStation( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 7ea4ccd4bdf..eac4f0da092 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -24,5 +24,6 @@ BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); +BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move NtUserCloseDesktop implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: ccf00c6d954f1f08fa371c211f8d42473f772e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf00c6d954f1f08fa371c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:53:36 2021 +0200 win32u: Move NtUserCloseDesktop implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 16 ---------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 15 +++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7e6b660b8af..e5ea0735ed2 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4321,7 +4321,7 @@ static BOOL CALLBACK bcast_desktop( LPWSTR desktop, LPARAM lp ) } ret = EnumDesktopWindows( hdesktop, bcast_childwindow, lp ); - CloseDesktop(hdesktop); + NtUserCloseDesktop( hdesktop ); TRACE("-->%d\n", ret); return parm->success; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 19bf5ce1b8e..7686e4ed14d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -74,7 +74,7 @@ @ stdcall ClientToScreen(long ptr) @ stdcall ClipCursor(ptr) @ stdcall CloseClipboard() -@ stdcall CloseDesktop(long) +@ stdcall CloseDesktop(long) NtUserCloseDesktop @ stdcall CloseTouchInputHandle(long) @ stdcall CloseWindow(long) @ stdcall CloseWindowStation(long) NtUserCloseWindowStation diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 37ae9e9ceb2..1f847ca8b8f 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -357,22 +357,6 @@ HDESK WINAPI OpenDesktopW( LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK } -/*********************************************************************** - * CloseDesktop (USER32.@) - */ -BOOL WINAPI CloseDesktop( HDESK handle ) -{ - BOOL ret; - SERVER_START_REQ( close_desktop ) - { - req->handle = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /****************************************************************************** * GetThreadDesktop (USER32.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 132c55117a7..2f4269104dd 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -94,6 +94,7 @@ static void * const syscalls[] = NtGdiSetVirtualResolution, NtGdiSwapBuffers, NtGdiTransformPoints, + NtUserCloseDesktop, NtUserCloseWindowStation, NtUserGetProcessWindowStation, NtUserSetProcessWindowStation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 24625316f9e..69a48236d84 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -794,7 +794,7 @@ @ stub NtUserClearForeground @ stub NtUserClipCursor @ stub NtUserCloseClipboard -@ stub NtUserCloseDesktop +@ stdcall -syscall NtUserCloseDesktop(long) @ stdcall -syscall NtUserCloseWindowStation(long) @ stub NtUserCompositionInputSinkLuidFromPoint @ stub NtUserCompositionInputSinkViewInstanceIdFromPoint diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 153a83e313d..3b0df303821 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -75,3 +75,18 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUserCloseDesktop (win32u.@) + */ +BOOL WINAPI NtUserCloseDesktop( HDESK handle ) +{ + BOOL ret; + SERVER_START_REQ( close_desktop ) + { + req->handle = wine_server_obj_handle( handle ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index ccf0574c639..ebb88f7013d 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -81,6 +81,7 @@ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ + SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cf028383c21..60fd8921b81 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -45,3 +45,10 @@ NTSTATUS WINAPI wow64_NtUserSetProcessWindowStation( UINT *args ) return NtUserSetProcessWindowStation( handle ); } + +NTSTATUS WINAPI wow64_NtUserCloseDesktop( UINT *args ) +{ + HDESK handle = get_handle( &args ); + + return NtUserCloseDesktop( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index eac4f0da092..f791af40232 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -22,6 +22,7 @@ #include <winuser.h> #include <winternl.h> +BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle );

1 0

Jacek Caban : win32u: Move NtUserGetThreadDesktop implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 915fb5681e5f77b5f2698e159332dd879216ea79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=915fb5681e5f77b5f2698e15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:54:00 2021 +0200 win32u: Move NtUserGetThreadDesktop implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 2 +- dlls/user32/winstation.c | 17 ----------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 16 ++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 10 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 7686e4ed14d..ecc7675403c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -387,7 +387,7 @@ @ stdcall GetTabbedTextExtentA(long str long long ptr) @ stdcall GetTabbedTextExtentW(long wstr long long ptr) @ stdcall GetTaskmanWindow () -@ stdcall GetThreadDesktop(long) +@ stdcall GetThreadDesktop(long) NtUserGetThreadDesktop @ stdcall GetThreadDpiAwarenessContext() @ stdcall GetTitleBarInfo(long ptr) @ stdcall GetTopWindow(long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d7f320575cb..0bf9eac434f 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -307,7 +307,7 @@ static void winstation_init(void) } } } - if (buffer || !GetThreadDesktop( GetCurrentThreadId() )) + if (buffer || !NtUserGetThreadDesktop( GetCurrentThreadId() )) { handle = CreateDesktopW( desktop ? desktop : get_default_desktop(), NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e89f4c2c97..e07b7d39e4b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2231,7 +2231,7 @@ HWND WINAPI GetDesktopWindow(void) SERVER_START_REQ( set_user_object_info ) { - req->handle = wine_server_obj_handle( GetThreadDesktop(GetCurrentThreadId()) ); + req->handle = wine_server_obj_handle( NtUserGetThreadDesktop(GetCurrentThreadId()) ); req->flags = SET_USER_OBJECT_GET_FULL_NAME; wine_server_set_reply( req, desktop, sizeof(desktop) - sizeof(WCHAR) ); if (!wine_server_call( req )) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 1f847ca8b8f..8150a7c87ec 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -357,23 +357,6 @@ HDESK WINAPI OpenDesktopW( LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK } -/****************************************************************************** - * GetThreadDesktop (USER32.@) - */ -HDESK WINAPI GetThreadDesktop( DWORD thread ) -{ - HDESK ret = 0; - - SERVER_START_REQ( get_thread_desktop ) - { - req->tid = thread; - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; -} - - /****************************************************************************** * SetThreadDesktop (USER32.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 2f4269104dd..a6e5be579fc 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -97,6 +97,7 @@ static void * const syscalls[] = NtUserCloseDesktop, NtUserCloseWindowStation, NtUserGetProcessWindowStation, + NtUserGetThreadDesktop, NtUserSetProcessWindowStation, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 69a48236d84..88b30cfae28 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -995,7 +995,7 @@ @ stub NtUserGetSharedWindowData @ stub NtUserGetSystemDpiForProcess @ stub NtUserGetSystemMenu -@ stub NtUserGetThreadDesktop +@ stdcall -syscall NtUserGetThreadDesktop(long) @ stub NtUserGetThreadState @ stub NtUserGetTitleBarInfo @ stub NtUserGetTopLevelWindow diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 3b0df303821..54046c646c0 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -90,3 +90,19 @@ BOOL WINAPI NtUserCloseDesktop( HDESK handle ) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUserGetThreadDesktop (win32u.@) + */ +HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ) +{ + HDESK ret = 0; + + SERVER_START_REQ( get_thread_desktop ) + { + req->tid = thread; + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index ebb88f7013d..3f01ce4f192 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -84,6 +84,7 @@ SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ + SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 60fd8921b81..93e31ad89a1 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -52,3 +52,10 @@ NTSTATUS WINAPI wow64_NtUserCloseDesktop( UINT *args ) return NtUserCloseDesktop( handle ); } + +NTSTATUS WINAPI wow64_NtUserGetThreadDesktop( UINT *args ) +{ + DWORD thread = get_ulong( &args ); + + return HandleToUlong( NtUserGetThreadDesktop( thread )); +} diff --git a/include/ntuser.h b/include/ntuser.h index f791af40232..5d7f22c47d6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -25,6 +25,7 @@ BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); +HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move NtUserSetThreadDesktop implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: ce9fc213a734a636fdfd020f0551affaf67411da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9fc213a734a636fdfd020f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:54:21 2021 +0200 win32u: Move NtUserSetThreadDesktop implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 2 +- dlls/user32/winstation.c | 8 +------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 18 ++++++++++++++++++ dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 8 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 0bf9eac434f..5a786ad7f83 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -311,7 +311,7 @@ static void winstation_init(void) { handle = CreateDesktopW( desktop ? desktop : get_default_desktop(), NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - if (handle) SetThreadDesktop( handle ); + if (handle) NtUserSetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 8150a7c87ec..a8140c34b8d 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -362,14 +362,8 @@ HDESK WINAPI OpenDesktopW( LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK */ BOOL WINAPI SetThreadDesktop( HDESK handle ) { - BOOL ret; + BOOL ret = NtUserSetThreadDesktop( handle ); - SERVER_START_REQ( set_thread_desktop ) - { - req->handle = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; if (ret) /* reset the desktop windows */ { struct user_thread_info *thread_info = get_user_thread_info(); diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index a6e5be579fc..7ea1f30e3f9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -99,6 +99,7 @@ static void * const syscalls[] = NtUserGetProcessWindowStation, NtUserGetThreadDesktop, NtUserSetProcessWindowStation, + NtUserSetThreadDesktop, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 88b30cfae28..c24957a224c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1232,7 +1232,7 @@ @ stub NtUserSetSystemMenu @ stub NtUserSetSystemTimer @ stub NtUserSetTargetForResourceBrokering -@ stub NtUserSetThreadDesktop +@ stdcall -syscall NtUserSetThreadDesktop(long) @ stub NtUserSetThreadInputBlocked @ stub NtUserSetThreadLayoutHandles @ stub NtUserSetThreadState diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 54046c646c0..7cebe5d44d7 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -106,3 +106,21 @@ HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUserSetThreadDesktop (win32u.@) + */ +BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ) +{ + BOOL ret; + + SERVER_START_REQ( set_thread_desktop ) + { + req->handle = wine_server_obj_handle( handle ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + + /* FIXME: reset uset thread info */ + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 3f01ce4f192..d6c4c5856bd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -85,6 +85,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ - SYSCALL_ENTRY( NtUserSetProcessWindowStation ) + SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ + SYSCALL_ENTRY( NtUserSetThreadDesktop ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 93e31ad89a1..a4b26c5ac96 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -59,3 +59,10 @@ NTSTATUS WINAPI wow64_NtUserGetThreadDesktop( UINT *args ) return HandleToUlong( NtUserGetThreadDesktop( thread )); } + +NTSTATUS WINAPI wow64_NtUserSetThreadDesktop( UINT *args ) +{ + HDESK handle = get_handle( &args ); + + return NtUserSetThreadDesktop( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 5d7f22c47d6..b9d94ce66de 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -27,5 +27,6 @@ BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); +BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move NtUserOpenInputDesktop implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: af7ed8a538a51c120a7c0b82b2838c6310827b4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7ed8a538a51c120a7c0b82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:54:56 2021 +0200 win32u: Move NtUserOpenInputDesktop implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 25 ------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 28 ++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 8 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index ecc7675403c..0c1066bc895 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -556,7 +556,7 @@ @ stdcall OpenDesktopA(str long long long) @ stdcall OpenDesktopW(wstr long long long) @ stdcall OpenIcon(long) -@ stdcall OpenInputDesktop(long long long) +@ stdcall OpenInputDesktop(long long long) NtUserOpenInputDesktop @ stdcall OpenWindowStationA(str long long) @ stdcall OpenWindowStationW(wstr long long) @ stdcall PackDDElParam(long long long) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index a8140c34b8d..1899feb6a28 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -426,31 +426,6 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam } -/****************************************************************************** - * OpenInputDesktop (USER32.@) - */ -HDESK WINAPI OpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ) -{ - HANDLE ret = 0; - - TRACE( "(%x,%i,%x)\n", flags, inherit, access ); - - if (flags) - FIXME( "partial stub flags %08x\n", flags ); - - SERVER_START_REQ( open_input_desktop ) - { - req->flags = flags; - req->access = access; - req->attributes = inherit ? OBJ_INHERIT : 0; - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - return ret; -} - - /*********************************************************************** * GetUserObjectInformationA (USER32.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 7ea1f30e3f9..2b54fddfb1a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -98,6 +98,7 @@ static void * const syscalls[] = NtUserCloseWindowStation, NtUserGetProcessWindowStation, NtUserGetThreadDesktop, + NtUserOpenInputDesktop, NtUserSetProcessWindowStation, NtUserSetThreadDesktop, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c24957a224c..dc380b84c34 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1092,7 +1092,7 @@ @ stub NtUserNotifyWinEvent @ stub NtUserOpenClipboard @ stub NtUserOpenDesktop -@ stub NtUserOpenInputDesktop +@ stdcall -syscall NtUserOpenInputDesktop(long long long) @ stub NtUserOpenThreadDesktop @ stub NtUserOpenWindowStation @ stub NtUserPaintDesktop diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 7cebe5d44d7..af744ce89eb 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -28,6 +28,10 @@ #include "ntuser.h" #include "winternl.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winstation); + /*********************************************************************** * NtUserCloseWindowStation (win32u.@) @@ -124,3 +128,27 @@ BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ) /* FIXME: reset uset thread info */ return ret; } + +/*********************************************************************** + * NtUserOpenInputDesktop (win32u.@) + */ +HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ) +{ + HANDLE ret = 0; + + TRACE( "(%x,%i,%x)\n", flags, inherit, access ); + + if (flags) + FIXME( "partial stub flags %08x\n", flags ); + + SERVER_START_REQ( open_input_desktop ) + { + req->flags = flags; + req->access = access; + req->attributes = inherit ? OBJ_INHERIT : 0; + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index d6c4c5856bd..154c21e5cc6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -85,6 +85,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a4b26c5ac96..9dca44286e3 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -66,3 +66,12 @@ NTSTATUS WINAPI wow64_NtUserSetThreadDesktop( UINT *args ) return NtUserSetThreadDesktop( handle ); } + +NTSTATUS WINAPI wow64_NtUserOpenInputDesktop( UINT *args ) +{ + DWORD flags = get_ulong( &args ); + BOOL inherit = get_ulong( &args ); + ACCESS_MASK access = get_ulong( &args ); + + return HandleToUlong( NtUserOpenInputDesktop( flags, inherit, access )); +} diff --git a/include/ntuser.h b/include/ntuser.h index b9d94ce66de..d253c127ad3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -26,6 +26,7 @@ BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); +HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle );

1 0

Jacek Caban : win32u: Move NtUserGetObjectInformation implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: b55abd072e3cc8c8e1627c00b18a0893bafeb9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b55abd072e3cc8c8e1627c00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:55:30 2021 +0200 win32u: Move NtUserGetObjectInformation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winstation.c | 95 +----------------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/user.c | 11 ++++++ include/ntuser.h | 2 + 8 files changed, 113 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b55abd072e3cc8c8e162…

1 0