- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add ICompositionSurface interface definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 9129c338b8d459add544447318ddafea5f95d66f URL: https://gitlab.winehq.org/wine/wine/-/commit/9129c338b8d459add544447318ddaf… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:40:58 2023 -0400 include: Add ICompositionSurface interface definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 4a0669368d5..568a8b92af6 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -39,11 +39,17 @@ namespace Windows.UI.Composition { interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; + interface ICompositionSurface; runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; + interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -80,6 +86,14 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + uuid(1527540d-42c7-47a6-a408-668f79a90dfb) + ] + interface ICompositionSurface : IInspectable + { + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionClip definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 89c1dc71b5ce38b37ab9108c2735d2d8e514d233 URL: https://gitlab.winehq.org/wine/wine/-/commit/89c1dc71b5ce38b37ab9108c2735d2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:48:50 2023 -0400 include: Add Windows.UI.Composition.CompositionClip definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 11cb4535d14..75d466b5908 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -39,6 +39,9 @@ namespace Windows.UI.Composition { interface ICompositionBrush; interface ICompositionBrushFactory; + interface ICompositionClip; + interface ICompositionClip2; + interface ICompositionClipFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; @@ -50,6 +53,7 @@ namespace Windows.UI.Composition { interface ISpriteVisual2; runtimeclass CompositionBrush; + runtimeclass CompositionClip; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; runtimeclass CompositionSurfaceBrush; @@ -115,6 +119,24 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionClip), + uuid(1ccd2a52-cfc7-4ace-9983-146bb8eb6a3c) + ] + interface ICompositionClip : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionClip), + uuid(b9484caf-20c7-4aed-ac4a-9c78ba1302cf) + ] + interface ICompositionClipFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -182,6 +204,18 @@ namespace Windows.UI.Composition { [default] interface Windows.UI.Composition.ICompositionBrush; } + [ + composable(Windows.UI.Composition.ICompositionClipFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionClip : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionClip; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionClip2; + } + [ composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionBrush definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 06133eaf0cd3fe2767ec6b5b224ebe184c62018b URL: https://gitlab.winehq.org/wine/wine/-/commit/06133eaf0cd3fe2767ec6b5b224ebe… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:36:59 2023 -0400 include: Add Windows.UI.Composition.CompositionBrush definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 304b9c4e042..4a0669368d5 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -34,13 +34,34 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; namespace Windows.UI.Composition { + interface ICompositionBrush; + interface ICompositionBrushFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; + runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionBrush), + uuid(ab0d7608-30c0-40e9-b568-b60a6bd1fb46) + ] + interface ICompositionBrush : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionBrush), + uuid(da53fb4c-4650-47c4-ad76-765379607ed6) + ] + interface ICompositionBrushFactory : IInspectable + { + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionEasingFunction), @@ -59,6 +80,17 @@ namespace Windows.UI.Composition { { } + [ + composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionBrush : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionBrush; + } + [ composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0),

1 0

Mohamad Al-Jaf : include: Add windows.ui.composition.idl file.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 6637e1d8faf3b7dfbccf86b6af5a1bcfefe10aa8 URL: https://gitlab.winehq.org/wine/wine/-/commit/6637e1d8faf3b7dfbccf86b6af5a1b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Jan 29 23:05:42 2023 -0500 include: Add windows.ui.composition.idl file. Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.ui.composition.idl | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dcf6c016313..f52314e745d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -837,6 +837,7 @@ SOURCES = \ windows.system.profile.systemmanufacturers.idl \ windows.system.threading.idl \ windows.system.userprofile.idl \ + windows.ui.composition.idl \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl new file mode 100644 index 00000000000..304b9c4e042 --- /dev/null +++ b/include/windows.ui.composition.idl @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.foundation.numerics.idl"; +/* import "windows.graphics.idl"; */ +import "windows.graphics.directx.idl"; +import "windows.graphics.effects.idl"; +import "windows.system.idl"; +import "windows.ui.idl"; +import "windows.ui.core.idl"; + +namespace Windows.UI.Composition { + interface ICompositionEasingFunction; + interface ICompositionEasingFunctionFactory; + interface ICompositionEasingFunctionStatics; + + runtimeclass CompositionEasingFunction; + runtimeclass CompositionObject; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEasingFunction), + uuid(5145e356-bf79-4ea8-8cc2-6b5b472e6c9a) + ] + interface ICompositionEasingFunction : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionEasingFunction), + uuid(60840774-3da0-4949-8200-7206c00190a0) + ] + interface ICompositionEasingFunctionFactory : IInspectable + { + } + + [ + composable(Windows.UI.Composition.ICompositionEasingFunctionFactory, public, Windows.Foundation.UniversalApiContract, 2.0), + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.UI.Composition.ICompositionEasingFunctionStatics, Windows.Foundation.UniversalApiContract, 12.0), + threading(both) + ] + runtimeclass CompositionEasingFunction : Windows.UI.Composition.CompositionObject + { + [default] interface Windows.UI.Composition.ICompositionEasingFunction; + } +}

