July 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use META_EXTFLOODFILL records for ExtFloodFill.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 6762f6ac52132a3c6052fd291d8f7bb38e77983c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6762f6ac52132a3c6052fd29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 25 12:58:12 2021 +0200 gdi32: Use META_EXTFLOODFILL records for ExtFloodFill. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/graphics.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 16 ++++++++++++++ dlls/gdi32/mfdrv/metafiledrv.h | 2 ++ dlls/gdi32/tests/metafile.c | 48 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 0f6b3d75e52..396be6e1472 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -250,9 +250,9 @@ BOOL METADC_PolyPolygon( HDC hdc, const POINT *pt, const INT *counts, UINT polyg /********************************************************************** * METADC_ExtFloodFill */ -BOOL METADC_ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fillType ) +BOOL METADC_ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type ) { - return metadc_param4( hdc, META_FLOODFILL, x, y, HIWORD(color), LOWORD(color) ); + return metadc_param5( hdc, META_EXTFLOODFILL, x, y, HIWORD(color), LOWORD(color), fill_type ); } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 8961c45d24f..1a647a655f3 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -629,6 +629,22 @@ BOOL metadc_param4( HDC hdc, short func, short param1, short param2, return MFDRV_MetaParam4( &dev->dev, func, param1, param2, param3, param4 ); } +BOOL metadc_param5( HDC hdc, short func, short param1, short param2, + short param3, short param4, short param5 ) +{ + char buffer[FIELD_OFFSET(METARECORD, rdParm[5])]; + METARECORD *mr = (METARECORD *)&buffer; + + mr->rdSize = sizeof(buffer) / sizeof(WORD); + mr->rdFunction = func; + mr->rdParm[0] = param5; + mr->rdParm[1] = param4; + mr->rdParm[2] = param3; + mr->rdParm[3] = param2; + mr->rdParm[4] = param1; + return metadc_record( hdc, mr, sizeof(buffer) ); +} + BOOL metadc_param6( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6 ) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 9b4bb2d9e84..805c0c2f9d9 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -63,6 +63,8 @@ extern METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN; extern BOOL metadc_param4( HDC hdc, short func, short param1, short param2, short param3, short param4 ) DECLSPEC_HIDDEN; +extern BOOL metadc_param5( HDC hdc, short func, short param1, short param2, short param3, + short param4, short param5 ) DECLSPEC_HIDDEN; extern BOOL metadc_param6( HDC hdc, short func, short param1, short param2, short param3, short param4, short param5, short param6 ) DECLSPEC_HIDDEN; extern BOOL metadc_param8( HDC hdc, short func, short param1, short param2, diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5f626e83901..9a9a3fa6a5a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3221,7 +3221,7 @@ static void test_emf_SetPixel(void) BOOL ret; HDC hdc; - hdc = CreateEnhMetaFileW(NULL, L"test.emf", NULL, NULL); + hdc = CreateEnhMetaFileW(NULL, NULL, NULL, NULL); ok(hdc != 0, "CreateEnhMetaFile failed\n"); c = GetPixel(hdc, 5, 5); @@ -3440,6 +3440,51 @@ static void test_mf_Graphics(void) hMetafile, GetLastError()); } +static void test_mf_FloodFill(void) +{ + HMETAFILE mf; + HDC hdc; + BOOL ret; + + static const unsigned char floodfill_bits[] = + { + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x24, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x48, 0x05, + 0x00, 0x00, 0x03, 0x04, 0x05, 0x00, 0x02, 0x00, + 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x48, 0x05, + 0x00, 0x00, 0x08, 0x09, 0x0a, 0x00, 0x07, 0x00, + 0x06, 0x00, 0x08, 0x00, 0x00, 0x00, 0x48, 0x05, + 0x01, 0x00, 0x12, 0x13, 0x14, 0x00, 0x11, 0x00, + 0x10, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + ret = FloodFill(hdc, 1, 2, RGB(3,4,5)); + ok(ret, "FloodFill failed\n"); + + ret = ExtFloodFill(hdc, 6, 7, RGB(8,9,10), FLOODFILLBORDER); + ok(ret, "FloodFill failed\n"); + + ret = ExtFloodFill(hdc, 16, 17, RGB(18,19,20), FLOODFILLSURFACE); + ok(ret, "FloodFill failed\n"); + + mf = CloseMetaFile(hdc); + ok(mf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits (mf, floodfill_bits, sizeof(floodfill_bits), + "mf_FloodFill") != 0) + { + dump_mf_bits(mf, "mf_FloodFill"); + EnumMetaFile(0, mf, mf_enum_proc, 0); + } + + ret = DeleteMetaFile(mf); + ok(ret, "DeleteMetaFile(%p) error %d\n", mf, GetLastError()); +} + static void test_mf_PatternBrush(void) { HDC hdcMetafile; @@ -6357,6 +6402,7 @@ START_TEST(metafile) test_mf_SetLayout(); test_metafile_file(); test_mf_SetPixel(); + test_mf_FloodFill(); /* For metafile conversions */ test_mf_conversions();

1 0

Jacek Caban : gdi32: Use NtGdiGradientFill for GdiGradientFill implementation.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 1ca8064c886dfb618e805e53df182aabc9fbee8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca8064c886dfb618e805e53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 25 10:58:49 2021 +0200 gdi32: Use NtGdiGradientFill for GdiGradientFill implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 14 ++++++++++++-- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/painting.c | 14 ++++---------- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index bcf1b499342..eacf596c92b 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1116,6 +1116,16 @@ no_bounds: */ BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +/********************************************************************** + * EMFDC_GradientFill + */ +BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { EMRGRADIENTFILL *emr; ULONG i, pt, size, num_pts = ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); @@ -1159,8 +1169,8 @@ BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, memcpy( emr->Ver, vert_array, nvert * sizeof(vert_array[0]) ); memcpy( emr->Ver + nvert, pts, num_pts * sizeof(pts[0]) ); - EMFDRV_UpdateBBox( dev, &emr->rclBounds ); - ret = EMFDRV_WriteRecord( dev, &emr->emr ); + EMFDRV_UpdateBBox( dc_attr->emf, &emr->rclBounds ); + ret = EMFDRV_WriteRecord( dc_attr->emf, &emr->emr ); HeapFree( GetProcessHeap(), 0, emr ); return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8f0cb29a8d4..d9784c31aac 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -87,6 +87,8 @@ extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const extern BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 605294cc6b8..3cd0b4c26c1 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -466,6 +466,28 @@ BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color ) return ExtFloodFill( hdc, x, y, color, FLOODFILLBORDER ); } +/****************************************************************************** + * GdiGradientFill (GDI32.@) + */ +BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array, + nvert, grad_array, ngrad ); + + if (!(dc_attr = get_dc_attr( hdc ))) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (dc_attr->emf && + !EMFDC_GradientFill( dc_attr, vert_array, nvert, grad_array, ngrad, mode )) + return FALSE; + return NtGdiGradientFill( hdc, vert_array, nvert, grad_array, ngrad, mode ); +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 992f2cfb2b0..9fecce61bd2 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -918,18 +918,16 @@ POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) } /****************************************************************************** - * GdiGradientFill (GDI32.@) + * NtGdiGdiGradientFill (win32u.@) */ -BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) +BOOL WINAPI NtGdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { DC *dc; PHYSDEV physdev; BOOL ret; ULONG i; - TRACE("%p vert_array:%p nvert:%d grad_array:%p ngrad:%d\n", hdc, vert_array, nvert, grad_array, ngrad); - if (!vert_array || !nvert || !grad_array || !ngrad || mode > GRADIENT_FILL_TRIANGLE) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -938,11 +936,7 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) if (((ULONG *)grad_array)[i] >= nvert) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } + if (!(dc = get_dc_ptr( hdc ))) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pGradientFill ); ret = physdev->funcs->pGradientFill( physdev, vert_array, nvert, grad_array, ngrad, mode );

