March 2023 - Wine-Commits - list.winehq.org

Mohamad Al-Jaf : windows.perception.stub: Implement IHolographicSpaceStatics2::get_IsSupported().
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: fbf3c9e43cabdc690711b0f7b3ea82b15527fafe URL: https://gitlab.winehq.org/wine/wine/-/commit/fbf3c9e43cabdc690711b0f7b3ea82… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:31:15 2023 -0500 windows.perception.stub: Implement IHolographicSpaceStatics2::get_IsSupported(). Needed by the VR game Desperate: Vladivostok. --- dlls/windows.perception.stub/holographicspace.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index 36a315bd26a..c4ecd798d3e 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -119,8 +119,10 @@ DEFINE_IINSPECTABLE( holographicspace_statics2, IHolographicSpaceStatics2, struc static HRESULT WINAPI holographicspace_statics2_get_IsSupported( IHolographicSpaceStatics2 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static HRESULT WINAPI holographicspace_statics2_get_IsAvailable( IHolographicSpaceStatics2 *iface, boolean *value ) diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index aded4a6fa7d..770f21c3fd7 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -132,7 +132,7 @@ static void test_HolographicSpaceStatics(void) value = 2; hr = IHolographicSpaceStatics2_get_IsSupported( holographicspace_statics2, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); todo_wine ok( value == TRUE, "got %d.\n", value ); value = 2;

1 0

Mohamad Al-Jaf : windows.perception.stub: Implement IHolographicSpaceStatics2::get_IsAvailable().
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 18453129be33fd50d3050dec722df054a181017a URL: https://gitlab.winehq.org/wine/wine/-/commit/18453129be33fd50d3050dec722df0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:32:30 2023 -0500 windows.perception.stub: Implement IHolographicSpaceStatics2::get_IsAvailable(). Needed by the VR game Desperate: Vladivostok. --- dlls/windows.perception.stub/holographicspace.c | 6 ++++-- dlls/windows.perception.stub/tests/perception.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index c4ecd798d3e..a99932f7889 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -127,8 +127,10 @@ static HRESULT WINAPI holographicspace_statics2_get_IsSupported( IHolographicSpa static HRESULT WINAPI holographicspace_statics2_get_IsAvailable( IHolographicSpaceStatics2 *iface, boolean *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + TRACE( "iface %p, value %p\n", iface, value ); + + *value = FALSE; + return S_OK; } static HRESULT WINAPI holographicspace_statics2_add_IsAvailableChanged( IHolographicSpaceStatics2 *iface, IEventHandler_IInspectable *handler, diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 770f21c3fd7..2fb526ed3d5 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -137,8 +137,8 @@ static void test_HolographicSpaceStatics(void) value = 2; hr = IHolographicSpaceStatics2_get_IsAvailable( holographicspace_statics2, &value ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( value == FALSE, "got %d.\n", value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( value == FALSE, "got %d.\n", value ); ref = IHolographicSpaceStatics2_Release( holographicspace_statics2 ); ok( ref == 2, "got ref %ld.\n", ref );

1 0

Mohamad Al-Jaf : windows.perception.stub: Add IHolographicSpaceStatics2 stub interface.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 83dd2fd876730e06050762a04fcd69bf992f5984 URL: https://gitlab.winehq.org/wine/wine/-/commit/83dd2fd876730e06050762a04fcd69… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 19:41:38 2023 -0500 windows.perception.stub: Add IHolographicSpaceStatics2 stub interface. --- dlls/windows.perception.stub/Makefile.in | 1 + dlls/windows.perception.stub/classes.idl | 1 + dlls/windows.perception.stub/holographicspace.c | 168 ++++++++++++++++++++++++ dlls/windows.perception.stub/main.c | 2 + dlls/windows.perception.stub/private.h | 3 + dlls/windows.perception.stub/tests/perception.c | 66 ++++++++-- 6 files changed, 231 insertions(+), 10 deletions(-)

1 0