1 0

Mohamad Al-Jaf : include: Add Windows.UI.Composition.CompositionSurfaceBrush definition.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 7ba9a384566504a9c36c6f6857d9e269ca17cc72 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ba9a384566504a9c36c6f6857d9e2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Apr 3 19:44:02 2023 -0400 include: Add Windows.UI.Composition.CompositionSurfaceBrush definition. Needed for mingw Firefox build. --- include/windows.ui.composition.idl | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/include/windows.ui.composition.idl b/include/windows.ui.composition.idl index 568a8b92af6..691da23c4f2 100644 --- a/include/windows.ui.composition.idl +++ b/include/windows.ui.composition.idl @@ -34,22 +34,65 @@ import "windows.ui.idl"; import "windows.ui.core.idl"; namespace Windows.UI.Composition { + typedef enum CompositionBitmapInterpolationMode CompositionBitmapInterpolationMode; + typedef enum CompositionStretch CompositionStretch; + interface ICompositionBrush; interface ICompositionBrushFactory; interface ICompositionEasingFunction; interface ICompositionEasingFunctionFactory; interface ICompositionEasingFunctionStatics; interface ICompositionSurface; + interface ICompositionSurfaceBrush; + interface ICompositionSurfaceBrush2; + interface ICompositionSurfaceBrush3; runtimeclass CompositionBrush; runtimeclass CompositionEasingFunction; runtimeclass CompositionObject; + runtimeclass CompositionSurfaceBrush; declare { interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.UI.Composition.ICompositionSurface *>; interface Windows.Foundation.IAsyncOperation<Windows.UI.Composition.ICompositionSurface *>; } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionBitmapInterpolationMode + { + NearestNeighbor = 0, + Linear = 1, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinLinearMipLinear = 2, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinLinearMipNearest = 3, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinNearestMipLinear = 4, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagLinearMinNearestMipNearest = 5, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinLinearMipLinear = 6, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinLinearMipNearest = 7, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinNearestMipLinear = 8, + [contract(Windows.Foundation.UniversalApiContract, 8.0)] + MagNearestMinNearestMipNearest = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0) + ] + enum CompositionStretch + { + None = 0, + Fill = 1, + Uniform = 2, + UniformToFill = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.UI.Composition.CompositionBrush), @@ -94,6 +137,25 @@ namespace Windows.UI.Composition { { } + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.UI.Composition.CompositionSurfaceBrush), + uuid(ad016d79-1e4c-4c0d-9c29-83338c87c162) + ] + interface ICompositionSurfaceBrush : IInspectable + { + [propget] HRESULT BitmapInterpolationMode([out, retval] Windows.UI.Composition.CompositionBitmapInterpolationMode *value); + [propput] HRESULT BitmapInterpolationMode([in] Windows.UI.Composition.CompositionBitmapInterpolationMode value); + [propget] HRESULT HorizontalAlignmentRatio([out, retval] FLOAT *value); + [propput] HRESULT HorizontalAlignmentRatio([in] FLOAT value); + [propget] HRESULT Stretch([out, retval] Windows.UI.Composition.CompositionStretch *value); + [propput] HRESULT Stretch([in] Windows.UI.Composition.CompositionStretch value); + [propget] HRESULT Surface([out, retval] Windows.UI.Composition.ICompositionSurface **value); + [propput] HRESULT Surface([in] Windows.UI.Composition.ICompositionSurface *value); + [propget] HRESULT VerticalAlignmentRatio([out, retval] FLOAT *value); + [propput] HRESULT VerticalAlignmentRatio([in] FLOAT value); + } + [ composable(Windows.UI.Composition.ICompositionBrushFactory, public, Windows.Foundation.UniversalApiContract, 2.0), contract(Windows.Foundation.UniversalApiContract, 2.0), @@ -116,4 +178,16 @@ namespace Windows.UI.Composition { { [default] interface Windows.UI.Composition.ICompositionEasingFunction; } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass CompositionSurfaceBrush : Windows.UI.Composition.CompositionBrush + { + [default] interface Windows.UI.Composition.ICompositionSurfaceBrush; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush2; + [contract(Windows.Foundation.UniversalApiContract, 8.0)] interface Windows.UI.Composition.ICompositionSurfaceBrush3; + } }

1 0

Mohamad Al-Jaf : cryptowinrt/tests: Remove racey refcount test.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3939eaf81a9f468d5f54b3017121f04e2f77e99a URL: https://gitlab.winehq.org/wine/wine/-/commit/3939eaf81a9f468d5f54b3017121f0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 5 21:15:36 2023 -0400 cryptowinrt/tests: Remove racey refcount test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54783 --- dlls/cryptowinrt/tests/crypto.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/cryptowinrt/tests/crypto.c b/dlls/cryptowinrt/tests/crypto.c index 983af748bed..260287dbd23 100644 --- a/dlls/cryptowinrt/tests/crypto.c +++ b/dlls/cryptowinrt/tests/crypto.c @@ -251,7 +251,6 @@ static void test_Credentials_Statics(void) HSTRING str; HRESULT hr; DWORD ret; - LONG ref; hr = WindowsCreateString( credentials_statics_name, wcslen( credentials_statics_name ), &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); @@ -317,10 +316,8 @@ static void test_Credentials_Statics(void) IAsyncOperation_boolean_Release( bool_async ); - ref = IKeyCredentialManagerStatics_Release( credentials_statics ); - ok( ref == 2, "got ref %ld.\n", ref ); - ref = IActivationFactory_Release( factory ); - ok( ref == 1, "got ref %ld.\n", ref ); + IKeyCredentialManagerStatics_Release( credentials_statics ); + IActivationFactory_Release( factory ); } START_TEST(crypto)

1 0

Piotr Caban : gdi32: Rename DIB_PAL_MONO to DIB_PAL_INDICES.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 8ada95cec45791e48f7437e6e21ebae001fc02e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ada95cec45791e48f7437e6e21eba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 14:04:32 2023 +0200 gdi32: Rename DIB_PAL_MONO to DIB_PAL_INDICES. --- dlls/gdi32/emfdc.c | 6 +++--- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 45587503330..bf35450cfb3 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -451,7 +451,7 @@ static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) * FIXME: It may be that the DIB functions themselves accept this value. */ emr->emr.iType = EMR_CREATEMONOBRUSH; - usage = DIB_PAL_MONO; + usage = DIB_PAL_INDICES; emr->cbBmi = sizeof( BITMAPINFOHEADER ); } else @@ -1617,7 +1617,7 @@ BOOL EMFDC_MaskBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT h emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; emr->xMask = x_mask; emr->yMask = y_mask; - emr->iUsageMask = DIB_PAL_MONO; + emr->iUsageMask = DIB_PAL_INDICES; emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; emr->cbBmiMask = mask_info_size; emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; @@ -1720,7 +1720,7 @@ BOOL EMFDC_PlgBlt( DC_ATTR *dc_attr, const POINT *points, HDC hdc_src, INT x_src emr->cbBitsSrc = src_info.bmiHeader.biSizeImage; emr->xMask = x_mask; emr->yMask = y_mask; - emr->iUsageMask = DIB_PAL_MONO; + emr->iUsageMask = DIB_PAL_INDICES; emr->offBmiMask = mask_info_size ? emr->offBitsSrc + emr->cbBitsSrc : 0; emr->cbBmiMask = mask_info_size; emr->offBitsMask = emr->offBmiMask + emr->cbBmiMask; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 178f7b0e132..da9c68df4af 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1858,7 +1858,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( /* Need to check if the bitmap is monochrome, and if the two colors are really black and white */ - if (pCreateMonoBrush->iUsage == DIB_PAL_MONO) + if (pCreateMonoBrush->iUsage == DIB_PAL_INDICES) { BITMAP bm; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79f1975d96f..da4c951eb00 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -53,7 +53,7 @@ static inline DWORD gdi_handle_type( HGDIOBJ obj ) #define MFVERSION 0x300 /* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ -#define DIB_PAL_MONO 2 +#define DIB_PAL_INDICES 2 /* Format of comment record added by GetWinMetaFileBits */ #include <pshpack2.h>

1 0

Piotr Caban : gdi32: Let SetDIBits handle DIB_PAL_INDICES color usage in PlayEnhMetaFileRecord.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 273f40b6c4827d98b5e146da4ea6808e654c6cbb URL: https://gitlab.winehq.org/wine/wine/-/commit/273f40b6c4827d98b5e146da4ea680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 19:51:50 2023 +0200 gdi32: Let SetDIBits handle DIB_PAL_INDICES color usage in PlayEnhMetaFileRecord. --- dlls/gdi32/enhmetafile.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index da9c68df4af..adbc9b296e7 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1858,23 +1858,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( /* Need to check if the bitmap is monochrome, and if the two colors are really black and white */ - if (pCreateMonoBrush->iUsage == DIB_PAL_INDICES) - { - BITMAP bm; - - /* Undocumented iUsage indicates a mono bitmap with no palette table, - * aligned to 32 rather than 16 bits. - */ - bm.bmType = 0; - bm.bmWidth = pbi->bmiHeader.biWidth; - bm.bmHeight = abs(pbi->bmiHeader.biHeight); - bm.bmWidthBytes = 4 * ((pbi->bmiHeader.biWidth + 31) / 32); - bm.bmPlanes = pbi->bmiHeader.biPlanes; - bm.bmBitsPixel = pbi->bmiHeader.biBitCount; - bm.bmBits = (BYTE *)mr + pCreateMonoBrush->offBits; - hBmp = CreateBitmapIndirect(&bm); - } - else if (is_dib_monochrome(pbi)) + if (is_dib_monochrome(pbi)) { /* Top-down DIBs have a negative height */ LONG height = pbi->bmiHeader.biHeight;

1 0

Piotr Caban : win32u: Add support for undocummented DIB_PAL_INDICES color usage in SetDIBits.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: wine Branch: master Commit: 3f051d3b1e6d654b00825e00e3a488e79d03e70f URL: https://gitlab.winehq.org/wine/wine/-/commit/3f051d3b1e6d654b00825e00e3a488… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 19:50:20 2023 +0200 win32u: Add support for undocummented DIB_PAL_INDICES color usage in SetDIBits. --- dlls/gdi32/tests/bitmap.c | 8 +++++++- dlls/win32u/dib.c | 20 ++++++++++++++++++-- dlls/win32u/ntgdi_private.h | 3 +++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d3074286ee6..e9b93d15fce 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -915,7 +915,7 @@ static void test_dib_formats(void) char data[2048]; /* 2 x 2 pixels, max 64 bits-per-pixel, max 64 planes */ void *bits; int planes, bpp, compr, format; - HBITMAP hdib, hbmp; + HBITMAP hdib, hbmp, hbmp_mono; HDC hdc, memdc; UINT ret; BOOL format_ok, expect_ok; @@ -924,6 +924,7 @@ static void test_dib_formats(void) hdc = GetDC( 0 ); memdc = CreateCompatibleDC( 0 ); hbmp = CreateCompatibleBitmap( hdc, 10, 10 ); + hbmp_mono = CreateBitmap( 10, 10, 1, 1, NULL ); memset( data, 0xaa, sizeof(data) ); @@ -1203,6 +1204,8 @@ static void test_dib_formats(void) DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_PAL_COLORS+1); ok( !ret, "SetDIBits succeeded with DIB_PAL_COLORS+1\n" ); + ret = SetDIBits(hdc, hbmp_mono, 0, 1, data, bi, DIB_PAL_COLORS+1); + ok( ret, "SetDIBits failed with DIB_PAL_COLORS+1\n" ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_PAL_COLORS+1 ); ok( ret, "SetDIBitsToDevice failed with DIB_PAL_COLORS+1\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_PAL_COLORS+1, SRCCOPY ); @@ -1227,6 +1230,8 @@ static void test_dib_formats(void) DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_PAL_COLORS+2); ok( !ret, "SetDIBits succeeded with DIB_PAL_COLORS+2\n" ); + ret = SetDIBits(hdc, hbmp_mono, 0, 1, data, bi, DIB_PAL_COLORS+2); + ok( !ret, "SetDIBits succeeded with DIB_PAL_COLORS+2\n" ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_PAL_COLORS+2 ); ok( !ret, "SetDIBitsToDevice succeeded with DIB_PAL_COLORS+2\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_PAL_COLORS+2, SRCCOPY ); @@ -1285,6 +1290,7 @@ static void test_dib_formats(void) DeleteDC( memdc ); DeleteObject( hbmp ); + DeleteObject( hbmp_mono ); ReleaseDC( 0, hdc ); HeapFree( GetProcessHeap(), 0, bi ); } diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index ccbb7d6db33..64f96b268c9 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -205,9 +205,11 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * { void *src_colors; - if (coloruse > DIB_PAL_COLORS + 1) return FALSE; /* FIXME: handle DIB_PAL_COLORS+1 format */ + if (coloruse > DIB_PAL_INDICES) return FALSE; if (!bitmapinfoheader_from_user_bitmapinfo( &dst->bmiHeader, &info->bmiHeader )) return FALSE; if (!is_valid_dib_format( &dst->bmiHeader, allow_compression )) return FALSE; + if (coloruse == DIB_PAL_INDICES && (dst->bmiHeader.biBitCount != 1 || + dst->bmiHeader.biCompression != BI_RGB)) return FALSE; src_colors = (char *)info + info->bmiHeader.biSize; @@ -230,6 +232,18 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); max_colors = colors; } + else if (coloruse == DIB_PAL_INDICES) + { + dst->bmiColors[0].rgbRed = 0; + dst->bmiColors[0].rgbGreen = 0; + dst->bmiColors[0].rgbBlue = 0; + dst->bmiColors[0].rgbReserved = 0; + dst->bmiColors[1].rgbRed = 0xff; + dst->bmiColors[1].rgbGreen = 0xff; + dst->bmiColors[1].rgbBlue = 0xff; + dst->bmiColors[1].rgbReserved = 0; + colors = max_colors; + } else if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { memcpy( dst->bmiColors, src_colors, colors * sizeof(RGBQUAD) ); @@ -675,7 +689,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, INT src_to_dst_offset; HRGN clip = 0; - if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE ) || coloruse > DIB_PAL_COLORS) + if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse, TRUE )) { RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return 0; @@ -699,6 +713,8 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (!(bitmap = GDI_GetObjPtr( hbitmap, NTGDI_OBJ_BITMAP ))) return 0; + if (coloruse == DIB_PAL_INDICES && bitmap->dib.dsBm.bmBitsPixel != 1) return 0; + if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { if (lines == 0) goto done; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 93be59c9d7e..cd714f8ec0d 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -28,6 +28,9 @@ /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* Undocumented value for DIB's color use: indicates a mono DIB w/o pal entries */ +#define DIB_PAL_INDICES 2 + struct gdi_obj_funcs { INT (*pGetObjectW)( HGDIOBJ handle, INT count, LPVOID buffer );

1 0

Zebediah Figura : vkd3d-common: Make some global string variables const.
by Alexandre Julliard April 6, 2023

April 6, 2023

Module: vkd3d Branch: master Commit: 6783524613a4d90939789e76b99fa2ec61c53916 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6783524613a4d90939789e76b99fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 5 15:23:53 2023 -0500 vkd3d-common: Make some global string variables const. --- include/private/vkd3d_debug.h | 2 +- libs/vkd3d-common/debug.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 4f6d43af..6708cad3 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -91,7 +91,7 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN) -#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name +#define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name static inline const char *debugstr_guid(const GUID *guid) { diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 499334a3..b363efbd 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -40,9 +40,9 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 -extern const char *vkd3d_dbg_env_name; +extern const char *const vkd3d_dbg_env_name; -static const char *debug_level_names[] = +static const char *const debug_level_names[] = { /* VKD3D_DBG_LEVEL_NONE */ "none", /* VKD3D_DBG_LEVEL_ERR */ "err",

1 0