June 2024 - Wine-commits - list.winehq.org

Zhiyi Zhang : kernel32: Add AppPolicyGetWindowingModel().
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 53d03fb0a537ce99a464da2c3f416e033dad3153 URL: https://gitlab.winehq.org/wine/wine/-/commit/53d03fb0a537ce99a464da2c3f416e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 9 11:06:45 2024 +0800 kernel32: Add AppPolicyGetWindowingModel(). --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 28a3f554374..179d49ba7cb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -158,6 +158,7 @@ @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AppPolicyGetMediaFoundationCodecLoading(ptr ptr) kernelbase.AppPolicyGetMediaFoundationCodecLoading +@ stdcall AppPolicyGetWindowingModel(ptr ptr) kernelbase.AppPolicyGetWindowingModel @ stdcall -import AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall -import AttachConsole(long)

1 0

Rémi Bernon : include: Add a couple of CRT function declarations.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: dea96222b42080f0c081454089422100335db10d URL: https://gitlab.winehq.org/wine/wine/-/commit/dea96222b42080f0c0814540894221… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 20:42:48 2024 +0200 include: Add a couple of CRT function declarations. --- include/msvcrt/math.h | 3 +++ include/msvcrt/stdlib.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index fc7de676c83..8238c5803b4 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -111,6 +111,9 @@ _ACRTIMP float __cdecl truncf(float); _ACRTIMP int __cdecl ilogb(double); _ACRTIMP int __cdecl ilogbf(float); +_ACRTIMP float __cdecl fmaf(float x, float y, float z); +_ACRTIMP double __cdecl fma(double x, double y, double z); + _ACRTIMP __int64 __cdecl llrint(double); _ACRTIMP __int64 __cdecl llrintf(float); _ACRTIMP __int64 __cdecl llround(double); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f1ffcd8c035..f3df662528a 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -238,6 +238,8 @@ _ACRTIMP unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t) _ACRTIMP int __cdecl system(const char*); _ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); _ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +_ACRTIMP void __cdecl qsort_s(void*,size_t,size_t,int (__cdecl *)(void*,const void*,const void*),void*); +_ACRTIMP unsigned int __cdecl _set_abort_behavior(unsigned int flags, unsigned int mask); typedef void (__cdecl *_purecall_handler)(void); _ACRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler);

1 0