Mohamad Al-Jaf : include: Add IHolographicSpaceStatics3 interface definition.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 0f018523332c10da70220100ca28369d51e33f9e URL: https://gitlab.winehq.org/wine/wine/-/commit/0f018523332c10da70220100ca2836… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 00:08:45 2023 -0400 include: Add IHolographicSpaceStatics3 interface definition. --- include/windows.graphics.holographic.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/windows.graphics.holographic.idl b/include/windows.graphics.holographic.idl index cada5796916..568003cd7a3 100644 --- a/include/windows.graphics.holographic.idl +++ b/include/windows.graphics.holographic.idl @@ -99,6 +99,16 @@ namespace Windows.Graphics.Holographic { [eventremove] HRESULT IsAvailableChanged([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpace), + uuid(3b00de3d-b1a3-4dfe-8e79-fec5909e6df8) + ] + interface IHolographicSpaceStatics3 : IInspectable + { + [propget] HRESULT IsConfigured([out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs),

1 0

Mohamad Al-Jaf : include: Add IHolographicSpaceStatics2 interface definition.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 83e8ff0b15e3f804442c531643f4cf53dd497c8a URL: https://gitlab.winehq.org/wine/wine/-/commit/83e8ff0b15e3f804442c531643f4cf… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 00:07:54 2023 -0400 include: Add IHolographicSpaceStatics2 interface definition. --- include/windows.graphics.holographic.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/windows.graphics.holographic.idl b/include/windows.graphics.holographic.idl index d2ac0ee48e8..cada5796916 100644 --- a/include/windows.graphics.holographic.idl +++ b/include/windows.graphics.holographic.idl @@ -86,6 +86,19 @@ namespace Windows.Graphics.Holographic { HRESULT CreateNextFrame([out, retval] Windows.Graphics.Holographic.HolographicFrame **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpace), + uuid(0e777088-75fc-48af-8758-0652f6f07c59) + ] + interface IHolographicSpaceStatics2 : IInspectable + { + [propget] HRESULT IsSupported([out, retval] boolean *value); + [propget] HRESULT IsAvailable([out, retval] boolean *value); + [eventadd] HRESULT IsAvailableChanged([in] Windows.Foundation.EventHandler<IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT IsAvailableChanged([in] EventRegistrationToken token); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs),

1 0