1 0

Julien Loir : secur32: Ignore attribute when searching for buffer type.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 2ba8976f632336128ca2ad907e7e8d9f79c0da10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba8976f632336128ca2ad90… Author: Julien Loir <mini.jul.jl(a)gmail.com> Date: Sun Jul 25 14:37:46 2021 +0200 secur32: Ignore attribute when searching for buffer type. Buffer types in PSecBufferDesc can have an optional attribute. When searching, it must be ignored to ensure the buffer type is found. Signed-off-by: Julien Loir <mini.jul.jl(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 515f01d08a3..eb8106e88c7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -659,7 +659,8 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta for (i = start_idx; i < desc->cBuffers; ++i) { buffer = &desc->pBuffers[i]; - if (buffer->BufferType == buffer_type) return i; + if ((buffer->BufferType | SECBUFFER_ATTRMASK) == (buffer_type | SECBUFFER_ATTRMASK)) + return i; } return -1;

1 0

Aaron Hill : crypt32: Add missing 'break' to X509_ECC_SIGNATURE case.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 0342de8e4d8a646d2b858cccdbf95bf68c6b32b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0342de8e4d8a646d2b858ccc… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Sun Jul 25 13:09:42 2021 -0500 crypt32: Add missing 'break' to X509_ECC_SIGNATURE case. This was accidentally removed as part of commit 5edf65616a8dcbf5988bbabe0493827d9e125fc3 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51501 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 08b07efdbe6..6873cebeae4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6291,6 +6291,7 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, break; case LOWORD(X509_ECC_SIGNATURE): decodeFunc = CRYPT_AsnDecodeEccSignature; + break; case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey_Bcrypt; break;

1 0

Martin Storsjo : ntdll: Fix arm64 call_user_exception_dispatcher with kernel stack for syscalls.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 23b44e8df62847872d036cd88d72e36b5424ee35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b44e8df62847872d036cd8… Author: Martin Storsjo <martin(a)martin.st> Date: Sun Jul 25 23:33:05 2021 +0300 ntdll: Fix arm64 call_user_exception_dispatcher with kernel stack for syscalls. Don't call KiUserExceptionDispatcher directly on the stack pointer stored in the CONTEXT, but use the one stored in syscall_frame (which includes the stack allocation in e.g. RtlRaiseException). This fixes unwinding test cases that worked before 08c4419a49655801cba2b71ea327534ff7fd4278. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1e4f493bc97..0ce6206aa9d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -705,12 +705,18 @@ void call_raise_user_exception_dispatcher(void) NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + ULONG64 fp = frame->fp; + ULONG64 lr = frame->lr; + ULONG64 sp = frame->sp; NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); if (status) return status; frame->x[0] = (ULONG64)rec; frame->x[1] = (ULONG64)context; frame->pc = (ULONG64)pKiUserExceptionDispatcher; + frame->fp = fp; + frame->lr = lr; + frame->sp = sp; frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL; return status; }

1 0

Zhiyi Zhang : uxtheme: Fix incorrect part IDs in button class map.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: ec82a0ebe65a0bd9f41c743d301c853e77dd8b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec82a0ebe65a0bd9f41c743d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 26 10:25:30 2021 +0800 uxtheme: Fix incorrect part IDs in button class map. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51506 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 20ed1305da8..463c236df30 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -361,21 +361,21 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_RADIOBUTTON, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, {BP_RADIOBUTTON, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, {BP_CHECKBOX, 0, L"CHECKBOX"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, - {BP_RADIOBUTTON, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, - {BP_RADIOBUTTON, CBS_CHECKEDHOT, L"CHECKEDHOT"}, - {BP_RADIOBUTTON, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, - {BP_RADIOBUTTON, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, - {BP_RADIOBUTTON, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, - {BP_RADIOBUTTON, CBS_MIXEDHOT, L"MIXEDHOT"}, - {BP_RADIOBUTTON, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, - {BP_RADIOBUTTON, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_CHECKBOX, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_CHECKBOX, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_CHECKBOX, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_CHECKBOX, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_CHECKBOX, CBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_CHECKBOX, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_CHECKBOX, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, + {BP_CHECKBOX, CBS_MIXEDHOT, L"MIXEDHOT"}, + {BP_CHECKBOX, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, + {BP_CHECKBOX, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, {BP_GROUPBOX, 0, L"GROUPBOX"}, - {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"}, - {BP_RADIOBUTTON, GBS_DISABLED, L"DISABLED"}, + {BP_GROUPBOX, GBS_NORMAL, L"NORMAL"}, + {BP_GROUPBOX, GBS_DISABLED, L"DISABLED"}, {BP_USERBUTTON, 0, L"USERBUTTON"}, {BP_COMMANDLINK, 0, L"COMMANDLINK"}, {BP_COMMANDLINK, CMDLS_NORMAL, L"NORMAL"},

1 0

Derek Lesho : winevulkan: Support use of extensions which mustn't be exposed.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 9a78f7d7a8ee3cc0a102322e5f54db03c3d8e4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a78f7d7a8ee3cc0a102322e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Jul 12 15:02:43 2021 -0400 winevulkan: Support use of extensions which mustn't be exposed. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 269f98c7940..5f9709eb43b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -122,6 +122,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -511,8 +516,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -655,6 +660,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2680,7 +2689,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2700,6 +2709,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2709,6 +2720,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2768,7 +2781,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2787,7 +2800,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2886,7 +2899,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2895,7 +2908,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2903,7 +2916,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2911,7 +2924,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2968,7 +2981,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3462,7 +3475,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled":

1 0

Derek Lesho : vulkan-1/tests: Add tests for VK_KHR_external_memory_win32.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: wine Branch: master Commit: 8bdfb41e26fa8731c9dbbf5dc962dc932f2a46c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bdfb41e26fa8731c9dbbf5d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Jul 12 15:02:44 2021 -0400 vulkan-1/tests: Add tests for VK_KHR_external_memory_win32. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 341 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 12 ++ dlls/winevulkan/vulkan_thunks.h | 16 ++ include/wine/vulkan.h | 43 +++++ 5 files changed, 415 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bdfb41e26fa8731c9db…

1 0

Conor McCarthy : vkd3d-shader: Find bindings for descriptor arrays.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 2924a481a741f0cdb5891d069b3e23dd4372bb96 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2924a481a741f0cdb5891d0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 23 23:01:35 2021 +1000 vkd3d-shader: Find bindings for descriptor arrays. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 13 +++---------- tests/d3d12.c | 1 + 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 511f0c3..8d8b10a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2468,6 +2468,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor bool is_uav_counter) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; + unsigned int register_last = (range->last == ~0u) ? range->first : range->last; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2543,18 +2544,10 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor continue; if (current->type != descriptor_type || current->register_space != range->space - || current->register_index != range->first) + || current->register_index > range->first + || current->binding.count <= register_last - current->register_index) continue; - if (current->binding.count != 1) - { - FIXME("Descriptor arrays are not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, - "Descriptor binding for type %#x, space %u, register %u, " - "shader type %#x has unsupported ‘count’ %u.", - descriptor_type, range->space, range->first, compiler->shader_type, current->binding.count); - } - return current->binding; } if (shader_interface->binding_count) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3a1a72a..ab29e40 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34624,6 +34624,7 @@ static void test_resource_arrays(void) get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); } + todo context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); if (!context.pipeline_state)

1 0

Conor McCarthy : vkd3d-shader: Introduce to struct vkd3d_symbol a descriptor array symbol type.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 85eff9373d2331fcdc2e7edfd40865d46cb8f4dc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85eff9373d2331fcdc2e7ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 23 23:01:37 2021 +1000 vkd3d-shader: Introduce to struct vkd3d_symbol a descriptor array symbol type. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 137 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 125 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=85eff9373d2331fcdc2…

1 0