Rémi Bernon : include: Define frexpf as inline function in more cases.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: f5a739ce6262d15e2862f0a482efe4db4b38206c URL: https://gitlab.winehq.org/wine/wine/-/commit/f5a739ce6262d15e2862f0a482efe4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 20 23:02:55 2024 +0200 include: Define frexpf as inline function in more cases. --- include/msvcrt/math.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 8238c5803b4..03c4bf57f59 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -159,7 +159,6 @@ _ACRTIMP float __cdecl powf(float, float); _ACRTIMP float __cdecl sqrtf(float); _ACRTIMP float __cdecl ceilf(float); _ACRTIMP float __cdecl floorf(float); -_ACRTIMP float __cdecl frexpf(float, int*); _ACRTIMP float __cdecl modff(float, float*); _ACRTIMP float __cdecl fmodf(float, float); @@ -186,7 +185,6 @@ static inline float powf(float x, float y) { return pow(x, y); } static inline float sqrtf(float x) { return sqrt(x); } static inline float ceilf(float x) { return ceil(x); } static inline float floorf(float x) { return floor(x); } -static inline float frexpf(float x, int *y) { return frexp(x, y); } static inline float modff(float x, float *y) { double yd, ret = modf(x, &yd); *y = yd; return ret; } static inline float fmodf(float x, float y) { return fmod(x, y); } @@ -209,6 +207,12 @@ static inline int _fpclassf(float x) #endif +#if (defined(__x86_64__) && !defined(_UCRT)) || defined(_NO_CRT_MATH_INLINE) +_ACRTIMP float __cdecl frexpf(float, int*); +#else +static inline float frexpf(float x, int *y) { return frexp(x, y); } +#endif + #if (!defined(__i386__) && !defined(__x86_64__) && (_MSVCR_VER == 0 || _MSVCR_VER >= 110)) || defined(_NO_CRT_MATH_INLINE) _ACRTIMP float __cdecl fabsf(float); #else

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.IGraphicsCaptureSession2 definition.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 9954c6b7fbc256e4905edbdce6e8227ac1468b1a URL: https://gitlab.winehq.org/wine/wine/-/commit/9954c6b7fbc256e4905edbdce6e822… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add Windows.Graphics.Capture.IGraphicsCaptureSession2 definition. --- include/windows.graphics.capture.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl index f89f91afc42..f0ebd0cab9b 100644 --- a/include/windows.graphics.capture.idl +++ b/include/windows.graphics.capture.idl @@ -51,6 +51,17 @@ namespace Windows.Graphics.Capture { HRESULT StartCapture(); } + [ + contract(Windows.Foundation.UniversalApiContract, 10.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(2c39ae40-7d2e-5044-804e-8b6799d4cf9e) + ] + interface IGraphicsCaptureSession2 : IInspectable + { + [propget] HRESULT IsCursorCaptureEnabled([out, retval] boolean *value); + [propput] HRESULT IsCursorCaptureEnabled([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession),

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.IGraphicsCaptureSession3 definition.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 0525a996a4a17c13ce979950afe6825986960b36 URL: https://gitlab.winehq.org/wine/wine/-/commit/0525a996a4a17c13ce979950afe682… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add Windows.Graphics.Capture.IGraphicsCaptureSession3 definition. --- include/windows.graphics.capture.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl index f0ebd0cab9b..ad8ff3c9134 100644 --- a/include/windows.graphics.capture.idl +++ b/include/windows.graphics.capture.idl @@ -62,6 +62,17 @@ namespace Windows.Graphics.Capture { [propput] HRESULT IsCursorCaptureEnabled([in] boolean value); } + [ + contract(Windows.Foundation.UniversalApiContract, 12.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), + uuid(f2cdd966-22ae-5ea1-9596-3a289344c3be) + ] + interface IGraphicsCaptureSession3 : IInspectable + { + [propget] HRESULT IsBorderRequired([out, retval] boolean *value); + [propput] HRESULT IsBorderRequired([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession),

1 0

