December 2020 - Wine-Devel - list.winehq.org

[PATCH resend 1/4] ntdll: Implement RtlInitializeGenericTable
by Alex Henrie Dec. 11, 2020

Dec. 11, 2020

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..6afe4d876dd 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -428,7 +428,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &(table->InsertOrderList); + table->InsertOrderList.Blink = &(table->InsertOrderList); + table->OrderedPointer = &(table->InsertOrderList); + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.29.2

1 3

[PATCH 1/1] ntdll: Remove unnecessary call to strlen from get_dos_device
by Alex Henrie Dec. 11, 2020

Dec. 11, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 6d6edfe8926..a4c6bf4a137 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2812,7 +2812,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, char **unix_na if (!new_name) break; free( unix_name ); unix_name = new_name; - unix_len = strlen(unix_name) + 1; dev = NULL; /* last try */ } free( unix_name ); -- 2.29.2

1 0

[PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.
by Haidong Yu Dec. 11, 2020

Dec. 11, 2020

3 2

[PATCH] include: Fix broken defines in d3d9 headers
by Rafał Harabień Dec. 10, 2020

Dec. 10, 2020

* rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL * remove D3DCAPS2_NO2DDURING3DSCENE * remove D3DCAPS2_CANRENDERWINDOWED Removed defines seems to have been copied from d3d8.h and according to public docs do not exist in d3d9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d9/tests/d3d9ex.c | 3 +-- dlls/d3d9/tests/device.c | 3 +-- include/d3d9.h | 2 +- include/d3d9caps.h | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 462037b2e01..2afe73088c7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4020,8 +4020,7 @@ static void test_device_caps(void) ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Caps2 field has unexpected flags %#x.\n", caps.Caps2); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2791e91a068..0343fade792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13172,8 +13172,7 @@ static void test_device_caps(void) test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 1068a2c35a9..c62780b4a0a 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -258,9 +258,7 @@ #define D3DCAPS3_DXVAHD_LIMITED __MSABI_LONG(0x00000800) #define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F) -#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002) #define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000) -#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000) #define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000) #define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000) #define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000) -- 2.25.1

3 2

[PATCH 5/5] include: Add ID2D1Multithread interface in d2d1_1.idl.
by Biswapriyo Nath Dec. 10, 2020

Dec. 10, 2020

2 1

[PATCH 2/5] include: Add ID2D1GradientStopCollection1 interface in d2d1_1.idl.
by Biswapriyo Nath Dec. 10, 2020

Dec. 10, 2020

2 1

[PATCH 4/5] include: Add ID2D1StrokeStyle1 interface in d2d1_1.idl.
by Biswapriyo Nath Dec. 10, 2020

Dec. 10, 2020

2 1

[PATCH 3/5] include: Add ID2D1ImageBrush interface in d2d1_1.idl.
by Biswapriyo Nath Dec. 10, 2020

Dec. 10, 2020

2 1

[PATCH 1/5] include: Add ID2D1ColorContext interface in d2d1_1.idl.
by Biswapriyo Nath Dec. 10, 2020

Dec. 10, 2020

2 1

[PATCH 3/3] wined3d: Do not request VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for unmappable buffers.
by Henri Verbeet Dec. 10, 2020

Dec. 10, 2020

In particular, some implementations may not support the combination of VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT and VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for all buffer types, or at all. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Reported by Stefan on IRC. dlls/wined3d/buffer.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 11974467984..088697a57d5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1391,11 +1391,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { @@ -1472,9 +1474,11 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address src, dst; const struct wined3d_range *range; - struct wined3d_bo_address dst; + struct wined3d_bo_vk *dst_bo; unsigned int i = range_count; uint32_t flags; void *map_ptr; @@ -1488,6 +1492,24 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc flags = WINED3D_MAP_WRITE; if (!ranges->offset && ranges->size == resource->size) flags |= WINED3D_MAP_DISCARD; + + dst_bo = &wined3d_buffer_vk(buffer)->bo; + if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) + { + src.buffer_object = 0; + while (range_count--) + { + range = &ranges[range_count]; + + src.addr = (uint8_t *)data + range->offset - data_offset; + dst.addr = (void *)(uintptr_t)range->offset; + wined3d_context_copy_bo_address(context, &dst, &src, range->size); + } + + return; + } + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n"); -- 2.20.1

1 0

[PATCH 2/3] wined3d: Request VK_MEMORY_PROPERTY_HOST_CACHED_BIT for WINED3D_RESOURCE_ACCESS_MAP_R buffers.
by Henri Verbeet Dec. 10, 2020

Dec. 10, 2020

Unsurprisingly, reading for uncached memory may be very slow. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc32d97530a..11974467984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1394,6 +1394,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { -- 2.20.1

1 0

[PATCH 1/3] wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers.
by Henri Verbeet Dec. 10, 2020

Dec. 10, 2020

We don't typically need these to be in VRAM, and VRAM may not be mappable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6ff6a5b6cd0..dc32d97530a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,8 +1390,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); -- 2.20.1

1 0

[PATCH v2 5/5] gdiplus/tests: Use wide-char string literals for test strings.
by Jeff Smith Dec. 10, 2020

Dec. 10, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Fixed missing L prefix for a test string. dlls/gdiplus/tests/font.c | 2 +- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0d7254f255e..32cd1ff2c4f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -946,7 +946,7 @@ todo_wine static void test_font_transform(void) { - static const WCHAR string[] = { 'A',0 }; + static const WCHAR string[] = L"A"; GpStatus status; HDC hdc; LOGFONTA lf; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9a09abcfc8b..2b1628f4e9c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2279,7 +2279,7 @@ static void test_GdipDrawString(void) GpBrush *brush; LOGFONTA logfont; HDC hdc = GetDC( hwnd ); - static const WCHAR string[] = {'T','e','s','t',0}; + static const WCHAR string[] = L"Test"; static const PointF positions[4] = {{0,0}, {1,1}, {2,2}, {3,3}}; GpMatrix *matrix; @@ -3195,8 +3195,8 @@ static void test_string_functions(void) GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); - const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; - const WCHAR teststring2[] = {'j',0}; + const WCHAR teststring[] = L"MM M\nM"; + const WCHAR teststring2[] = L"j"; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3743,7 +3743,7 @@ static void test_GdipMeasureString(void) { 200.0, 600.0, 1.0, UnitPixel }, { 200.0, 600.0, 2.0, UnitPixel }, }; - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; GpStatus status; GpGraphics *graphics; GpFontFamily *family; @@ -4257,7 +4257,7 @@ static void test_pen_thickness(void) */ static void test_font_height_scaling(void) { - static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; + static const WCHAR string[] = L"1234567"; HDC hdc; GpStringFormat *format; CharacterRange range = { 0, 7 }; @@ -4357,7 +4357,6 @@ static void test_font_height_scaling(void) /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ for (gfx_unit = 2; gfx_unit <= 6; gfx_unit++) { - static const WCHAR doubleW[2] = { 'W','W' }; RectF bounds_1, bounds_2; REAL margin, margin_y, font_height; int match; @@ -4397,12 +4396,12 @@ todo_wine /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, doubleW, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, doubleW, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ @@ -4444,8 +4443,8 @@ cleanup: static void test_measure_string(void) { - static const WCHAR string[] = { 'A','0','1',0 }; - static const WCHAR string2[] = { 'M',' ','M','M',0 }; + static const WCHAR string[] = L"A01"; + static const WCHAR string2[] = L"M MM"; HDC hdc; GpStringFormat *format, *format_no_wrap; CharacterRange range; @@ -4915,7 +4914,6 @@ todo_wine static void test_measured_extra_space(void) { - static const WCHAR string[2] = { 'W','W' }; GpStringFormat *format; HDC hdc; GpGraphics *graphics; @@ -4959,12 +4957,12 @@ static void test_measured_extra_space(void) /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_1); - status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds_1, NULL, NULL); + status = GdipMeasureString(graphics, L"W", 1, font, &rect, format, &bounds_1, NULL, NULL); expect(Ok, status); /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ set_rect_empty(&rect); set_rect_empty(&bounds_2); - status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds_2, NULL, NULL); + status = GdipMeasureString(graphics, L"WW", 2, font, &rect, format, &bounds_2, NULL, NULL); expect(Ok, status); /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ -- 2.23.0

2 1

[PATCH 1/5] gdiplus/tests: Use wide-char string literals for font names.
by Jeff Smith Dec. 10, 2020

Dec. 10, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/font.c | 43 ++++++++++++++++------------------- dlls/gdiplus/tests/graphics.c | 15 ++++-------- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index af90152aa26..2fcdb3a37da 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -30,11 +30,6 @@ #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; -static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; -static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; - static void set_rect_empty(RectF *rc) { rc->X = 0.0; @@ -125,11 +120,11 @@ static void test_createfont(void) REAL size; WCHAR familyname[LF_FACESIZE]; - stat = GdipCreateFontFamilyFromName(nonexistent, NULL, &fontfamily); + stat = GdipCreateFontFamilyFromName(L"ThisFontShouldNotExist", NULL, &fontfamily); expect (FontFamilyNotFound, stat); stat = GdipDeleteFont(font); expect (InvalidParameter, stat); - stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &fontfamily); expect (Ok, stat); stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); expect (Ok, stat); @@ -142,7 +137,7 @@ static void test_createfont(void) stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); ok (fontfamily == fontfamily2, "Unexpected family instance.\n"); - ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", + ok (lstrcmpiW(L"Tahoma", familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); expect(Ok, stat); @@ -362,26 +357,26 @@ static void test_fontfamily (void) GpStatus stat; /* FontFamily cannot be NULL */ - stat = GdipCreateFontFamilyFromName (Tahoma , NULL, NULL); + stat = GdipCreateFontFamilyFromName (L"Tahoma" , NULL, NULL); expect (InvalidParameter, stat); /* FontFamily must be able to actually find the family. * If it can't, any subsequent calls should fail. */ - stat = GdipCreateFontFamilyFromName (nonexistent, NULL, &family); + stat = GdipCreateFontFamilyFromName (L"ThisFontShouldNotExist", NULL, &family); expect (FontFamilyNotFound, stat); /* Bitmap fonts are not found */ - stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); + stat = GdipCreateFontFamilyFromName (L"MS Sans Serif", NULL, &family); expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); - stat = GdipCreateFontFamilyFromName (Tahoma, NULL, &family); + stat = GdipCreateFontFamilyFromName (L"Tahoma", NULL, &family); expect (Ok, stat); stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName, Tahoma)); + expect (0, lstrcmpiW(itsName, L"Tahoma")); if (0) { @@ -398,7 +393,7 @@ static void test_fontfamily (void) GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); - expect(0, lstrcmpiW(itsName, Tahoma)); + expect(0, lstrcmpiW(itsName, L"Tahoma")); GdipDeleteFontFamily(clonedFontFamily); } @@ -409,7 +404,7 @@ static void test_fontfamily_properties (void) GpStatus stat; UINT16 result = 0; - stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &FontFamily); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &FontFamily); expect(Ok, stat); stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); @@ -429,7 +424,7 @@ static void test_fontfamily_properties (void) ok(result == 423, "Expected 423, got %d\n", result); GdipDeleteFontFamily(FontFamily); - stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); + stat = GdipCreateFontFamilyFromName(L"Times New Roman", NULL, &FontFamily); if(stat == FontFamilyNotFound) skip("Times New Roman not installed\n"); else @@ -533,7 +528,7 @@ static void test_heightgivendpi(void) REAL height; Unit unit; - stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &fontfamily); expect(Ok, stat); stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitPixel, &font); @@ -734,7 +729,7 @@ static void test_font_metrics(void) memset(&lf, 0, sizeof(lf)); /* Tahoma,-13 */ - lstrcpyW(lf.lfFaceName, Tahoma); + lstrcpyW(lf.lfFaceName, L"Tahoma"); lf.lfHeight = -13; stat = GdipCreateFontFromLogfontW(hdc, &lf, &font); expect(Ok, stat); @@ -775,7 +770,7 @@ static void test_font_metrics(void) GdipDeleteFont(font); /* Tahoma,13 */ - lstrcpyW(lf.lfFaceName, Tahoma); + lstrcpyW(lf.lfFaceName, L"Tahoma"); lf.lfHeight = 13; stat = GdipCreateFontFromLogfontW(hdc, &lf, &font); expect(Ok, stat); @@ -815,7 +810,7 @@ static void test_font_metrics(void) GdipDeleteFont(font); - stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, stat); /* Tahoma,13 */ @@ -892,7 +887,7 @@ static void test_font_substitution(void) GdipDeleteFont(font); GdipDeleteFontFamily(family); - status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); + status = GdipCreateFontFamilyFromName(L"ThisFontShouldNotExist", NULL, &family); ok(status == FontFamilyNotFound, "expected FontFamilyNotFound, got %d\n", status); /* nonexistent fonts fallback to Arial, or something else if it's missing */ @@ -1364,13 +1359,13 @@ static void test_CloneFont(void) expect(Ok, status); ok(collection == collection2, "got %p\n", collection2); - status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); + status = GdipCreateFontFamilyFromName(L"ThisFontShouldNotExist", NULL, &family); expect(FontFamilyNotFound, status); - status = GdipCreateFontFamilyFromName(nonexistent, collection, &family); + status = GdipCreateFontFamilyFromName(L"ThisFontShouldNotExist", collection, &family); expect(FontFamilyNotFound, status); - status = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); ret = is_family_in_collection(collection, family); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d1022b1af5b..9a09abcfc8b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3195,7 +3195,6 @@ static void test_string_functions(void) GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); - const WCHAR fontname[] = {'T','a','h','o','m','a',0}; const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; const WCHAR teststring2[] = {'j',0}; REAL char_width, char_height; @@ -3213,7 +3212,7 @@ static void test_string_functions(void) expect(Ok, status); ok(graphics != NULL, "Expected graphics to be initialized\n"); - status = GdipCreateFontFamilyFromName(fontname, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); status = GdipCreateFont(family, 10.0, FontStyleRegular, UnitPixel, &font); @@ -3744,7 +3743,6 @@ static void test_GdipMeasureString(void) { 200.0, 600.0, 1.0, UnitPixel }, { 200.0, 600.0, 2.0, UnitPixel }, }; - static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; GpStatus status; GpGraphics *graphics; @@ -3761,7 +3759,7 @@ static void test_GdipMeasureString(void) status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, status); - status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); /* font size in pixels */ @@ -4259,7 +4257,6 @@ static void test_pen_thickness(void) */ static void test_font_height_scaling(void) { - static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; HDC hdc; GpStringFormat *format; @@ -4281,7 +4278,7 @@ static void test_font_height_scaling(void) status = GdipCreateRegion(&region); expect(Ok, status); - status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); hdc = CreateCompatibleDC(0); @@ -4447,7 +4444,6 @@ cleanup: static void test_measure_string(void) { - static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[] = { 'A','0','1',0 }; static const WCHAR string2[] = { 'M',' ','M','M',0 }; HDC hdc; @@ -4470,7 +4466,7 @@ static void test_measure_string(void) status = GdipCreateRegion(&region); expect(Ok, status); - status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); hdc = CreateCompatibleDC(0); @@ -4919,7 +4915,6 @@ todo_wine static void test_measured_extra_space(void) { - static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[2] = { 'W','W' }; GpStringFormat *format; HDC hdc; @@ -4934,7 +4929,7 @@ static void test_measured_extra_space(void) status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, status); - status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + status = GdipCreateFontFamilyFromName(L"Tahoma", NULL, &family); expect(Ok, status); hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); -- 2.23.0

3 9

Re: Wine staging 6.0rc1 release
by Gerald Pfeifer Dec. 9, 2020

Dec. 9, 2020

Alistair Leslie-Hughes wrote: > * Rebased to current wine 6.0rc1 (740 patches are applied to wine vanilla) Thank you. Just a little ask: would you mind using the same version designator as Alexandre does? He's using 6.0-rc1 with a dash as opposed to 6.0rc1 without (cf. https://www.winehq.org/pipermail/wine-announce/2020-December/000504.html ). That kind of consistency makes life for packagers a little easier. Thanks, Gerald

1 0

[PATCH] ntoskrnl/tests: Use wide-char string literals in locale.c.
by Michael Stefaniuc Dec. 9, 2020

Dec. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 38 ++++++++---------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 +-- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dfc742eec3b..5617342d803 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -50,13 +50,6 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) return 0; } -static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; -static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','U','p','p','e','r',0}; -static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *lower_device, *upper_device; @@ -183,14 +176,8 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } -static const WCHAR driver2_path[] = { - '\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 -}; +static const WCHAR driver2_path[] = + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\WineTestDriver2"; static IMAGE_INFO test_image_info; static int test_load_image_notify_count; @@ -1163,8 +1150,6 @@ static void test_ob_reference(const WCHAR *test_path) SIZE_T len; NTSTATUS status; - static const WCHAR tmpW[] = {'.','t','m','p',0}; - pObGetObjectType = get_proc_address("ObGetObjectType"); if (!pObGetObjectType) win_skip("ObGetObjectType not found\n"); @@ -1174,9 +1159,9 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwCreateEvent failed: %#x\n", status); len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(tmpW)); + tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, tmpW, sizeof(tmpW)); + memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); RtlInitUnicodeString(&pathU, tmp_path); attr.ObjectName = &pathU; @@ -2487,7 +2472,7 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); IoDeleteDevice(upper_device); @@ -2496,9 +2481,6 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = {'I','o','D','r','i','v','e','r','O','b','j','e','c','t','T','y','p','e',0}; - static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; UNICODE_STRING nameW, linkW; NTSTATUS status; void *obj; @@ -2517,10 +2499,10 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + RtlInitUnicodeString(&nameW, L"IoDriverObjectType"); pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - RtlInitUnicodeString(&nameW, driver_nameW); + RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) return status; if (obj != driver) @@ -2530,8 +2512,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) } ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) @@ -2542,7 +2524,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) if (!status) { - RtlInitUnicodeString(&nameW, upper_name); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c2285aef6fc..2a7ebaa9599 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,7 +156,6 @@ static ULONG64 modified_value; static void main_test(void) { - static const WCHAR dokW[] = {'d','o','k',0}; WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; DWORD len, written, read; @@ -168,7 +167,7 @@ static void main_test(void) /* Create a temporary file that the driver will write ok/trace output to. */ GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, dokW, 0, pathW); + GetTempFileNameW(temppathW, L"dok", 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); len = pathU.Length + sizeof(WCHAR); -- 2.26.2

2 1

[PATCH] wmvcore/tests: Use wide-char string literals in locale.c.
by Michael Stefaniuc Dec. 9, 2020

Dec. 9, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 2b5a4555a35..fac9948d60e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -321,36 +321,31 @@ static void test_WMCreateWriterPriv(void) static void test_urlextension(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; - const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; - const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; - const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; hr = WMCheckURLExtension(NULL); ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mkvfile); + hr = WMCheckURLExtension(L"test.mkv"); ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mp3file); + hr = WMCheckURLExtension(L"test.mp3"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(urlfile); + hr = WMCheckURLExtension(L"abcd://test/test.wmv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(testurl); + hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } static void test_iscontentprotected(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; BOOL drm; hr = WMIsContentProtected(NULL, NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); hr = WMIsContentProtected(NULL, &drm); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, NULL); + hr = WMIsContentProtected(L"test.mp3", NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, &drm); + hr = WMIsContentProtected(L"test.mp3", &drm); ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); ok(drm == FALSE, "got %0dx\n", drm); } -- 2.26.2

1 0

[PATCH] gdi32: Fix gdi font leak in CreateScalableFontResourceW.
by Rémi Bernon Dec. 9, 2020

Dec. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50273 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..e76bb772eea 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6887,6 +6887,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, LPCWSTR resource_file, fontdir.dfReserved = 0; WideCharToMultiByte( CP_ACP, 0, (WCHAR *)font->otm.otmpFamilyName, -1, fontdir.szFaceName, LF_FACESIZE, NULL, NULL ); + free_gdi_font( font ); if (hidden) fontdir.dfType |= 0x80; return create_fot( resource_file, font_file, &fontdir ); -- 2.29.2

1 0

ntdll:exception crashes some Windows 10
by Francois Gouget Dec. 9, 2020

Dec. 9, 2020

So I have a problem with ntdll:exception: it crashes the Windows 10 VM I set up on my development TestBot machine. I'd appreciate any insight you may have. The VM is Windows 10 Pro 64-bit [1] with all updates all the way to 2020-11-03. And the following exception.c lines cause it to crash: dreg_test.dr0 = 0x42424240; dreg_test.dr2 = 0x126bb070; dreg_test.dr3 = 0x0badbad0; dreg_test.dr7 = 0xffff0115; run_exception_test(dreg_handler, &dreg_test, &segfault_code, sizeof(segfault_code), 0); Same thing for the next dreg_handler test a few lines down. None of the TestBot's Windows 10 VMs crash when running that code :-( More data: * The crash is 100% reproducible. * I get a BSOD saying KERNEL_SECURITY_CHECK_FAILURE * Looking in the event log I found the following: The computer has rebooted from a bugcheck. The bugcheck was: 0x00000139 (0x0000000000000004, 0xffff9f019bff5010, 0xffff9f019bff4f68, 0x0000000000000000). A dump was saved in: C:\Windows\MEMORY.DMP. Report Id: fb52dedb-eb5e-4010-b0ac-d17284efc806. * 0x139 does match KERNEL_SECURITY_CHECK_FAILURE. If I understand correctly its type is 0x4, i.e. reserved, which is not very helpful. https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/bug-chec… * The online resources are really not helpful. They suggest to: - Check the memory (in a VM? did so anyway, found nothing) - Run chkdsk /f c: (nothing) - Run sfc /scannow (found nothing) - Get the latest drivers. I use the QEmu 0.1.185 drivers (stable branch, same as the TestBot). - Disable the hyper-v network adapter. I use an e1000e network card (like in the official TestBot). * I use qemu 1:5.0-14~bpo10+1, like vm4 which runs w10pro64. * I use the same hardware configuration as the TestBot except for the CPU (Haswell-noTSX-IBRS instead of IvyBridge-IBRS) and 4 cores instead of 3. [1] Installed from Win10_2009_English_x64.19042.iso -- Francois Gouget <fgouget(a)codeweavers.com>

3 6

[PATCH vkd3d v3 1/5] vkd3d-shader: Implement an initial pass-through HLSL preprocessor.
by Zebediah Figura Dec. 9, 2020

Dec. 9, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: add the generated flex/bison files to CLEANFILES; avoid a bison warning by always setting the output file to preproc.tab.c; avoid YYEOF which is only available since bison 3.6 .gitignore | 3 + Makefile.am | 31 +++++++- configure.ac | 6 ++ libs/vkd3d-shader/preproc.h | 33 ++++++++ libs/vkd3d-shader/preproc.l | 99 ++++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 60 ++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 16 +++- libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++ tests/hlsl_d3d12.c | 31 ++++---- 9 files changed, 265 insertions(+), 22 deletions(-) create mode 100644 libs/vkd3d-shader/preproc.h create mode 100644 libs/vkd3d-shader/preproc.l create mode 100644 libs/vkd3d-shader/preproc.y diff --git a/.gitignore b/.gitignore index 63a9ffc6..b6d29d19 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,10 @@ vkd3d-*.tar.xz *.log *.o *.pc +*.tab.c +*.tab.h *.trs +*.yy.c *~ .deps diff --git a/Makefile.am b/Makefile.am index 5a6e4dc9..32c8777f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,33 @@ libvkd3d_common_la_SOURCES = \ lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la +VKD3D_V_FLEX = $(vkd3d_v_flex_(a)AM_V@) +vkd3d_v_flex_ = $(vkd3d_v_flex_(a)AM_DEFAULT_V@) +vkd3d_v_flex_0 = @echo " FLEX " $@; +vkd3d_v_flex_1 = + +VKD3D_V_BISON = $(vkd3d_v_bison_(a)AM_V@) +vkd3d_v_bison_ = $(vkd3d_v_bison_(a)AM_DEFAULT_V@) +vkd3d_v_bison_0 = @echo " BISON " $@; +vkd3d_v_bison_1 = + +libs/vkd3d-shader/preproc.yy.c: libs/vkd3d-shader/preproc.l + $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< + +libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-shader/preproc.y + $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< + +BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h + +vkd3d_shader_yyfiles = \ + libs/vkd3d-shader/preproc.tab.c \ + libs/vkd3d-shader/preproc.tab.h \ + libs/vkd3d-shader/preproc.yy.c + +CLEANFILES = $(vkd3d_shader_yyfiles) + +nodist_libvkd3d_shader_la_SOURCES = $(vkd3d_shader_yyfiles) + libvkd3d_shader_la_SOURCES = \ include/private/list.h \ include/private/rbtree.h \ @@ -122,7 +149,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ +libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -173,7 +200,7 @@ EXTRA_DIST = ANNOUNCE LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers) nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc -CLEANFILES = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc +CLEANFILES += libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc EXTRA_DIST += \ libs/vkd3d/libvkd3d.pc.in \ libs/vkd3d-shader/libvkd3d-shader.pc.in \ diff --git a/configure.ac b/configure.ac index 2f22b05f..b7902b63 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,12 @@ AC_PROG_MKDIR_P VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) +AC_CHECK_PROGS([FLEX], [flex], [none]) +AS_IF([test "$FLEX" = "none"], [AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])]) + +AC_CHECK_PROGS([BISON], [bison], [none]) +AS_IF([test "$BISON" = "none"], [AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])]) + DX_PS_FEATURE([OFF]) DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc]) AC_CONFIG_FILES([Doxyfile]) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h new file mode 100644 index 00000000..cbd93229 --- /dev/null +++ b/libs/vkd3d-shader/preproc.h @@ -0,0 +1,33 @@ +/* + * HLSL preprocessor + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ + +#ifndef __VKD3D_SHADER_PREPROC_H +#define __VKD3D_SHADER_PREPROC_H + +#include "vkd3d_shader_private.h" + +struct preproc_ctx +{ + void *scanner; + + struct vkd3d_string_buffer buffer; +}; + +#endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l new file mode 100644 index 00000000..656ad674 --- /dev/null +++ b/libs/vkd3d-shader/preproc.l @@ -0,0 +1,99 @@ +/* + * HLSL preprocessor + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ + +%{ + +#include "preproc.tab.h" + +#define YYSTYPE PREPROC_YYSTYPE +#define YYLTYPE PREPROC_YYLTYPE + +#define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) + +%} + +%option 8bit +%option bison-bridge +%option bison-locations +%option extra-type="struct preproc_ctx *" +%option never-interactive +%option noinput +%option nounput +%option noyywrap +%option prefix="preproc_yy" +%option reentrant + +WS [ \t] + +%% + +{WS}+ {} +. {return T_TEXT;} + +%% + +int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) +{ + struct preproc_ctx *ctx = yyget_extra(scanner); + + for (;;) + { + const char *text; + int token; + + if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + return 0; + text = yyget_text(scanner); + + TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + + vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); + } +} + +int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) +{ + struct preproc_ctx ctx = {0}; + YY_BUFFER_STATE top_buffer; + void *output_code; + + vkd3d_string_buffer_init(&ctx.buffer); + + yylex_init_extra(&ctx, &ctx.scanner); + top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); + + preproc_yyparse(ctx.scanner, &ctx); + + yy_delete_buffer(top_buffer, ctx.scanner); + yylex_destroy(ctx.scanner); + + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) + { + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + memcpy(output_code, ctx.buffer.buffer, ctx.buffer.content_size); + out->size = ctx.buffer.content_size; + out->code = output_code; + vkd3d_string_buffer_trace(&ctx.buffer); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_OK; +} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y new file mode 100644 index 00000000..92448f24 --- /dev/null +++ b/libs/vkd3d-shader/preproc.y @@ -0,0 +1,60 @@ +/* + * HLSL preprocessor + * + * Copyright 2020 Zebediah Figura for CodeWeavers + * + * 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 + */ + +%code requires +{ + +#include "vkd3d_shader_private.h" +#include "preproc.h" + +} + +%code provides +{ + +int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, void *scanner); + +} + +%code +{ + +static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) +{ + FIXME("Error reporting is not implemented.\n"); +} + +} + +%define api.prefix {preproc_yy} +%define api.pure full +%define parse.error verbose +%expect 0 +%locations +%lex-param {yyscan_t scanner} +%parse-param {void *scanner} +%parse-param {struct preproc_ctx *ctx} + +%token T_TEXT + +%% + +shader_text + : %empty diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1a029246..eed0316c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -78,8 +78,7 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * } } -static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, - const char *format, ...) +int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; int ret; @@ -91,7 +90,7 @@ static int VKD3D_PRINTF_FUNC(2, 3) vkd3d_string_buffer_printf(struct vkd3d_strin return ret; } -static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) +void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) { const char *p, *q, *end = buffer->buffer + buffer->content_size; @@ -1154,6 +1153,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + struct vkd3d_shader_message_context message_context; int ret; TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); @@ -1164,5 +1164,13 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; - return VKD3D_ERROR_NOT_IMPLEMENTED; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); + + ret = preproc_lexer_parse(compile_info, out, &message_context); + + vkd3d_shader_message_context_trace_messages(&message_context); + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); + return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5ae5724a..83038384 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -837,6 +837,11 @@ struct vkd3d_string_buffer enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, + const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +#define vkd3d_string_buffer_trace(buffer) \ + vkd3d_string_buffer_trace_(buffer, __FUNCTION__) +void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; struct vkd3d_shader_message_context @@ -882,6 +887,9 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_ void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; +int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) { diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4f4cc37f..787355ba 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -30,22 +30,20 @@ static void check_preprocess_(int line, const char *source, const D3D_SHADER_MAC HRESULT hr; hr = D3DPreprocess(source, strlen(source), NULL, macros, include, &blob, &errors); - todo ok_(line)(hr == S_OK, "Failed to preprocess shader, hr %#x.\n", hr); + assert_that_(line)(hr == S_OK, "Failed to preprocess shader, hr %#x.\n", hr); if (errors) { if (vkd3d_test_state.debug_level) trace_(line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); ID3D10Blob_Release(errors); } - if (hr != S_OK) - return; code = ID3D10Blob_GetBufferPointer(blob); size = ID3D10Blob_GetBufferSize(blob); if (present) ok_(line)(vkd3d_memmem(code, size, present, strlen(present)), "\"%s\" not found in preprocessed shader.\n", present); if (absent) - ok_(line)(!vkd3d_memmem(code, size, absent, strlen(absent)), + assert_that_(line)(!vkd3d_memmem(code, size, absent, strlen(absent)), "\"%s\" found in preprocessed shader.\n", absent); ID3D10Blob_Release(blob); } @@ -352,7 +350,8 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); + todo_if (i != 5 && i != 8 && i != 42) + check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -360,16 +359,16 @@ static void test_preprocess(void) macros[0].Definition = "value"; macros[1].Name = NULL; macros[1].Definition = NULL; - check_preprocess("KEY", macros, NULL, "value", "KEY"); + todo check_preprocess("KEY", macros, NULL, "value", "KEY"); - check_preprocess("#undef KEY\nKEY", macros, NULL, "KEY", "value"); + todo check_preprocess("#undef KEY\nKEY", macros, NULL, "KEY", "value"); macros[0].Name = NULL; - check_preprocess("KEY", macros, NULL, "KEY", "value"); + todo check_preprocess("KEY", macros, NULL, "KEY", "value"); macros[0].Name = "KEY"; macros[0].Definition = NULL; - check_preprocess("KEY", macros, NULL, NULL, "KEY"); + todo check_preprocess("KEY", macros, NULL, NULL, "KEY"); macros[0].Name = "0"; macros[0].Definition = "value"; @@ -377,7 +376,7 @@ static void test_preprocess(void) macros[0].Name = "KEY(a)"; macros[0].Definition = "value"; - check_preprocess("KEY(a)", macros, NULL, "KEY", "value"); + todo check_preprocess("KEY(a)", macros, NULL, "KEY", "value"); macros[0].Name = "KEY"; macros[0].Definition = "value1"; @@ -385,33 +384,33 @@ static void test_preprocess(void) macros[1].Definition = "value2"; macros[2].Name = NULL; macros[2].Definition = NULL; - check_preprocess("KEY", macros, NULL, "value2", NULL); + todo check_preprocess("KEY", macros, NULL, "value2", NULL); macros[0].Name = "KEY"; macros[0].Definition = "KEY2"; macros[1].Name = "KEY2"; macros[1].Definition = "value"; - check_preprocess("KEY", macros, NULL, "value", NULL); + todo check_preprocess("KEY", macros, NULL, "value", NULL); macros[0].Name = "KEY2"; macros[0].Definition = "value"; macros[1].Name = "KEY"; macros[1].Definition = "KEY2"; - check_preprocess("KEY", macros, NULL, "value", NULL); + todo check_preprocess("KEY", macros, NULL, "value", NULL); - check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); + todo check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); ok(!refcount_file1, "Got %d references to file1.\n", refcount_file1); ok(!refcount_file2, "Got %d references to file1.\n", refcount_file2); ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ - check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + todo check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr); - ok(blob == (ID3D10Blob *)0xdeadbeef, "Expected no compiled shader blob.\n"); + todo ok(blob == (ID3D10Blob *)0xdeadbeef, "Expected no compiled shader blob.\n"); todo ok(!!errors, "Expected non-NULL error blob.\n"); if (errors) { -- 2.29.2

4 14

[PATCH vkd3d] vkd3d: Fix misplaced parenthesis.
by Andrey Gusev Dec. 9, 2020

Dec. 9, 2020

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bef6477..a63fc92 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -417,7 +417,7 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) callback_info.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; callback_info.pfnCallback = vkd3d_debug_report_callback; callback_info.pUserData = NULL; - if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback)) < 0)) + if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_instance, &callback_info, NULL, &callback))) < 0) { WARN("Failed to create debug report callback, vr %d.\n", vr); return; -- 2.28.0

2 1

[PATCH 2/2] wined3d: Use an sRGB fallback format for sRGB formats in wined3d_swapchain_vk_select_vk_format().
by Henri Verbeet Dec. 9, 2020

Dec. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50121 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ffffc18aa84..0c5a75ed02d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -635,6 +635,22 @@ done: return supported; } +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: + return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: + case VK_FORMAT_R16G16B16A16_SFLOAT: + return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static VkFormat wined3d_swapchain_vk_select_vk_format(struct wined3d_swapchain_vk *swapchain_vk, VkSurfaceKHR vk_surface) { @@ -684,7 +700,7 @@ static VkFormat wined3d_swapchain_vk_select_vk_format(struct wined3d_swapchain_v if (i == format_count) { /* Try to create a swapchain with format conversion. */ - vk_format = VK_FORMAT_B8G8R8A8_UNORM; + vk_format = get_swapchain_fallback_format(vk_format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_d3dformat(desc->backbuffer_format)); for (i = 0; i < format_count; ++i) { -- 2.20.1

1 0

[PATCH 1/2] wined3d: Ensure the last mip-level is at least large enough to hold a single compressed block.
by Henri Verbeet Dec. 9, 2020

Dec. 9, 2020

This fixes a regression exposed by commit ca0c3f770ae4fe4d535f59f2d54b4c0a531e800f, but probably originally introduced by commit 3f7e5d647e40ce09292e7164eb5cc49ac77914cc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48362 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6c9627d21f8..69f948c5fd2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3683,6 +3683,20 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (!offset) return WINED3DERR_INVALIDCALL; + /* Ensure the last mip-level is at least large enough to hold a single + * compressed block. It is questionable how useful these mip-levels are to + * the application with "broken pitch" formats, but we want to avoid + * memory corruption when loading textures into WINED3D_LOCATION_SYSMEM. */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_BROKEN_PITCH) + { + unsigned int min_size; + + min_size = texture->sub_resources[level_count * layer_count - 1].offset + format->block_byte_count; + min_size = (min_size + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1); + if (min_size > offset) + offset = min_size; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->bind_flags, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) -- 2.20.1

1 0

[PATCH] winegstreamer: Remove the color matrix setting for the other videoconvert as well.
by Zebediah Figura Dec. 9, 2020

Dec. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49535 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 77204bc55a2..9114e6610a3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1041,9 +1041,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } - /* Avoid expensive color matrix conversions. */ - gst_util_set_object_arg(G_OBJECT(vconv2), "matrix-mode", "none"); - /* The bin takes ownership of these elements. */ gst_bin_add(GST_BIN(This->container), deinterlace); gst_element_sync_state_with_parent(deinterlace); -- 2.29.2

1 0

[PATCH] iphlpapi/tests: Skip Get[Icmp|Ip|Udp]StatisticsEx AF_INET6 tests on platforms where support is missing.
by Gijs Vermeulen Dec. 8, 2020

Dec. 8, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 105 +++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..203aefb9f69 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -579,16 +579,21 @@ static void testGetIcmpStatisticsEx(void) } apiReturn = GetIcmpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetIcmpStatisticsEx(AF_INET6) not supported\n"); + else { - INT i; - trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); - trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); - trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); - for (i = 0; i < 256; i++) - trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIcmpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + INT i; + trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); + trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); + trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); + for (i = 0; i < 256; i++) + trace( " rgdwTypeCount[%3i]: %8u %8u\n", i, stats.icmpInStats.rgdwTypeCount[i], stats.icmpOutStats.rgdwTypeCount[i] ); + } } } @@ -636,34 +641,39 @@ static void testGetIpStatisticsEx(void) } apiReturn = GetIpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetIpStatisticsEx(AF_INET6) not supported\n"); + else { - trace( "IP IPv6 Ex stats:\n" ); - trace( " dwForwarding: %u\n", U(stats).dwForwarding ); - trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); - trace( " dwInReceives: %u\n", stats.dwInReceives ); - trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); - trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); - trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); - trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); - trace( " dwInDiscards: %u\n", stats.dwInDiscards ); - trace( " dwInDelivers: %u\n", stats.dwInDelivers ); - trace( " dwOutRequests: %u\n", stats.dwOutRequests ); - trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); - trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); - trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); - trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); - trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); - trace( " dwReasmOks: %u\n", stats.dwReasmOks ); - trace( " dwReasmFails: %u\n", stats.dwReasmFails ); - trace( " dwFragOks: %u\n", stats.dwFragOks ); - trace( " dwFragFails: %u\n", stats.dwFragFails ); - trace( " dwFragCreates: %u\n", stats.dwFragCreates ); - trace( " dwNumIf: %u\n", stats.dwNumIf ); - trace( " dwNumAddr: %u\n", stats.dwNumAddr ); - trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "IP IPv6 Ex stats:\n" ); + trace( " dwForwarding: %u\n", U(stats).dwForwarding ); + trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); + trace( " dwInReceives: %u\n", stats.dwInReceives ); + trace( " dwInHdrErrors: %u\n", stats.dwInHdrErrors ); + trace( " dwInAddrErrors: %u\n", stats.dwInAddrErrors ); + trace( " dwForwDatagrams: %u\n", stats.dwForwDatagrams ); + trace( " dwInUnknownProtos: %u\n", stats.dwInUnknownProtos ); + trace( " dwInDiscards: %u\n", stats.dwInDiscards ); + trace( " dwInDelivers: %u\n", stats.dwInDelivers ); + trace( " dwOutRequests: %u\n", stats.dwOutRequests ); + trace( " dwRoutingDiscards: %u\n", stats.dwRoutingDiscards ); + trace( " dwOutDiscards: %u\n", stats.dwOutDiscards ); + trace( " dwOutNoRoutes: %u\n", stats.dwOutNoRoutes ); + trace( " dwReasmTimeout: %u\n", stats.dwReasmTimeout ); + trace( " dwReasmReqds: %u\n", stats.dwReasmReqds ); + trace( " dwReasmOks: %u\n", stats.dwReasmOks ); + trace( " dwReasmFails: %u\n", stats.dwReasmFails ); + trace( " dwFragOks: %u\n", stats.dwFragOks ); + trace( " dwFragFails: %u\n", stats.dwFragFails ); + trace( " dwFragCreates: %u\n", stats.dwFragCreates ); + trace( " dwNumIf: %u\n", stats.dwNumIf ); + trace( " dwNumAddr: %u\n", stats.dwNumAddr ); + trace( " dwNumRoutes: %u\n", stats.dwNumRoutes ); + } } } @@ -752,16 +762,21 @@ static void testGetUdpStatisticsEx(void) } apiReturn = GetUdpStatisticsEx(&stats, AF_INET6); - ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), - "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (!strcmp(winetest_platform, "wine") && apiReturn == ERROR_NOT_SUPPORTED) + skip("GetUdpStatisticsEx(AF_INET6) not supported\n"); + else { - trace( "UDP IPv6 Ex stats:\n" ); - trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); - trace( " dwNoPorts: %u\n", stats.dwNoPorts ); - trace( " dwInErrors: %u\n", stats.dwInErrors ); - trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); - trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + ok(apiReturn == NO_ERROR || broken(apiReturn == ERROR_NOT_SUPPORTED), + "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + trace( "UDP IPv6 Ex stats:\n" ); + trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); + trace( " dwNoPorts: %u\n", stats.dwNoPorts ); + trace( " dwInErrors: %u\n", stats.dwInErrors ); + trace( " dwOutDatagrams: %u\n", stats.dwOutDatagrams ); + trace( " dwNumAddrs: %u\n", stats.dwNumAddrs ); + } } } -- 2.29.2

1 0