- Wine-Commits - list.winehq.org

Rémi Bernon : include: Define frexpf as inline function in more cases.
by Alexandre Julliard June 21, 2024

June 21, 2024

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

Arkadiusz Hiler : bcp47langs: Add stub dll.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 2030973a3f23a84468f06c1c2d856a7cb4710adb URL: https://gitlab.winehq.org/wine/wine/-/commit/2030973a3f23a84468f06c1c2d856a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 23 14:02:20 2024 +0300 bcp47langs: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/bcp47langs/Makefile.in | 2 ++ dlls/bcp47langs/bcp47langs.spec | 71 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/configure b/configure index a939cb640ca..4a60f6a048a 100755 --- a/configure +++ b/configure @@ -1006,6 +1006,7 @@ enable_authz enable_avicap32 enable_avifil32 enable_avrt +enable_bcp47langs enable_bcrypt enable_bcryptprimitives enable_bluetoothapis @@ -21952,6 +21953,7 @@ wine_fn_config_makefile dlls/avifil32 enable_avifil32 wine_fn_config_makefile dlls/avifil32/tests enable_tests wine_fn_config_makefile dlls/avifile.dll16 enable_win16 wine_fn_config_makefile dlls/avrt enable_avrt +wine_fn_config_makefile dlls/bcp47langs enable_bcp47langs wine_fn_config_makefile dlls/bcrypt enable_bcrypt wine_fn_config_makefile dlls/bcrypt/tests enable_tests wine_fn_config_makefile dlls/bcryptprimitives enable_bcryptprimitives diff --git a/configure.ac b/configure.ac index 4d958d18193..0870961c041 100644 --- a/configure.ac +++ b/configure.ac @@ -2459,6 +2459,7 @@ WINE_CONFIG_MAKEFILE(dlls/avifil32) WINE_CONFIG_MAKEFILE(dlls/avifil32/tests) WINE_CONFIG_MAKEFILE(dlls/avifile.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/avrt) +WINE_CONFIG_MAKEFILE(dlls/bcp47langs) WINE_CONFIG_MAKEFILE(dlls/bcrypt) WINE_CONFIG_MAKEFILE(dlls/bcrypt/tests) WINE_CONFIG_MAKEFILE(dlls/bcryptprimitives) diff --git a/dlls/bcp47langs/Makefile.in b/dlls/bcp47langs/Makefile.in new file mode 100644 index 00000000000..5eb4caaf0e7 --- /dev/null +++ b/dlls/bcp47langs/Makefile.in @@ -0,0 +1,2 @@ +MODULE = bcp47langs.dll +IMPORTLIB = bcp47langs diff --git a/dlls/bcp47langs/bcp47langs.spec b/dlls/bcp47langs/bcp47langs.spec new file mode 100644 index 00000000000..a054c1486a9 --- /dev/null +++ b/dlls/bcp47langs/bcp47langs.spec @@ -0,0 +1,71 @@ +1 stub GetUnIsoRegionCode +@ stub AppendUserLanguageInputMethods +@ stub AppendUserLanguageInternal +@ stub AppendUserLanguages +@ stub Bcp47BufferFromLcid +@ stub Bcp47FindClosestLanguage +@ stub Bcp47FromCompactTagInternal +@ stub Bcp47FromHkl +@ stub Bcp47FromLcid +@ stub Bcp47GetAbbreviation +@ stub Bcp47GetDirectionality +@ stub Bcp47GetDistance +@ stub Bcp47GetExtensionSingletons +@ stub Bcp47GetExtensionSubstring +@ stub Bcp47GetIsoLanguageCode +@ stub Bcp47GetIsoScriptCode +@ stub Bcp47GetLanguageName +@ stub Bcp47GetMuiForm +@ stub Bcp47GetNeutralForm +@ stub Bcp47GetNlsForm +@ stub Bcp47GetSubtagMapInternal +@ stub Bcp47GetUnIsoRegionCode +@ stub Bcp47IsWellFormed +@ stub Bcp47Normalize +@ stub ClearApplicationLanguageOverride +@ stub ClearApplicationManifestLanguages +@ stub ClearHttpAcceptLanguageOptOut +@ stub ClearUserDisplayLanguageOverride +@ stub ClearUserLocaleFromLanguageProfileOptOut +@ stub CompactTagFromBcp47Internal +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub GetApplicationLanguageOverride +@ stub GetApplicationLanguages +@ stub GetApplicationManifestLanguages +@ stub GetAppropriateUserLocaleForUserLanguages +@ stub GetAppropriateUserPreferredAndDisplayLanguagesForUser +@ stub GetClosestMatchingUserLanguage +@ stub GetDisplayLanguagesForAllUsers +@ stub GetFontFallbackLanguageList +@ stub GetHttpAcceptLanguageOptOut +@ stub GetInputMethodOverrideForUser +@ stub GetPendingUserDisplayLanguage +@ stub GetRelevantLocalesFromLanguageTags +@ stub GetSerializedUserLanguageProfile +@ stub GetSerializedUserLanguagesForUser +@ stub GetStartingUserDisplayLanguage +@ stub GetUserDisplayLanguageOverride +@ stub GetUserLanguageInputMethods +@ stub GetUserLanguageInputMethodsForUser +@ stub GetUserLanguages +@ stub GetUserLanguagesForAllUsers +@ stub GetUserLanguagesForUser +@ stub GetUserLocaleFromLanguageProfileOptOut +@ stub IsTransientLcid +@ stub LanguageListAsMuiForm +@ stub LcidFromBcp47 +@ stub RemoveInputsForAllLanguagesInternal +@ stub RemoveUserLanguageInputMethods +@ stub ResolveLanguages +@ stub SetApplicationLanguageOverride +@ stub SetApplicationManifestLanguages +@ stub SetHttpAcceptLanguageOptOut +@ stub SetInputMethodOverride +@ stub SetPreviousUserDisplayLanguages +@ stub SetStartingUserDisplayLanguage +@ stub SetUserDisplayLanguageOverride +@ stub SetUserLanguageInputMethods +@ stub SetUserLanguagesInternal +@ stub SetUserLanguagesInternalCore +@ stub SetUserLocaleFromLanguageProfileOptOut