Mohamad Al-Jaf : include: Add windows.graphics.holographic.idl file.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: e98c7a0fcd8a6546534c1dccd1815192b8cf2264 URL: https://gitlab.winehq.org/wine/wine/-/commit/e98c7a0fcd8a6546534c1dccd18151… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Mar 7 02:03:12 2023 -0500 include: Add windows.graphics.holographic.idl file. --- include/Makefile.in | 1 + include/windows.graphics.holographic.idl | 162 +++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 198145d59f9..7e0b9d89085 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -817,6 +817,7 @@ SOURCES = \ windows.globalization.idl \ windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ + windows.graphics.holographic.idl \ windows.h \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ diff --git a/include/windows.graphics.holographic.idl b/include/windows.graphics.holographic.idl new file mode 100644 index 00000000000..d2ac0ee48e8 --- /dev/null +++ b/include/windows.graphics.holographic.idl @@ -0,0 +1,162 @@ +/* + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.foundation.numerics.idl"; +import "windows.graphics.directx.idl"; +import "windows.graphics.directx.direct3d11.idl"; +/* import "windows.perception.idl"; */ +import "windows.perception.spatial.idl"; +/* import "windows.ui.core.idl"; */ + +namespace Windows.Graphics.Holographic { + typedef struct HolographicAdapterId HolographicAdapterId; + + interface IHolographicCamera; + interface IHolographicFrame; + interface IHolographicSpaceStatics; + interface IHolographicSpaceStatics2; + interface IHolographicSpaceStatics3; + interface IHolographicSpaceCameraAddedEventArgs; + interface IHolographicSpaceCameraRemovedEventArgs; + + runtimeclass HolographicCamera; + runtimeclass HolographicFrame; + runtimeclass HolographicSpace; + runtimeclass HolographicSpaceCameraAddedEventArgs; + runtimeclass HolographicSpaceCameraRemovedEventArgs; + + declare { + interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Holographic.HolographicSpace *, IInspectable *>; + interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Holographic.HolographicSpace *, Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs *>; + interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Holographic.HolographicSpace *, Windows.Graphics.Holographic.HolographicSpaceCameraRemovedEventArgs *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + struct HolographicAdapterId + { + UINT32 LowPart; + INT32 HighPart; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpace), + uuid(4380dba6-5e78-434f-807c-3433d1efe8b7) + ] + interface IHolographicSpace : IInspectable + { + [propget] HRESULT PrimaryAdapterId([out, retval] Windows.Graphics.Holographic.HolographicAdapterId *value); + HRESULT SetDirect3D11Device([in] Windows.Graphics.DirectX.Direct3D11.IDirect3DDevice *value); + [eventadd] HRESULT CameraAdded( + [in] Windows.Foundation.TypedEventHandler<Windows.Graphics.Holographic.HolographicSpace *, Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs *> *handler, + [out, retval] EventRegistrationToken *cookie + ); + [eventremove] HRESULT CameraAdded([in] EventRegistrationToken cookie); + [eventadd] HRESULT CameraRemoved( + [in] Windows.Foundation.TypedEventHandler<Windows.Graphics.Holographic.HolographicSpace *, Windows.Graphics.Holographic.HolographicSpaceCameraRemovedEventArgs *> *handler, + [out, retval] EventRegistrationToken *cookie + ); + [eventremove] HRESULT CameraRemoved([in] EventRegistrationToken cookie); + HRESULT CreateNextFrame([out, retval] Windows.Graphics.Holographic.HolographicFrame **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs), + uuid(58f1da35-bbb3-3c8f-993d-6c80e7feb99f) + ] + interface IHolographicSpaceCameraAddedEventArgs : IInspectable + { + [propget] HRESULT Camera([out, retval] Windows.Graphics.Holographic.HolographicCamera **value); + HRESULT GetDeferral([out, retval] Windows.Foundation.Deferral **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraRemovedEventArgs), + uuid(805444a8-f2ae-322e-8da9-836a0a95a4c1) + ] + interface IHolographicSpaceCameraRemovedEventArgs : IInspectable + { + [propget] HRESULT Camera([out, retval] Windows.Graphics.Holographic.HolographicCamera **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass HolographicCamera + { + [default] interface Windows.Graphics.Holographic.IHolographicCamera; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass HolographicFrame + { + [default] interface Windows.Graphics.Holographic.IHolographicFrame; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.Graphics.Holographic.IHolographicSpaceStatics, Windows.Foundation.UniversalApiContract, 2.0), + static(Windows.Graphics.Holographic.IHolographicSpaceStatics2, Windows.Foundation.UniversalApiContract, 4.0), + static(Windows.Graphics.Holographic.IHolographicSpaceStatics3, Windows.Foundation.UniversalApiContract, 5.0), + threading(both) + ] + runtimeclass HolographicSpace + { + [default] interface Windows.Graphics.Holographic.IHolographicSpace; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass HolographicSpaceCameraAddedEventArgs + { + [default] interface Windows.Graphics.Holographic.IHolographicSpaceCameraAddedEventArgs; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass HolographicSpaceCameraRemovedEventArgs + { + [default] interface Windows.Graphics.Holographic.IHolographicSpaceCameraRemovedEventArgs; + } +}

1 0

Dmitry Timoshkov : win32u: Give full access rights to the thread desktop.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 02e3e17b4dd62eb71d867d0140d3061de683ba29 URL: https://gitlab.winehq.org/wine/wine/-/commit/02e3e17b4dd62eb71d867d0140d306… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:33:42 2022 +0300 win32u: Give full access rights to the thread desktop. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 40105dd0f33..e33a3252494 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -279,7 +279,6 @@ static void test_handles(void) status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a6b35090223..d7300774a56 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -628,7 +628,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, DESKTOP_ALL_ACCESS, 0 ); + handle = NtUserCreateDesktopEx( &attr, NULL, NULL, 0, STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS, 0 ); if (handle) NtUserSetThreadDesktop( handle ); } NtClose( dir );

1 0