Biswapriyo Nath : include: Add windows.graphics.idl file.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 657cc2a9f66fad78e121a43c1b1e482a98fb5eef URL: https://gitlab.winehq.org/wine/wine/-/commit/657cc2a9f66fad78e121a43c1b1e48… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add windows.graphics.idl file. --- include/Makefile.in | 1 + include/windows.graphics.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 81ff6cfa634..6b66918d564 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -849,6 +849,7 @@ SOURCES = \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ windows.graphics.holographic.idl \ + windows.graphics.idl \ windows.graphics.imaging.idl \ windows.h \ windows.management.deployment.idl \ diff --git a/include/windows.graphics.idl b/include/windows.graphics.idl new file mode 100644 index 00000000000..48c68014a76 --- /dev/null +++ b/include/windows.graphics.idl @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2024 Biswapriyo Nath + * + * 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 "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Graphics { + typedef struct DisplayAdapterId DisplayAdapterId; + typedef struct DisplayId DisplayId; + typedef struct PointInt32 PointInt32; + typedef struct RectInt32 RectInt32; + typedef struct SizeInt32 SizeInt32; + + interface IGeometrySource2D; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.RectInt32>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.RectInt32>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.RectInt32>; + interface Windows.Foundation.IReference<Windows.Graphics.SizeInt32>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0) + ] + struct DisplayAdapterId + { + UINT32 LowPart; + INT32 HighPart; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 12.0) + ] + struct DisplayId + { + UINT64 Value; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0) + ] + struct PointInt32 + { + INT32 X; + INT32 Y; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0) + ] + struct RectInt32 + { + INT32 X; + INT32 Y; + INT32 Width; + INT32 Height; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0) + ] + struct SizeInt32 + { + INT32 Width; + INT32 Height; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + uuid(caff7902-670c-4181-a624-da977203b845) + ] + interface IGeometrySource2D : IInspectable + { + } +}

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.GraphicsCaptureItem runtimeclass.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 68b62ecdc9fdee86cc74a874531b3d8d998b1db7 URL: https://gitlab.winehq.org/wine/wine/-/commit/68b62ecdc9fdee86cc74a874531b3d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add Windows.Graphics.Capture.GraphicsCaptureItem runtimeclass. --- include/windows.graphics.capture.idl | 68 ++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl index ad8ff3c9134..a5ccd952ca5 100644 --- a/include/windows.graphics.capture.idl +++ b/include/windows.graphics.capture.idl @@ -25,22 +25,74 @@ import "asyncinfo.idl"; import "eventtoken.idl"; import "windowscontracts.idl"; import "windows.foundation.idl"; -/* import "windows.graphics.idl"; */ +import "windows.graphics.idl"; import "windows.graphics.directx.idl"; import "windows.graphics.directx.direct3d11.idl"; /* import "windows.security.authorization.appcapabilityaccess.idl"; */ import "windows.system.idl"; import "windows.ui.idl"; -/* import "windows.ui.composition.idl"; */ +import "windows.ui.composition.idl"; namespace Windows.Graphics.Capture { + interface IGraphicsCaptureItem; + interface IGraphicsCaptureItemStatics; + interface IGraphicsCaptureItemStatics2; interface IGraphicsCaptureSession; interface IGraphicsCaptureSession2; interface IGraphicsCaptureSession3; interface IGraphicsCaptureSessionStatics; + runtimeclass GraphicsCaptureItem; runtimeclass GraphicsCaptureSession; + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Capture.GraphicsCaptureItem *>; + interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Capture.GraphicsCaptureItem *>; + interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.GraphicsCaptureItem *, IInspectable *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureItem), + uuid(79c3f95b-31f7-4ec2-a464-632ef5d30760) + ] + interface IGraphicsCaptureItem : IInspectable + { + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT Size([out, retval] Windows.Graphics.SizeInt32 *value); + [eventadd] HRESULT Closed( + [in] Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.GraphicsCaptureItem *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT Closed([in] EventRegistrationToken token); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureItem), + uuid(a87ebea5-457c-5788-ab47-0cf1d3637e74) + ] + interface IGraphicsCaptureItemStatics : IInspectable + { + HRESULT CreateFromVisual( + [in] Windows.UI.Composition.Visual *visual, + [out, retval] Windows.Graphics.Capture.GraphicsCaptureItem **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 12.0), + exclusiveto(Windows.Graphics.Capture.GraphicsCaptureItem), + uuid(3b92acc9-e584-5862-bf5c-9c316c6d2dbb) + ] + interface IGraphicsCaptureItemStatics2 : IInspectable + { + HRESULT TryCreateFromWindowId( + [in] Windows.UI.WindowId window_id, + [out, retval] Windows.Graphics.Capture.GraphicsCaptureItem **result); + HRESULT TryCreateFromDisplayId( + [in] Windows.Graphics.DisplayId display_id, + [out, retval] Windows.Graphics.Capture.GraphicsCaptureItem **result); + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), exclusiveto(Windows.Graphics.Capture.GraphicsCaptureSession), @@ -83,6 +135,18 @@ namespace Windows.Graphics.Capture { HRESULT IsSupported([out, retval] boolean *result); } + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + marshaling_behavior(agile), + static(Windows.Graphics.Capture.IGraphicsCaptureItemStatics, Windows.Foundation.UniversalApiContract, 7.0), + static(Windows.Graphics.Capture.IGraphicsCaptureItemStatics2, Windows.Foundation.UniversalApiContract, 12.0), + threading(both) + ] + runtimeclass GraphicsCaptureItem + { + [default] interface Windows.Graphics.Capture.IGraphicsCaptureItem; + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), marshaling_behavior(agile),

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.Direct3D11CaptureFrame runtimeclass.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: ffe88e3b0d0dc1e4093e315a34988331dd211e32 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffe88e3b0d0dc1e4093e315a349883… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add Windows.Graphics.Capture.Direct3D11CaptureFrame runtimeclass. --- include/windows.graphics.capture.idl | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl index a5ccd952ca5..d102dff8fb0 100644 --- a/include/windows.graphics.capture.idl +++ b/include/windows.graphics.capture.idl @@ -34,6 +34,10 @@ import "windows.ui.idl"; import "windows.ui.composition.idl"; namespace Windows.Graphics.Capture { + typedef enum GraphicsCaptureDirtyRegionMode GraphicsCaptureDirtyRegionMode; + + interface IDirect3D11CaptureFrame; + interface IDirect3D11CaptureFrame2; interface IGraphicsCaptureItem; interface IGraphicsCaptureItemStatics; interface IGraphicsCaptureItemStatics2; @@ -42,6 +46,7 @@ namespace Windows.Graphics.Capture { interface IGraphicsCaptureSession3; interface IGraphicsCaptureSessionStatics; + runtimeclass Direct3D11CaptureFrame; runtimeclass GraphicsCaptureItem; runtimeclass GraphicsCaptureSession; @@ -51,6 +56,38 @@ namespace Windows.Graphics.Capture { interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.GraphicsCaptureItem *, IInspectable *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 19.0) + ] + enum GraphicsCaptureDirtyRegionMode + { + ReportOnly = 0, + ReportAndRender = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.Direct3D11CaptureFrame), + uuid(fa50c623-38da-4b32-acf3-fa9734ad800e) + ] + interface IDirect3D11CaptureFrame : IInspectable + { + [propget] HRESULT Surface([out, retval] Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface **value); + [propget] HRESULT SystemRelativeTime([out, retval] Windows.Foundation.TimeSpan *value); + [propget] HRESULT ContentSize([out, retval] Windows.Graphics.SizeInt32 *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 19.0), + exclusiveto(Windows.Graphics.Capture.Direct3D11CaptureFrame), + uuid(37869cfa-2b48-5ebf-9afb-dffd805defdb) + ] + interface IDirect3D11CaptureFrame2 : IInspectable + { + [propget] HRESULT DirtyRegions([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Graphics.RectInt32> **value); + [propget] HRESULT DirtyRegionMode([out, retval] Windows.Graphics.Capture.GraphicsCaptureDirtyRegionMode *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), exclusiveto(Windows.Graphics.Capture.GraphicsCaptureItem), @@ -135,6 +172,17 @@ namespace Windows.Graphics.Capture { HRESULT IsSupported([out, retval] boolean *result); } + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + marshaling_behavior(agile) + ] + runtimeclass Direct3D11CaptureFrame + { + [default] interface Windows.Graphics.Capture.IDirect3D11CaptureFrame; + [contract(Windows.Foundation.UniversalApiContract, 19.0)] interface Windows.Graphics.Capture.IDirect3D11CaptureFrame2; + interface Windows.Foundation.IClosable; + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), marshaling_behavior(agile),

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.Direct3D11CaptureFramePool runtimeclass.
by Alexandre Julliard 21 Jun '24

21 Jun '24

Module: wine Branch: master Commit: 4792d3dd2dc229795e75f797f490a5786cf54e62 URL: https://gitlab.winehq.org/wine/wine/-/commit/4792d3dd2dc229795e75f797f490a5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 20 13:16:43 2024 +0000 include: Add Windows.Graphics.Capture.Direct3D11CaptureFramePool runtimeclass. --- include/windows.graphics.capture.idl | 71 ++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/include/windows.graphics.capture.idl b/include/windows.graphics.capture.idl index d102dff8fb0..fc1c852908b 100644 --- a/include/windows.graphics.capture.idl +++ b/include/windows.graphics.capture.idl @@ -38,6 +38,9 @@ namespace Windows.Graphics.Capture { interface IDirect3D11CaptureFrame; interface IDirect3D11CaptureFrame2; + interface IDirect3D11CaptureFramePool; + interface IDirect3D11CaptureFramePoolStatics; + interface IDirect3D11CaptureFramePoolStatics2; interface IGraphicsCaptureItem; interface IGraphicsCaptureItemStatics; interface IGraphicsCaptureItemStatics2; @@ -47,12 +50,14 @@ namespace Windows.Graphics.Capture { interface IGraphicsCaptureSessionStatics; runtimeclass Direct3D11CaptureFrame; + runtimeclass Direct3D11CaptureFramePool; runtimeclass GraphicsCaptureItem; runtimeclass GraphicsCaptureSession; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Capture.GraphicsCaptureItem *>; interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Capture.GraphicsCaptureItem *>; + interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.Direct3D11CaptureFramePool *, IInspectable *>; interface Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.GraphicsCaptureItem *, IInspectable *>; } @@ -88,6 +93,59 @@ namespace Windows.Graphics.Capture { [propget] HRESULT DirtyRegionMode([out, retval] Windows.Graphics.Capture.GraphicsCaptureDirtyRegionMode *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.Direct3D11CaptureFramePool), + uuid(24eb6d22-1975-422e-82e7-780dbd8ddf24) + ] + interface IDirect3D11CaptureFramePool : IInspectable + { + HRESULT Recreate( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DDevice *device, + [in] Windows.Graphics.DirectX.DirectXPixelFormat pixel_format, + [in] INT32 number_of_buffers, [in] Windows.Graphics.SizeInt32 size); + HRESULT TryGetNextFrame( + [out, retval] Windows.Graphics.Capture.Direct3D11CaptureFrame **result); + [eventadd] HRESULT FrameArrived( + [in] Windows.Foundation.TypedEventHandler<Windows.Graphics.Capture.Direct3D11CaptureFramePool *, IInspectable *> *handler, + [out, retval] EventRegistrationToken* token); + [eventremove] HRESULT FrameArrived([in] EventRegistrationToken token); + HRESULT CreateCaptureSession( + [in] Windows.Graphics.Capture.GraphicsCaptureItem *item, + [out, retval] Windows.Graphics.Capture.GraphicsCaptureSession **result); + [propget] HRESULT DispatcherQueue([out, retval] Windows.System.DispatcherQueue **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Graphics.Capture.Direct3D11CaptureFramePool), + uuid(7784056a-67aa-4d53-ae54-1088d5a8ca21) + ] + interface IDirect3D11CaptureFramePoolStatics : IInspectable + { + HRESULT Create( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DDevice *device, + [in] Windows.Graphics.DirectX.DirectXPixelFormat pixel_format, + [in] INT32 number_of_buffers, + [in] Windows.Graphics.SizeInt32 size, + [out, retval] Windows.Graphics.Capture.Direct3D11CaptureFramePool **result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 7.0), + exclusiveto(Windows.Graphics.Capture.Direct3D11CaptureFramePool), + uuid(589b103f-6bbc-5df5-a991-02e28b3b66d5) + ] + interface IDirect3D11CaptureFramePoolStatics2 : IInspectable + { + HRESULT CreateFreeThreaded( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DDevice *device, + [in] Windows.Graphics.DirectX.DirectXPixelFormat pixel_format, + [in] INT32 number_of_buffers, + [in] Windows.Graphics.SizeInt32 size, + [out, retval] Windows.Graphics.Capture.Direct3D11CaptureFramePool **result); + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), exclusiveto(Windows.Graphics.Capture.GraphicsCaptureItem), @@ -183,6 +241,19 @@ namespace Windows.Graphics.Capture { interface Windows.Foundation.IClosable; } + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + marshaling_behavior(agile), + static(Windows.Graphics.Capture.IDirect3D11CaptureFramePoolStatics, Windows.Foundation.UniversalApiContract, 6.0), + static(Windows.Graphics.Capture.IDirect3D11CaptureFramePoolStatics2, Windows.Foundation.UniversalApiContract, 7.0), + threading(both) + ] + runtimeclass Direct3D11CaptureFramePool + { + [default] interface Windows.Graphics.Capture.IDirect3D11CaptureFramePool; + interface Windows.Foundation.IClosable; + } + [ contract(Windows.Foundation.UniversalApiContract, 6.0), marshaling_behavior(agile),

1 0

Rémi Bernon : server: Allocate shared session object for desktops.
by Alexandre Julliard 20 Jun '24

20 Jun '24

Module: wine Branch: master Commit: 1e10e3a1c02b1d39b12b6e81e7719e223482f3a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e10e3a1c02b1d39b12b6e81e7719e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 7 09:52:18 2024 +0200 server: Allocate shared session object for desktops. --- include/wine/server_protocol.h | 9 +++- server/file.h | 3 ++ server/mapping.c | 106 +++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 7 ++- server/user.h | 1 + server/winstation.c | 7 +++ 6 files changed, 130 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0b5aca33c69..b75b88b956d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -883,9 +883,14 @@ struct directory_entry -typedef volatile union +typedef volatile struct { char placeholder; +} desktop_shm_t; + +typedef volatile union +{ + desktop_shm_t desktop; } object_shm_t; typedef volatile struct @@ -6547,7 +6552,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 809 +#define SERVER_PROTOCOL_VERSION 810 /* ### protocol_version end ### */ diff --git a/server/file.h b/server/file.h index 661e8f9d159..abfc2f0a2ce 100644 --- a/server/file.h +++ b/server/file.h @@ -192,6 +192,9 @@ extern struct mapping *create_session_mapping( struct object *root, const struct unsigned int attr, const struct security_descriptor *sd ); extern void set_session_mapping( struct mapping *mapping ); +extern const volatile void *alloc_shared_object(void); +extern void free_shared_object( const volatile void *object_shm ); + #define SHARED_WRITE_BEGIN( object_shm, type ) \ do { \ const type *__shared = (object_shm); \ diff --git a/server/mapping.c b/server/mapping.c index 6605c111beb..f77de343f4f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -229,17 +229,30 @@ struct session_block { struct list entry; /* entry in the session block list */ const char *data; /* base pointer for the mmaped data */ + mem_size_t offset; /* offset of data in the session shared mapping */ + mem_size_t used_size; /* used size for previously allocated objects */ + mem_size_t block_size; /* total size of the block */ +}; + +struct session_object +{ + struct list entry; /* entry in the session free object list */ + mem_size_t offset; /* offset of obj in the session shared mapping */ + shared_object_t obj; /* object actually shared with the client */ }; struct session { struct list blocks; + struct list free_objects; + object_id_t last_object_id; }; static struct mapping *session_mapping; static struct session session = { .blocks = LIST_INIT(session.blocks), + .free_objects = LIST_INIT(session.free_objects), }; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) @@ -1297,10 +1310,103 @@ void set_session_mapping( struct mapping *mapping ) } block->data = tmp; + block->offset = 0; + block->used_size = 0; + block->block_size = size; + session_mapping = mapping; list_add_tail( &session.blocks, &block->entry ); } +static struct session_block *grow_session_mapping( mem_size_t needed ) +{ + mem_size_t old_size = session_mapping->size, new_size; + struct session_block *block; + int unix_fd; + void *tmp; + + new_size = max( old_size * 3 / 2, old_size + max( needed, 0x10000 ) ); + new_size = (new_size + page_mask) & ~((mem_size_t)page_mask); + assert( new_size > old_size ); + + unix_fd = get_unix_fd( session_mapping->fd ); + if (!grow_file( unix_fd, new_size )) return NULL; + + if (!(block = mem_alloc( sizeof(*block) ))) return NULL; + if ((tmp = mmap( NULL, new_size - old_size, PROT_READ | PROT_WRITE, MAP_SHARED, unix_fd, old_size )) == MAP_FAILED) + { + file_set_error(); + free( block ); + return NULL; + } + + block->data = tmp; + block->offset = old_size; + block->used_size = 0; + block->block_size = new_size - old_size; + + session_mapping->size = new_size; + list_add_tail( &session.blocks, &block->entry ); + + return block; +} + +static struct session_block *find_free_session_block( mem_size_t size ) +{ + struct session_block *block; + + LIST_FOR_EACH_ENTRY( block, &session.blocks, struct session_block, entry ) + if (size < block->block_size && block->used_size < block->block_size - size) return block; + + return grow_session_mapping( size ); +} + +const volatile void *alloc_shared_object(void) +{ + struct session_object *object; + struct list *ptr; + + if ((ptr = list_head( &session.free_objects ))) + { + object = CONTAINING_RECORD( ptr, struct session_object, entry ); + list_remove( &object->entry ); + } + else + { + mem_size_t size = sizeof(*object); + struct session_block *block; + + if (!(block = find_free_session_block( size ))) return NULL; + object = (struct session_object *)(block->data + block->used_size); + object->offset = (char *)&object->obj - block->data; + block->used_size += size; + } + + SHARED_WRITE_BEGIN( &object->obj.shm, object_shm_t ) + { + /* mark the object data as uninitialized */ + mark_block_uninitialized( (void *)shared, sizeof(*shared) ); + CONTAINING_RECORD( shared, shared_object_t, shm )->id = ++session.last_object_id; + } + SHARED_WRITE_END; + + return &object->obj.shm; +} + +void free_shared_object( const volatile void *object_shm ) +{ + struct session_object *object = CONTAINING_RECORD( object_shm, struct session_object, obj.shm ); + + SHARED_WRITE_BEGIN( &object->obj.shm, object_shm_t ) + { + mark_block_noaccess( (void *)shared, sizeof(*shared) ); + CONTAINING_RECORD( shared, shared_object_t, shm )->id = 0; + } + SHARED_WRITE_END; + + list_add_tail( &session.free_objects, &object->entry ); +} + struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) { diff --git a/server/protocol.def b/server/protocol.def index aad95db1195..de763210ac9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -899,9 +899,14 @@ struct directory_entry /****************************************************************/ /* shared session mapping structures */ -typedef volatile union +typedef volatile struct { char placeholder; +} desktop_shm_t; + +typedef volatile union +{ + desktop_shm_t desktop; } object_shm_t; typedef volatile struct diff --git a/server/user.h b/server/user.h index 8ff837a34bf..cb68e4fc314 100644 --- a/server/user.h +++ b/server/user.h @@ -93,6 +93,7 @@ struct desktop struct global_cursor cursor; /* global cursor information */ unsigned char keystate[256]; /* asynchronous key state */ struct key_repeat key_repeat; /* key auto-repeat */ + const desktop_shm_t *shared; /* desktop session shared memory */ }; /* user handles functions */ diff --git a/server/winstation.c b/server/winstation.c index 66fb6ad1e35..270720437b0 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -298,6 +298,12 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); list_init( &desktop->pointers ); + + if (!(desktop->shared = alloc_shared_object())) + { + release_object( desktop ); + return NULL; + } } else { @@ -368,6 +374,7 @@ static void desktop_destroy( struct object *obj ) if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); if (desktop->key_repeat.timeout) remove_timeout_user( desktop->key_repeat.timeout ); release_object( desktop->winstation ); + if (desktop->shared) free_shared_object( desktop->shared ); } /* retrieve the thread desktop, checking the handle access rights */

1 0