1 0

Zhiyi Zhang : profapi: Add stub dll.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 28040129930f2d2f717bdb3718365bc1ebf67822 URL: https://gitlab.winehq.org/wine/wine/-/commit/28040129930f2d2f717bdb3718365b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 9 11:02:48 2024 +0800 profapi: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/profapi/Makefile.in | 2 ++ dlls/profapi/profapi.spec | 17 +++++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/configure b/configure index 5a8debc5629..a939cb640ca 100755 --- a/configure +++ b/configure @@ -1369,6 +1369,7 @@ enable_pidgen enable_powrprof enable_printui enable_prntvpt +enable_profapi enable_propsys enable_psapi enable_pstorec @@ -22517,6 +22518,7 @@ wine_fn_config_makefile dlls/powrprof enable_powrprof wine_fn_config_makefile dlls/printui enable_printui wine_fn_config_makefile dlls/prntvpt enable_prntvpt wine_fn_config_makefile dlls/prntvpt/tests enable_tests +wine_fn_config_makefile dlls/profapi enable_profapi wine_fn_config_makefile dlls/propsys enable_propsys wine_fn_config_makefile dlls/propsys/tests enable_tests wine_fn_config_makefile dlls/psapi enable_psapi diff --git a/configure.ac b/configure.ac index 231ec7f17d6..4d958d18193 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,6 +3025,7 @@ WINE_CONFIG_MAKEFILE(dlls/powrprof) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) WINE_CONFIG_MAKEFILE(dlls/prntvpt/tests) +WINE_CONFIG_MAKEFILE(dlls/profapi) WINE_CONFIG_MAKEFILE(dlls/propsys) WINE_CONFIG_MAKEFILE(dlls/propsys/tests) WINE_CONFIG_MAKEFILE(dlls/psapi) diff --git a/dlls/profapi/Makefile.in b/dlls/profapi/Makefile.in new file mode 100644 index 00000000000..83c679227d0 --- /dev/null +++ b/dlls/profapi/Makefile.in @@ -0,0 +1,2 @@ +MODULE = profapi.dll +IMPORTLIB = profapi diff --git a/dlls/profapi/profapi.spec b/dlls/profapi/profapi.spec new file mode 100644 index 00000000000..529aaac2ff8 --- /dev/null +++ b/dlls/profapi/profapi.spec @@ -0,0 +1,17 @@ +101 stub -noname @ +102 stub -noname @ +103 stub -noname @ +104 stub -noname @ +105 stub -noname @ +106 stub -noname @ +107 stub -noname @ +108 stub -noname @ +109 stub -noname @ +110 stub -noname @ +111 stub -noname @ +112 stub -noname @ +113 stub -noname @ +114 stub -noname @ +115 stub -noname @ +116 stub -noname @ +117 stub -noname @

1 0

Arkadiusz Hiler : apisetschema: Add api-ms-win-appmodel-runtime-internal-l1-1-1.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 5a903c0f1ac9f4d209c038f93c341c6ee9d7a987 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a903c0f1ac9f4d209c038f93c341c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 23 14:11:32 2024 +0300 apisetschema: Add api-ms-win-appmodel-runtime-internal-l1-1-1. --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index c7da8a6a806..c46918b6fa8 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -1,3 +1,4 @@ +apiset api-ms-win-appmodel-runtime-internal-l1-1-1 = kernelbase.dll apiset api-ms-win-appmodel-runtime-l1-1-2 = kernelbase.dll apiset api-ms-win-base-bootconfig-l1-1-0 = advapi32.dll apiset api-ms-win-base-util-l1-1-0 = advapi32.dll

1 0

Biswapriyo Nath : include: Add Windows.Graphics.Capture.Direct3D11CaptureFramePool runtimeclass.
by Alexandre Julliard June 21, 2024

June 21, 2024

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

Biswapriyo Nath : include: Add Windows.Graphics.Capture.Direct3D11CaptureFrame runtimeclass.
by Alexandre Julliard June 21, 2024

June 21, 2024

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.GraphicsCaptureItem runtimeclass.
by Alexandre Julliard June 21, 2024

June 21, 2024

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.idl file.
by Alexandre Julliard June 21, 2024

June 21, 2024

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.IGraphicsCaptureSession3 definition.
by Alexandre Julliard June 21, 2024

June 21, 2024

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.Capture.IGraphicsCaptureSession2 definition.
by Alexandre Julliard June 21, 2024

June 21, 2024

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