Mohamad Al-Jaf : include: Add windows.graphics.directx.direct3d11.idl file.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 3d3076b2ab4748f79720a2040d1c33eda5882855 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d3076b2ab4748f79720a2040d1c33… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Mar 2 23:39:58 2023 -0500 include: Add windows.graphics.directx.direct3d11.idl file. Needed by windows.graphics.holographic.idl. --- include/Makefile.in | 1 + include/windows.graphics.directx.direct3d11.idl | 65 +++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 27360fa5f21..198145d59f9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -815,6 +815,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.gaming.ui.idl \ windows.globalization.idl \ + windows.graphics.directx.direct3d11.idl \ windows.graphics.directx.idl \ windows.h \ windows.media.closedcaptioning.idl \ diff --git a/include/windows.graphics.directx.direct3d11.idl b/include/windows.graphics.directx.direct3d11.idl new file mode 100644 index 00000000000..f53140545b0 --- /dev/null +++ b/include/windows.graphics.directx.direct3d11.idl @@ -0,0 +1,65 @@ +/* + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.directx.idl"; + +namespace Windows.Graphics.DirectX.Direct3D11 { + typedef struct Direct3DMultisampleDescription Direct3DMultisampleDescription; + typedef struct Direct3DSurfaceDescription Direct3DSurfaceDescription; + + interface IDirect3DDevice; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct Direct3DMultisampleDescription + { + INT32 Count; + INT32 Quality; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct Direct3DSurfaceDescription + { + INT32 Width; + INT32 Height; + Windows.Graphics.DirectX.DirectXPixelFormat Format; + Windows.Graphics.DirectX.Direct3D11.Direct3DMultisampleDescription MultisampleDescription; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(a37624ab-8d5f-4650-9d3e-9eae3d9bc670) + ] + interface IDirect3DDevice : IInspectable + requires Windows.Foundation.IClosable + { + HRESULT Trim(); + } +}

1 0

Dmitry Timoshkov : win32u: Give full access rights to the process window station.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: b99c67569f8ca939fba84dc3c8d448570daa753e URL: https://gitlab.winehq.org/wine/wine/-/commit/b99c67569f8ca939fba84dc3c8d448… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Dec 3 21:11:00 2022 +0300 win32u: Give full access rights to the process window station. Fix CEF applications crash at start without --no-sandbox option. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53981 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/winstation.c | 1 - dlls/win32u/winstation.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index fc775546502..40105dd0f33 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -137,7 +137,6 @@ static void test_handles(void) status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); ok( !status, "NtQueryObject failed, status %#lx\n", status ); - todo_wine ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), "Got unexpected access %#lx\n", info.GrantedAccess ); diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 145e12a8e1f..a6b35090223 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -604,7 +604,7 @@ void winstation_init(void) InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, dir, NULL ); - handle = NtUserCreateWindowStation( &attr, WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); + handle = NtUserCreateWindowStation( &attr, STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS, 0, 0, 0, 0, 0 ); if (handle) { NtUserSetProcessWindowStation( handle );

1 0

Zhiyi Zhang : user32/tests: Test winstation and desktop access rights.
by Alexandre Julliard March 17, 2023

March 17, 2023

Module: wine Branch: master Commit: 44b92e577716f5b91fd8b6130a79a81ae13d426f URL: https://gitlab.winehq.org/wine/wine/-/commit/44b92e577716f5b91fd8b6130a79a8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 15 10:32:55 2023 +0800 user32/tests: Test winstation and desktop access rights. --- dlls/user32/tests/winstation.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9c27b5afd01..fc775546502 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -121,7 +121,9 @@ static void test_handles(void) char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + OBJECT_BASIC_INFORMATION info; TOKEN_STATISTICS token_stats; + NTSTATUS status; /* win stations */ @@ -133,6 +135,12 @@ static void test_handles(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); print_object( w1 ); + status = NtQueryObject( w1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + flags = 0; ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) || @@ -270,6 +278,12 @@ static void test_handles(void) ok( GetHandleInformation( d1, &flags ), "GetHandleInformation failed\n" ); ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", d1 ); + status = NtQueryObject( d1, ObjectBasicInformation, &info, sizeof(info), NULL ); + ok( !status, "NtQueryObject failed, status %#lx\n", status ); + todo_wine + ok( info.GrantedAccess == (STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS), + "Got unexpected access %#lx\n", info.GrantedAccess ); + SetLastError( 0xdeadbeef ); ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */

1 0