February 2024 - Wine-Commits

Alex Henrie : wined3d: Use CRT allocation functions.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 340a4b05b50fce02215213c21993fdf793e9d519 URL: https://gitlab.winehq.org/wine/wine/-/commit/340a4b05b50fce02215213c21993fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 18:40:27 2024 -0700 wined3d: Use CRT allocation functions. --- dlls/wined3d/adapter_gl.c | 66 ++++++++--------- dlls/wined3d/adapter_vk.c | 84 +++++++++++----------- dlls/wined3d/arb_program_shader.c | 104 +++++++++++++-------------- dlls/wined3d/ati_fragment_shader.c | 12 ++-- dlls/wined3d/buffer.c | 32 ++++----- dlls/wined3d/context_gl.c | 30 ++++---- dlls/wined3d/context_vk.c | 58 +++++++-------- dlls/wined3d/cs.c | 60 ++++++++-------- dlls/wined3d/device.c | 42 +++++------ dlls/wined3d/directx.c | 68 +++++++++--------- dlls/wined3d/ffp_gl.c | 6 +- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++------------------- dlls/wined3d/palette.c | 6 +- dlls/wined3d/query.c | 38 +++++----- dlls/wined3d/resource.c | 4 +- dlls/wined3d/shader.c | 108 ++++++++++++++-------------- dlls/wined3d/shader_sm1.c | 6 +- dlls/wined3d/shader_sm4.c | 14 ++-- dlls/wined3d/shader_spirv.c | 22 +++--- dlls/wined3d/stateblock.c | 18 ++--- dlls/wined3d/surface.c | 12 ++-- dlls/wined3d/swapchain.c | 48 ++++++------- dlls/wined3d/texture.c | 64 ++++++++--------- dlls/wined3d/utils.c | 21 +++--- dlls/wined3d/vertexdeclaration.c | 18 ++--- dlls/wined3d/wined3d_main.c | 14 ++-- dlls/wined3d/wined3d_private.h | 3 +- 27 files changed, 548 insertions(+), 554 deletions(-)

1 0

Biswapriyo Nath : include: Add DetectedFace runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: f0ab43fea2790810b017d0814a398ebdd706b98b URL: https://gitlab.winehq.org/wine/wine/-/commit/f0ab43fea2790810b017d0814a398e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add DetectedFace runtimeclass in windows.media.faceanalysis.idl. --- include/windows.graphics.imaging.idl | 11 ++++++ include/windows.media.faceanalysis.idl | 64 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 6c78663a473..4ca51490dcd 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -32,6 +32,7 @@ namespace Windows.Graphics.Imaging { typedef enum BitmapAlphaMode BitmapAlphaMode; typedef enum BitmapBufferAccessMode BitmapBufferAccessMode; typedef enum BitmapPixelFormat BitmapPixelFormat; + typedef struct BitmapBounds BitmapBounds; typedef struct BitmapPlaneDescription BitmapPlaneDescription; interface IBitmapBuffer; @@ -50,6 +51,7 @@ namespace Windows.Graphics.Imaging { interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat>; interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.IReference<Windows.Graphics.Imaging.BitmapBounds>; } [contract(Windows.Foundation.UniversalApiContract, 1.0)] @@ -87,6 +89,15 @@ namespace Windows.Graphics.Imaging { Yuy2 = 107, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapBounds + { + UINT32 X; + UINT32 Y; + UINT32 Width; + UINT32 Height; + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct BitmapPlaneDescription { diff --git a/include/windows.media.faceanalysis.idl b/include/windows.media.faceanalysis.idl new file mode 100644 index 00000000000..de5cf136ab9 --- /dev/null +++ b/include/windows.media.faceanalysis.idl @@ -0,0 +1,64 @@ +/* + * 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 "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.imaging.idl"; +import "windows.media.idl"; + +namespace Windows.Media.FaceAnalysis { + interface IDetectedFace; + + runtimeclass DetectedFace; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.DetectedFace), + uuid(8200d454-66bc-34df-9410-e89400195414) + ] + interface IDetectedFace : IInspectable + { + [propget] HRESULT FaceBox([out, retval] Windows.Graphics.Imaging.BitmapBounds *return_value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass DetectedFace + { + [default] interface Windows.Media.FaceAnalysis.IDetectedFace; + } +}

1 0

