February 2024 - Wine-commits

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

20 Feb '24

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 DetectedFace runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard 20 Feb '24

20 Feb '24

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 FaceDetector runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard 20 Feb '24

20 Feb '24

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

Alex Henrie : wined3d: Use CRT allocation functions.
by Alexandre Julliard 20 Feb '24

20 Feb '24

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 89e3be4ee9c5c8cd03dd4b99505e7079295e4bce URL: https://gitlab.winehq.org/wine/wine/-/commit/89e3be4ee9c5c8cd03dd4b99505e70… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 20 00:47:52 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 000bebd5018..7ce24c8ac65 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-02-14 00:13+0200\n" +"PO-Revision-Date: 2024-02-20 00:47+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10150,7 +10150,7 @@ msgstr "Naršy&ti" #: dlls/shell32/shell32.rc:164 msgid "Run as &Administrator" -msgstr "" +msgstr "Paleisti kaip &administratorius" #: dlls/shell32/shell32.rc:186 msgid "Restart"

1 0

Zhiyi Zhang : dsound/tests: Test that formats with more than two channels require WAVEFORMATEXTENSIBLE.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: b3ec5bc7ea3138d7fe8b6a1a5fa441ae305ab413 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ec5bc7ea3138d7fe8b6a1a5fa441… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 10:54:45 2024 +0800 dsound/tests: Test that formats with more than two channels require WAVEFORMATEXTENSIBLE. --- dlls/dsound/tests/dsound.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 9656a458415..c957f3a8a4b 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1481,6 +1481,51 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); + + /* The following 4 tests show that formats with more than two channels require WAVEFORMATEXTENSIBLE */ + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); + IDirectSoundBuffer_Release(got_buf); + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 4; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + todo_wine + ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 6; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + todo_wine + ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); + + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + fmtex.Format.nChannels = 6; + fmtex.Format.nSamplesPerSec = 44100; + fmtex.Format.wBitsPerSample = 16; + fmtex.Format.nBlockAlign = fmtex.Format.nChannels * fmtex.Format.wBitsPerSample / 8; + fmtex.Format.nAvgBytesPerSec = fmtex.Format.nSamplesPerSec * fmtex.Format.nBlockAlign; + fmtex.Samples.wValidBitsPerSample = fmtex.Format.wBitsPerSample; + fmtex.dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX *)&fmtex, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); + IDirectSoundBuffer_Release(got_buf); } static HRESULT test_invalid_fmts(LPGUID lpGuid)

1 0

Zhiyi Zhang : dsound: Reject WAVEFORMATEX formats with more than two channels.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 7c7b2e8e7e8c0be1a756e6d7c705b68017459e26 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c7b2e8e7e8c0be1a756e6d7c705b6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 20 11:04:13 2024 +0800 dsound: Reject WAVEFORMATEX formats with more than two channels. Formats with more than two channels require WAVEFORMATEXTENSIBLE according to tests. Fix Viking: Battle for Asgard (211160) audio cracking in its intro video. --- dlls/dsound/dsound.c | 3 +++ dlls/dsound/primary.c | 3 +++ dlls/dsound/tests/dsound.c | 2 -- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index b35f9c7cbdd..356f211d7bb 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -490,6 +490,9 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (dsbd->lpwfxFormat->nChannels > 2 && dsbd->lpwfxFormat->wFormatTag != WAVE_FORMAT_EXTENSIBLE) + return DSERR_INVALIDPARAM; + if (dsbd->lpwfxFormat->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { WAVEFORMATEXTENSIBLE *pwfxe = (WAVEFORMATEXTENSIBLE*)dsbd->lpwfxFormat; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 2e2473b4db2..6bb7b2ffba4 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -465,6 +465,9 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe return DSERR_INVALIDPARAM; } + if (passed_fmt->nChannels > 2 && passed_fmt->wFormatTag != WAVE_FORMAT_EXTENSIBLE) + return DSERR_ALLOCATED; + /* **** */ AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index c957f3a8a4b..500bc19f655 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1500,7 +1500,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - todo_wine ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); wfx.wFormatTag = WAVE_FORMAT_PCM; @@ -1510,7 +1509,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - todo_wine ok(rc == (buf ? DSERR_ALLOCATED : DSERR_INVALIDPARAM), "%s: SetFormat: %08lx\n", testname, rc); fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);

1 0

Paul Gofman : winhttp: Force debug info in critical sections.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 5e3cc883260254b51a5554128d8e6749993f93d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e3cc883260254b51a5554128d8e67… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 09:59:41 2024 -0600 winhttp: Force debug info in critical sections. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 29b30fc2583..4a64095797a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -6096,7 +6096,7 @@ HRESULT WinHttpRequest_create( void **obj ) if (!(request = calloc( 1, sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - InitializeCriticalSection( &request->cs ); + InitializeCriticalSectionEx( &request->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); initialize_request( request ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b009639297d..f6b4423600e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -319,7 +319,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->websocket_receive_buffer_size = 32768; session->websocket_send_buffer_size = 32768; list_init( &session->cookie_cache ); - InitializeCriticalSection( &session->cs ); + InitializeCriticalSectionEx( &session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": session.cs"); if (agent && !(session->agent = wcsdup( agent ))) goto end;

1 0

Paul Gofman : xaudio2: Force debug info in critical sections.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 431a483edcb10766f08ba5284ec659d115699ff4 URL: https://gitlab.winehq.org/wine/wine/-/commit/431a483edcb10766f08ba5284ec659… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:37:12 2024 -0600 xaudio2: Force debug info in critical sections. --- dlls/xaudio2_7/xaudio_dll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b821e9667b7..cd1c62f3cd4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1566,7 +1566,7 @@ static inline XA2VoiceImpl *create_voice(IXAudio2Impl *This) voice->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; voice->FAudioVoiceCallback_vtbl = FAudioVoiceCallback_Vtbl; - InitializeCriticalSection(&voice->lock); + InitializeCriticalSectionEx(&voice->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); voice->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2VoiceImpl.lock"); return voice; @@ -1900,10 +1900,10 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p list_init(&object->voices); - InitializeCriticalSection(&object->lock); + InitializeCriticalSectionEx(&object->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IXAudio2Impl.lock"); - InitializeCriticalSection(&object->mst.lock); + InitializeCriticalSectionEx(&object->mst.lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->mst.lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2MasteringVoice.lock"); FAudioCOMConstructWithCustomAllocatorEXT(

1 0

Paul Gofman : kernelbase: Force debug info in critical sections.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 6ba603a03c22a0b89f0c7c5f91fd61129bc30864 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ba603a03c22a0b89f0c7c5f91fd61… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 16 18:38:53 2024 -0600 kernelbase: Force debug info in critical sections. --- dlls/kernelbase/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index f425df4263b..7806ad2ec1f 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1267,7 +1267,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ goto error; } - RtlInitializeCriticalSection( &info->cs ); + RtlInitializeCriticalSectionEx( &info->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); info->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FIND_FIRST_INFO.cs"); info->path = nt_name; info->magic = FIND_FIRST_MAGIC;

1 0