Biswapriyo Nath : include: Add SoftwareBitmap runtimeclass in windows.graphics.imaging.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: fbe99509d6ca79038cba651b9e255817fd0fbb76 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbe99509d6ca79038cba651b9e2558… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add SoftwareBitmap runtimeclass in windows.graphics.imaging.idl. --- include/windows.graphics.imaging.idl | 157 +++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 5c6a6c2ea60..6c78663a473 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -29,11 +29,63 @@ import "windows.graphics.directx.direct3d11.idl"; import "windows.storage.streams.idl"; namespace Windows.Graphics.Imaging { + typedef enum BitmapAlphaMode BitmapAlphaMode; + typedef enum BitmapBufferAccessMode BitmapBufferAccessMode; + typedef enum BitmapPixelFormat BitmapPixelFormat; typedef struct BitmapPlaneDescription BitmapPlaneDescription; interface IBitmapBuffer; + interface ISoftwareBitmap; + interface ISoftwareBitmapFactory; + interface ISoftwareBitmapStatics; runtimeclass BitmapBuffer; + runtimeclass SoftwareBitmap; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Imaging.SoftwareBitmap *>; + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapAlphaMode + { + Premultiplied = 0, + Straight = 1, + Ignore = 2, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapBufferAccessMode + { + Read = 0, + ReadWrite = 1, + Write = 2, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapPixelFormat + { + Unknown = 0, + Rgba16 = 12, + Rgba8 = 30, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Gray16 = 57, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Gray8 = 62, + Bgra8 = 87, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Nv12 = 103, + [contract(Windows.Foundation.UniversalApiContract, 6.0)] + P010 = 104, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Yuy2 = 107, + }; [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct BitmapPlaneDescription @@ -56,6 +108,98 @@ namespace Windows.Graphics.Imaging { HRESULT GetPlaneDescription([in] INT32 index, [out, retval] Windows.Graphics.Imaging.BitmapPlaneDescription *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(689e0708-7eef-483f-963f-da938818e073) + ] + interface ISoftwareBitmap : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT BitmapPixelFormat([out, retval] Windows.Graphics.Imaging.BitmapPixelFormat *value); + [propget] HRESULT BitmapAlphaMode([out, retval] Windows.Graphics.Imaging.BitmapAlphaMode *value); + [propget] HRESULT PixelWidth([out, retval] INT32 *value); + [propget] HRESULT PixelHeight([out, retval] INT32 *value); + [propget] HRESULT IsReadOnly([out, retval] boolean *value); + [propput] HRESULT DpiX([in] DOUBLE value); + [propget] HRESULT DpiX([out, retval] DOUBLE *value); + [propput] HRESULT DpiY([in] DOUBLE value); + [propget] HRESULT DpiY([out, retval] DOUBLE *value); + HRESULT LockBuffer([in] Windows.Graphics.Imaging.BitmapBufferAccessMode mode, + [out, retval] Windows.Graphics.Imaging.BitmapBuffer **value); + HRESULT CopyTo([in] Windows.Graphics.Imaging.SoftwareBitmap *bitmap); + HRESULT CopyFromBuffer([in] Windows.Storage.Streams.IBuffer *buffer); + HRESULT CopyToBuffer([in] Windows.Storage.Streams.IBuffer *buffer); + HRESULT GetReadOnlyView([out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(c99feb69-2d62-4d47-a6b3-4fdb6a07fdf8) + ] + interface ISoftwareBitmapFactory : IInspectable + { + HRESULT Create( + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + HRESULT CreateWithAlpha( + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(df0385db-672f-4a9d-806e-c2442f343e86) + ] + interface ISoftwareBitmapStatics : IInspectable + { + HRESULT Copy( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("Convert")] + HRESULT Convert( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("Convert")] + HRESULT ConvertWithAlpha( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromBuffer")] + HRESULT CreateCopyFromBuffer( + [in] Windows.Storage.Streams.IBuffer *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromBuffer")] + HRESULT CreateCopyWithAlphaFromBuffer( + [in] Windows.Storage.Streams.IBuffer *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromSurfaceAsync")] + HRESULT CreateCopyFromSurfaceAsync( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *surface, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *> **value); + [overload("CreateCopyFromSurfaceAsync")] + HRESULT CreateCopyWithAlphaFromSurfaceAsync( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *surface, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *> **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -67,4 +211,17 @@ namespace Windows.Graphics.Imaging { interface Windows.Foundation.IMemoryBuffer; interface Windows.Foundation.IClosable; } + + [ + activatable(Windows.Graphics.Imaging.ISoftwareBitmapFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Graphics.Imaging.ISoftwareBitmapStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass SoftwareBitmap + { + [default] interface Windows.Graphics.Imaging.ISoftwareBitmap; + interface Windows.Foundation.IClosable; + } }

1 0

Biswapriyo Nath : include: Add FaceDetector runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 6ec9f446eb8bed66fb368834d23660fac115de52 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec9f446eb8bed66fb368834d23660… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add FaceDetector runtimeclass in windows.media.faceanalysis.idl. --- include/windows.graphics.imaging.idl | 8 ++++++ include/windows.media.faceanalysis.idl | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 4ca51490dcd..5409481f043 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -34,6 +34,7 @@ namespace Windows.Graphics.Imaging { typedef enum BitmapPixelFormat BitmapPixelFormat; typedef struct BitmapBounds BitmapBounds; typedef struct BitmapPlaneDescription BitmapPlaneDescription; + typedef struct BitmapSize BitmapSize; interface IBitmapBuffer; interface ISoftwareBitmap; @@ -107,6 +108,13 @@ namespace Windows.Graphics.Imaging { INT32 Stride; }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapSize + { + UINT32 Width; + UINT32 Height; + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Graphics.Imaging.BitmapBuffer), diff --git a/include/windows.media.faceanalysis.idl b/include/windows.media.faceanalysis.idl index de5cf136ab9..595d36186b6 100644 --- a/include/windows.media.faceanalysis.idl +++ b/include/windows.media.faceanalysis.idl @@ -30,14 +30,19 @@ import "windows.media.idl"; namespace Windows.Media.FaceAnalysis { interface IDetectedFace; + interface IFaceDetector; + interface IFaceDetectorStatics; runtimeclass DetectedFace; + runtimeclass FaceDetector; declare { interface Windows.Foundation.Collections.IIterable<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IIterator<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.FaceAnalysis.FaceDetector *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.FaceAnalysis.FaceDetector *>; interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; } @@ -52,6 +57,41 @@ namespace Windows.Media.FaceAnalysis { [propget] HRESULT FaceBox([out, retval] Windows.Graphics.Imaging.BitmapBounds *return_value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.FaceDetector), + uuid(16b672dc-fe6f-3117-8d95-c3f04d51630c) + ] + interface IFaceDetector : IInspectable + { + [overload("DetectFacesAsync")] + HRESULT DetectFacesAsync( + [in] Windows.Graphics.Imaging.SoftwareBitmap *image, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *> **return_value); + [overload("DetectFacesAsync")] + HRESULT DetectFacesWithSearchAreaAsync( + [in] Windows.Graphics.Imaging.SoftwareBitmap *image, + [in] Windows.Graphics.Imaging.BitmapBounds search_area, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *> **return_value); + [propget] HRESULT MinDetectableFaceSize([out, retval] Windows.Graphics.Imaging.BitmapSize *return_value); + [propput] HRESULT MinDetectableFaceSize([in] Windows.Graphics.Imaging.BitmapSize value); + [propget] HRESULT MaxDetectableFaceSize([out, retval] Windows.Graphics.Imaging.BitmapSize *return_value); + [propput] HRESULT MaxDetectableFaceSize([in] Windows.Graphics.Imaging.BitmapSize value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.FaceDetector), + uuid(bc042d67-9047-33f6-881b-6746c1b218b8) + ] + interface IFaceDetectorStatics : IInspectable + { + HRESULT CreateAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Media.FaceAnalysis.FaceDetector *> **return_value); + HRESULT GetSupportedBitmapPixelFormats([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat> **result); + HRESULT IsBitmapPixelFormatSupported([in] Windows.Graphics.Imaging.BitmapPixelFormat bitmap_pixel_format, [out, retval] boolean *result); + [propget] HRESULT IsSupported([out, retval] boolean *return_value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -61,4 +101,15 @@ namespace Windows.Media.FaceAnalysis { { [default] interface Windows.Media.FaceAnalysis.IDetectedFace; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.FaceAnalysis.IFaceDetectorStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass FaceDetector + { + [default] interface Windows.Media.FaceAnalysis.IFaceDetector; + } }

1 0

Biswapriyo Nath : include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: af4838321e3a2d04ac134b35f6d12aef4b9552ff URL: https://gitlab.winehq.org/wine/wine/-/commit/af4838321e3a2d04ac134b35f6d12a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl. --- include/windows.graphics.imaging.idl | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl new file mode 100644 index 00000000000..5c6a6c2ea60 --- /dev/null +++ b/include/windows.graphics.imaging.idl @@ -0,0 +1,70 @@ +/* + * 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 "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.directx.direct3d11.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Graphics.Imaging { + typedef struct BitmapPlaneDescription BitmapPlaneDescription; + + interface IBitmapBuffer; + + runtimeclass BitmapBuffer; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapPlaneDescription + { + INT32 StartIndex; + INT32 Width; + INT32 Height; + INT32 Stride; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.BitmapBuffer), + uuid(a53e04c4-399c-438c-b28f-a63a6b83d1a1) + ] + interface IBitmapBuffer : IInspectable + requires Windows.Foundation.IMemoryBuffer, Windows.Foundation.IClosable + { + HRESULT GetPlaneCount([out, retval] INT32 *value); + HRESULT GetPlaneDescription([in] INT32 index, [out, retval] Windows.Graphics.Imaging.BitmapPlaneDescription *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass BitmapBuffer + { + [default] interface Windows.Graphics.Imaging.IBitmapBuffer; + interface Windows.Foundation.IMemoryBuffer; + interface Windows.Foundation.IClosable; + } +}

1 0

David Kahurani : msi: Avoid leaking stream on DB update.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 386dbe1059ba08485696760c267ef06dbed95bad URL: https://gitlab.winehq.org/wine/wine/-/commit/386dbe1059ba08485696760c267ef0… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Thu Jan 18 12:26:14 2024 +0300 msi: Avoid leaking stream on DB update. MSI_RecordGetIStream adds a reference to the stream. This reference should be negated as we are done setting the stream. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/msi/select.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index cfb17f60b62..975d2b8e066 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -269,6 +271,7 @@ UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) if (MSI_RecordGetIStream(rec, i + 1, &stream)) return ERROR_FUNCTION_FAILED; r = sv->table->ops->set_stream(sv->table, row, col, stream); + IStream_Release(stream); } else if (type & MSITYPE_STRING) {

1 0

Daniel Lehman : msvcrt: Use string sort for strcoll/wcscoll.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: fb5302c29b8185e5d09941d5b022344b221bb0ed URL: https://gitlab.winehq.org/wine/wine/-/commit/fb5302c29b8185e5d09941d5b02234… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 18 09:09:10 2024 -0800 msvcrt: Use string sort for strcoll/wcscoll. --- dlls/msvcrt/string.c | 3 ++- dlls/msvcrt/tests/string.c | 7 ++----- dlls/msvcrt/wcs.c | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e6323da3b01..7f7959e81e6 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1162,7 +1162,8 @@ int CDECL _strcoll_l( const char* str1, const char* str2, _locale_t locale ) if(!locinfo->lc_handle[LC_COLLATE]) return strcmp(str1, str2); - return CompareStringA(locinfo->lc_handle[LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, + str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 24902d96f27..23f4205e785 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4234,7 +4234,6 @@ static void test__tcscoll(void) const char *str1; const char *str2; int exp; - BOOL todo; }; static const struct test tests[] = { { "English", "ABCD", "ABCD", 0 }, @@ -4242,8 +4241,8 @@ static void test__tcscoll(void) { "English", "ABCD", "ABC", 1 }, { "English", "ABCe", "ABCf", -1 }, { "English", "abcd", "ABCD", -1 }, - { "English", "AB D", "AB-D", 1, TRUE }, - { "English", "AB D", "AB'D", 1, TRUE }, + { "English", "AB D", "AB-D", 1 }, + { "English", "AB D", "AB'D", 1 }, { "C", "ABCD", "ABCD", 0 }, { "C", "ABC", "ABCD", -1 }, @@ -4284,7 +4283,6 @@ static void test__tcscoll(void) ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); else - todo_wine_if(tests[i].todo) ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); @@ -4304,7 +4302,6 @@ static void test__tcscoll(void) ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); else - todo_wine_if(tests[i].todo) ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index af684e6be2e..1b7bc3e54e0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1994,7 +1994,8 @@ int CDECL _wcscoll_l(const wchar_t* str1, const wchar_t* str2, _locale_t locale) if(!locinfo->lc_handle[LC_COLLATE]) return wcscmp(str1, str2); - return CompareStringW(locinfo->lc_handle[LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringW(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, + str1, -1, str2, -1)-CSTR_EQUAL; } /*********************************************************************

1 0

Daniel Lehman : msvcrt/tests: Add tests for strcoll/wcscoll.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 188d880493da37533adcdaa6cac7487766dd204f URL: https://gitlab.winehq.org/wine/wine/-/commit/188d880493da37533adcdaa6cac748… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 18 09:04:51 2024 -0800 msvcrt/tests: Add tests for strcoll/wcscoll. --- dlls/msvcrt/tests/string.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a14e95704f3..24902d96f27 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4227,6 +4227,89 @@ static void test__tcsncoll(void) } } +static void test__tcscoll(void) +{ + struct test { + const char *locale; + const char *str1; + const char *str2; + int exp; + BOOL todo; + }; + static const struct test tests[] = { + { "English", "ABCD", "ABCD", 0 }, + { "English", "ABC", "ABCD", -1 }, + { "English", "ABCD", "ABC", 1 }, + { "English", "ABCe", "ABCf", -1 }, + { "English", "abcd", "ABCD", -1 }, + { "English", "AB D", "AB-D", 1, TRUE }, + { "English", "AB D", "AB'D", 1, TRUE }, + + { "C", "ABCD", "ABCD", 0 }, + { "C", "ABC", "ABCD", -1 }, + { "C", "ABCD", "ABC", 1 }, + { "C", "ABCe", "ABCf", -1 }, + { "C", "abcd", "ABCD", 1 }, + { "C", "AB D", "AB-D", -1 }, + { "C", "AB D", "AB'D", -1 }, + }; + WCHAR str1W[16]; + WCHAR str2W[16]; + char str1[16]; + char str2[16]; + size_t len; + int i, ret; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if (!setlocale(LC_ALL, tests[i].locale)) + { + win_skip("%s locale _tcsncoll tests\n", tests[i].locale); + for (; i+1 < ARRAY_SIZE(tests); i++) + if (strcmp(tests[i].locale, tests[i+1].locale)) break; + continue; + } + + memset(str1, 0xee, sizeof(str1)); + strcpy(str1, tests[i].str1); + + memset(str2, 0xff, sizeof(str2)); + strcpy(str2, tests[i].str2); + + ret = strcoll(str1, str2); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else + todo_wine_if(tests[i].todo) + ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + + memset(str1W, 0xee, sizeof(str1W)); + len = mbstowcs(str1W, str1, ARRAY_SIZE(str1W)); + str1W[len] = 0; + + memset(str2W, 0xff, sizeof(str2W)); + len = mbstowcs(str2W, str2, ARRAY_SIZE(str2W)); + str2W[len] = 0; + + ret = wcscoll(str1W, str2W); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else + todo_wine_if(tests[i].todo) + ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + } +} + static void test__tcsnicoll(void) { struct test { @@ -4854,6 +4937,7 @@ START_TEST(string) test__memicmp_l(); test__strupr(); test__tcsncoll(); + test__tcscoll(); test__tcsnicoll(); test___strncnt(); test_C_locale();

1 0

Biswapriyo Nath : include: Add IDirect3DSurface in windows.graphics.directx.direct3d11.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: fe4f7632a7c48251bc3e1792db8babd3074f09aa URL: https://gitlab.winehq.org/wine/wine/-/commit/fe4f7632a7c48251bc3e1792db8bab… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:06:55 2024 +0000 include: Add IDirect3DSurface in windows.graphics.directx.direct3d11.idl. --- include/windows.graphics.directx.direct3d11.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/windows.graphics.directx.direct3d11.idl b/include/windows.graphics.directx.direct3d11.idl index f53140545b0..cf58cee4256 100644 --- a/include/windows.graphics.directx.direct3d11.idl +++ b/include/windows.graphics.directx.direct3d11.idl @@ -32,6 +32,13 @@ namespace Windows.Graphics.DirectX.Direct3D11 { typedef struct Direct3DSurfaceDescription Direct3DSurfaceDescription; interface IDirect3DDevice; + interface IDirect3DSurface; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + } [ contract(Windows.Foundation.UniversalApiContract, 1.0) @@ -62,4 +69,15 @@ namespace Windows.Graphics.DirectX.Direct3D11 { { HRESULT Trim(); } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(0bf4a146-13c1-4694-bee3-7abf15eaf586) + ] + interface IDirect3DSurface : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT Description( + [out, retval] Windows.Graphics.DirectX.Direct3D11.Direct3DSurfaceDescription *value); + } }

1 0

Zebediah Figura : wined3d/arb: Move FFP bumpenv constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 9a614fefafa5c1d22b83c46dfeb2488e8f825ce7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a614fefafa5c1d22b83c46dfeb248… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:23:25 2023 -0600 wined3d/arb: Move FFP bumpenv constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 131 +++++++++----------------------------- 1 file changed, 29 insertions(+), 102 deletions(-)

1 0