May 2024 - Wine-Commits - list.winehq.org

Eric Pouech : winedump: Demangle std::nullptr_t datatype.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 3a95341ef6d0777132a069c5b179fd07f88ab1ad URL: https://gitlab.winehq.org/wine/wine/-/commit/3a95341ef6d0777132a069c5b179fd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 30 18:38:07 2023 +0100 winedump: Demangle std::nullptr_t datatype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/msmangle.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d24a9f0b881..94e91706585 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -1050,6 +1050,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!get_qualified_type(ct, sym, '$', flags)) goto done; } + else if (*sym->current == 'T') + { + sym->current++; + ct->left = str_printf(sym, "std::nullptr_t"); + } break; } break;

1 0

Eric Pouech : msvcrt: Demangle std::nullptr_t datatype.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 2464b47d7813c9ba7fb2efd88f172905b3579fb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2464b47d7813c9ba7fb2efd88f1729… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 30 18:38:07 2023 +0100 msvcrt: Demangle std::nullptr_t datatype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/undname.c | 5 +++++ dlls/ucrtbase/tests/cpp.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 6b255109e1f..55661f21e2b 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1160,6 +1160,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!get_qualified_type(ct, sym, '$', flags)) goto done; } + else if (*sym->current == 'T') + { + sym->current++; + ct->left = str_printf(sym, "std::nullptr_t"); + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index c20f889d686..7f63a1216a0 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -220,6 +220,9 @@ static void test___unDName(void) "struct my_iter<int,0>", NULL, UNDNAME_NO_ARGUMENTS}, +/* 8 */ {"??$foo(a)J_W$$T(a)bar@@YAJQB_W$$THQAUgod@@@Z", + "long __cdecl bar::foo<long,wchar_t,std::nullptr_t>(wchar_t const * const,std::nullptr_t,int,struct god * const)"}, + }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++)

1 0

Esme Povirk : gdiplus: Support anchors on thin paths.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: b7caffea25b4a066301dbd4007c3f4e92e2f3fab URL: https://gitlab.winehq.org/wine/wine/-/commit/b7caffea25b4a066301dbd4007c3f4… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 18:27:46 2024 +0000 gdiplus: Support anchors on thin paths. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 80 ++++++++++++++++++++++++++++++++++++- dlls/gdiplus/graphicspath.c | 91 +++++++++++++++++++++++++++++++----------- 3 files changed, 148 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c3b516a9a2b..c327d44af66 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -137,6 +137,8 @@ extern void free_installed_fonts(void); extern BOOL lengthen_path(GpPath *path, INT len); +extern GpStatus widen_flat_path_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, GpPath **anchors); + extern DWORD write_region_data(const GpRegion *region, void *data); extern DWORD write_path_data(GpPath *path, void *data); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 86c156354ef..7eea3f58c77 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3737,7 +3737,8 @@ end: static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; - GpPath* flat_path; + GpPath *flat_path, *anchor_path; + GpRegion *anchor_region; GpMatrix* transform; GpRectF gp_bound_rect; GpRect gp_output_area; @@ -3765,6 +3766,9 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (stat == Ok) stat = GdipFlattenPath(flat_path, transform, 1.0); + if (stat == Ok) + stat = widen_flat_path_anchors(flat_path, pen, 1.0, &anchor_path); + GdipDeleteMatrix(transform); } @@ -3788,6 +3792,18 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (ceilf(y) > output_area.bottom) output_area.bottom = ceilf(y); } + for (i=0; i<anchor_path->pathdata.Count; i++) + { + REAL x, y; + x = anchor_path->pathdata.Points[i].X; + y = anchor_path->pathdata.Points[i].Y; + + if (floorf(x) < output_area.left) output_area.left = floorf(x); + if (floorf(y) < output_area.top) output_area.top = floorf(y); + if (ceilf(x) > output_area.right) output_area.right = ceilf(x); + if (ceilf(y) > output_area.bottom) output_area.bottom = ceilf(y); + } + stat = get_graphics_device_bounds(graphics, &gp_bound_rect); } @@ -3804,6 +3820,7 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (output_width <= 0 || output_height <= 0) { GdipDeletePath(flat_path); + GdipDeletePath(anchor_path); return Ok; } @@ -4015,6 +4032,66 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa } } } + + /* draw anchors */ + stat = GdipCreateRegionPath(anchor_path, &anchor_region); + if (stat == Ok) + { + HRGN hrgn; + DWORD rgn_data_size; + RGNDATA *rgn_data; + RECT *rects; + INT x, y; + + stat = GdipCombineRegionRectI(anchor_region, &gp_output_area, CombineModeIntersect); + + if (stat == Ok) + stat = GdipGetRegionHRgn(anchor_region, NULL, &hrgn); + + if (stat == Ok) + { + rgn_data_size = GetRegionData(hrgn, 0, NULL); + + if (rgn_data_size) + { + rgn_data = malloc(rgn_data_size); + + if (rgn_data) + { + GetRegionData(hrgn, rgn_data_size, rgn_data); + + rects = (RECT*)&rgn_data->Buffer; + + for (i=0; i < rgn_data->rdh.nCount; i++) + { + RECT rc; + rc = rects[i]; + + OffsetRect(&rc, -output_area.left, -output_area.top); + + for (y = rc.top; y < rc.bottom; y++) + { + for (x = rc.left; x < rc.right; x++) + { + if (brush_bits) + output_bits[x + y*output_width] = brush_bits[x + y*output_width]; + else + output_bits[x + y*output_width] = ((GpSolidFill*)pen->brush)->color; + } + } + } + + free(rgn_data); + } + else + stat = OutOfMemory; + } + + DeleteObject(hrgn); + } + + GdipDeleteRegion(anchor_region); + } } /* draw output image */ @@ -4035,6 +4112,7 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa } GdipDeletePath(flat_path); + GdipDeletePath(anchor_path); return stat; } diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 662e20071aa..105df4cacfd 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2111,9 +2111,8 @@ static void widen_closed_figure(const GpPointF *points, int start, int end, GpPen *pen, REAL pen_width, path_list_node_t **last_point); static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, - GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) + GpPen *pen, REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) { - REAL pen_width = max(pen->width, 2.0); switch (cap) { default: @@ -2520,6 +2519,71 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, free(tmp_points); } +void widen_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, path_list_node_t** last_point) +{ + BYTE *types = flat_path->pathdata.Types; + int i, subpath_start=0; + + for (i=0; i < flat_path->pathdata.Count; i++) + { + if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + continue; + + if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) + subpath_start = i; + + if (i == flat_path->pathdata.Count-1 || + (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + { + if (pen->startcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[subpath_start], + &flat_path->pathdata.Points[subpath_start+1], + pen, pen_width, pen->startcap, pen->customstart, last_point); + + if (pen->endcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[i], + &flat_path->pathdata.Points[i-1], + pen, pen_width, pen->endcap, pen->customend, last_point); + } + } +} + +GpStatus widen_flat_path_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, GpPath **anchors) +{ + GpStatus stat; + path_list_node_t *points=NULL, *last_point=NULL; + + if (!flat_path || !pen) + return InvalidParameter; + + if (init_path_list(&points, 314.0, 22.0)) + { + last_point = points; + + stat = GdipCreatePath(flat_path->fill, anchors); + if (stat == Ok) + { + widen_anchors(flat_path, pen, pen_width, &last_point); + + if (!path_list_to_path(points->next, *anchors)) + stat = OutOfMemory; + + if (stat != Ok) + { + GdipDeletePath(*anchors); + *anchors = NULL; + } + } + free_path_list(points); + } + else + stat = OutOfMemory; + + /* FIXME: Apply insets to flat_path */ + + return stat; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -2586,28 +2650,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, } } - for (i=0; i < flat_path->pathdata.Count; i++) - { - if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) - continue; - - if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) - subpath_start = i; - - if (i == flat_path->pathdata.Count-1 || - (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) - { - if (pen->startcap & LineCapAnchorMask) - add_anchor(&flat_path->pathdata.Points[subpath_start], - &flat_path->pathdata.Points[subpath_start+1], - pen, pen->startcap, pen->customstart, &last_point); - - if (pen->endcap & LineCapAnchorMask) - add_anchor(&flat_path->pathdata.Points[i], - &flat_path->pathdata.Points[i-1], - pen, pen->endcap, pen->customend, &last_point); - } - } + widen_anchors(flat_path, pen, fmax(pen->width, 2.0), &last_point); if (!path_list_to_path(points->next, path)) status = OutOfMemory;

1 0

Tim Clem : winemac.drv: Exclude dictation when looking for input methods.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: d77006fd5a68a3aaefdeeb9985e4b39b67e58b2b URL: https://gitlab.winehq.org/wine/wine/-/commit/d77006fd5a68a3aaefdeeb9985e4b3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 15 13:09:51 2024 -0700 winemac.drv: Exclude dictation when looking for input methods. After a recent OS update, the dictation input source remains "selected" in *all* apps for about 10 minutes after it is activated, even when it is not in use. There doesn't seem to be any way to determine whether it's actually active or just lingering, and sending input to it regardless means that we falsely process input as if it was going to an IME. --- dlls/winemac.drv/cocoa_app.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f6a9cd145ea..61ab38cdc82 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2065,9 +2065,7 @@ static NSString* WineLocalizedString(unsigned int stringID) static BOOL InputSourceShouldBeIgnored(TISInputSourceRef inputSource) { /* Certain system utilities are technically input sources, but we - shouldn't consider them as such for our purposes. - Dictation is its own source too (com.apple.inputmethod.ironwood), but - it should receive keypresses; it cancels input on escape. */ + shouldn't consider them as such for our purposes. */ static CFStringRef ignoredIDs[] = { /* The "Emoji & Symbols" palette. */ CFSTR("com.apple.CharacterPaletteIM"), @@ -2077,6 +2075,11 @@ static NSString* WineLocalizedString(unsigned int stringID) CFSTR("com.apple.PressAndHold"), /* Emoji list on MacBooks with the Touch Bar. */ CFSTR("com.apple.inputmethod.EmojiFunctionRowItem"), + /* Dictation. Ideally this would actually receive key events, since + escape cancels it, but it remains a "selected" input source even + when not active, so we need to ignore it to avoid incorrectly + sending input to it. */ + CFSTR("com.apple.inputmethod.ironwood"), }; CFStringRef sourceID = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID);

1 0

Esme Povirk : gdiplus: Bitmap stride is ignored when Scan0 is non-NULL.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 079f533d9c6f3ee78a5c5e91a08220f2cfe93349 URL: https://gitlab.winehq.org/wine/wine/-/commit/079f533d9c6f3ee78a5c5e91a08220… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri May 3 14:25:24 2024 -0500 gdiplus: Bitmap stride is ignored when Scan0 is non-NULL. --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/graphics.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d3d4ec7de42..3a5e338c4ac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1817,7 +1817,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, row_size = (width * PIXELFORMATBPP(format)+7) / 8; dib_stride = (row_size + 3) & ~3; - if(stride == 0) + if(!scan0) stride = dib_stride; if (format & PixelFormatGDI && !(format & (PixelFormatAlpha|PixelFormatIndexed)) && !scan0) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ff6a64e1fb5..73e2a9b2c3a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -7406,6 +7406,76 @@ static void test_printer_dc(void) DeleteDC(hdc_printer); } +void test_bitmap_stride(void) +{ + GpStatus status; + GpBitmap *bitmap = NULL; + BitmapData locked_data; + GpRect bounds = {0, 0, 10, 10}; + BYTE buffer[400]; + BYTE *scan0; + int i; + struct { + INT stride; + BOOL use_scan0; + INT expected_stride; + GpStatus status; + } test_data[] = { + { 12, FALSE, 20 }, + { 40, FALSE, 20 }, + { 0, FALSE, 20 }, + { 20, FALSE, 20 }, + { -12, FALSE, 20 }, + { -32, FALSE, 20 }, + { 30, TRUE, 0, InvalidParameter }, + { 12, TRUE, 12 }, + { 40, TRUE, 40 }, + { 0, TRUE, 0, InvalidParameter }, + { 32, TRUE, 32 }, + { -12, TRUE, -12 }, + { -32, TRUE, -32 }, + { -13, TRUE, 0, InvalidParameter }, + }; + + for (i=0; i < ARRAY_SIZE(test_data); i++) + { + if (test_data[i].use_scan0) + { + if (test_data[i].stride >= 0) + scan0 = buffer; + else + scan0 = buffer + sizeof(buffer) + test_data[i].stride; + } + else + scan0 = NULL; + + winetest_push_context("%i: %i %i", i, test_data[i].stride, test_data[i].use_scan0); + + status = GdipCreateBitmapFromScan0(10, 10, test_data[i].stride, PixelFormat16bppGrayScale, scan0, &bitmap); + expect(test_data[i].status, status); + + if (status == Ok) + { + status = GdipBitmapLockBits(bitmap, &bounds, ImageLockModeRead, PixelFormat16bppGrayScale, &locked_data); + expect(Ok, status); + + expect(10, locked_data.Width); + expect(10, locked_data.Height); + expect(test_data[i].expected_stride, locked_data.Stride); + expect(PixelFormat16bppGrayScale, locked_data.PixelFormat); + if (test_data[i].use_scan0) + ok(locked_data.Scan0 == scan0, "got %p, expected %p\n", locked_data.Scan0, scan0); + + status = GdipBitmapUnlockBits(bitmap, &locked_data); + expect(Ok, status); + + GdipDisposeImage((GpImage*)bitmap); + } + + winetest_pop_context(); + } +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -7504,6 +7574,7 @@ START_TEST(graphics) test_gdi_interop_bitmap(); test_gdi_interop_hdc(); test_printer_dc(); + test_bitmap_stride(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Henri Verbeet : vkd3d-shader/dxil: Parse the shader into a vsir program in vkd3d_shader_sm6_parser_create().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: ce6f8a6a30b6b3d03f502c8f12bd4a89b641a0c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ce6f8a6a30b6b3d03f502c8f12bd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:29 2024 +0200 vkd3d-shader/dxil: Parse the shader into a vsir program in vkd3d_shader_sm6_parser_create(). --- libs/vkd3d-shader/d3dbc.c | 11 +--- libs/vkd3d-shader/dxil.c | 108 +++++++++++++------------------ libs/vkd3d-shader/tpf.c | 11 +--- libs/vkd3d-shader/vkd3d_shader_main.c | 38 ++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 +----- 5 files changed, 61 insertions(+), 126 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/tpf: Parse the shader into a vsir program in vkd3d_shader_sm4_parser_create().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: 6474e8cc7bc371d7b412b4e1622c6c2cdff0a1f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6474e8cc7bc371d7b412b4e1622c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:26 2024 +0200 vkd3d-shader/tpf: Parse the shader into a vsir program in vkd3d_shader_sm4_parser_create(). --- libs/vkd3d-shader/hlsl.c | 14 ++---- libs/vkd3d-shader/tpf.c | 78 ++++++++++---------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 4 files changed, 35 insertions(+), 69 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Do not store the vkd3d-shader configuration flags in struct vkd3d_shader_parser.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: efe9dfd73aac352fbe81e4baef3c3e54592ee484 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/efe9dfd73aac352fbe81e4baef3c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:16 2024 +0200 vkd3d-shader/ir: Do not store the vkd3d-shader configuration flags in struct vkd3d_shader_parser. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/hlsl.c | 7 ++++--- libs/vkd3d-shader/tpf.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 19 ++++++++++--------- libs/vkd3d-shader/vkd3d_shader_private.h | 13 ++++++------- 6 files changed, 26 insertions(+), 25 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Parse the shader into a vsir program in vkd3d_shader_sm1_parser_create().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: 402b96ef3bc219b060cd537f6dc9f5ff2bf59a2c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/402b96ef3bc219b060cd537f6dc9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:22 2024 +0200 vkd3d-shader/d3dbc: Parse the shader into a vsir program in vkd3d_shader_sm1_parser_create(). --- libs/vkd3d-shader/d3dbc.c | 57 +++++++++----------------------- libs/vkd3d-shader/hlsl.c | 14 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 34 +++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 4 files changed, 51 insertions(+), 58 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Pass an initialised vsir_program structure to vkd3d_shader_parser_init().
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: vkd3d Branch: master Commit: 19b552ce1b803e95363427b40204a3ef580058c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/19b552ce1b803e95363427b40204a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:12 2024 +0200 vkd3d-shader/ir: Pass an initialised vsir_program structure to vkd3d_shader_parser_init(). --- libs/vkd3d-shader/d3dbc.c | 11 +++++++++-- libs/vkd3d-shader/dxil.c | 11 ++++++++--- libs/vkd3d-shader/ir.c | 1 + libs/vkd3d-shader/tpf.c | 10 ++++++++-- libs/vkd3d-shader/vkd3d_shader_main.c | 13 +++---------- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2e37549f..43d4374a 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1242,6 +1242,7 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, const uint32_t *code = compile_info->source.code; size_t code_size = compile_info->source.size; struct vkd3d_shader_version version; + struct vsir_program *program; uint16_t shader_type; size_t token_count; @@ -1289,10 +1290,16 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, sm1->start = &code[1]; sm1->end = &code[token_count]; + if (!(program = vkd3d_malloc(sizeof(*program)))) + return VKD3D_ERROR_OUT_OF_MEMORY; /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!vkd3d_shader_parser_init(&sm1->p, message_context, compile_info->source_name, &version, &shader_sm1_parser_ops, - code_size != ~(size_t)0 ? token_count / 4u + 4 : 16)) + if (!vsir_program_init(program, &version, code_size != ~(size_t)0 ? token_count / 4u + 4 : 16)) + { + vkd3d_free(program); return VKD3D_ERROR_OUT_OF_MEMORY; + } + + vkd3d_shader_parser_init(&sm1->p, program, message_context, compile_info->source_name, &shader_sm1_parser_ops); sm1->ptr = sm1->start; return VKD3D_OK; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3f65f521..7275489f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -10250,14 +10250,19 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const char *sou return VKD3D_ERROR_INVALID_SHADER; } + if (!(program = vkd3d_malloc(sizeof(*program)))) + return VKD3D_ERROR_OUT_OF_MEMORY; /* Estimate instruction count to avoid reallocation in most shaders. */ count = max(token_count, 400) - 400; - vkd3d_shader_parser_init(&sm6->p, message_context, source_name, &version, &sm6_parser_ops, - (count + (count >> 2)) / 2u + 10); + if (!vsir_program_init(program, &version, (count + (count >> 2)) / 2u + 10)) + { + vkd3d_free(program); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + vkd3d_shader_parser_init(&sm6->p, program, message_context, source_name, &sm6_parser_ops); sm6->ptr = &sm6->start[1]; sm6->bitpos = 2; - program = sm6->p.program; input_signature = &program->input_signature; output_signature = &program->output_signature; patch_constant_signature = &program->patch_constant_signature; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 2c78447e..37818d4d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -21,6 +21,7 @@ bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve) { + memset(program, 0, sizeof(*program)); program->shader_version = *version; return shader_instruction_array_init(&program->instructions, reserve); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 704c904f..e7301d72 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2517,6 +2517,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t { struct vkd3d_shader_version version; uint32_t version_token, token_count; + struct vsir_program *program; if (byte_code_size / sizeof(*byte_code) < 2) { @@ -2570,10 +2571,15 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t version.major = VKD3D_SM4_VERSION_MAJOR(version_token); version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + if (!(program = vkd3d_malloc(sizeof(*program)))) + return false; /* Estimate instruction count to avoid reallocation in most shaders. */ - if (!vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops, - token_count / 7u + 20)) + if (!vsir_program_init(program, &version, token_count / 7u + 20)) + { + vkd3d_free(program); return false; + } + vkd3d_shader_parser_init(&sm4->p, program, message_context, source_name, &shader_sm4_parser_ops); sm4->ptr = sm4->start; init_sm4_lookup_tables(&sm4->lookup); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 89434b0a..a25b5f4a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -554,24 +554,17 @@ static uint64_t vkd3d_shader_init_config_flags(void) return config_flags; } -bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vsir_program *program, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, - unsigned int instruction_reserve) + const struct vkd3d_shader_parser_ops *ops) { - bool ret; - parser->message_context = message_context; parser->location.source_name = source_name; parser->location.line = 1; parser->location.column = 0; parser->ops = ops; parser->config_flags = vkd3d_shader_init_config_flags(); - if (!(parser->program = vkd3d_calloc(1, sizeof(*parser->program)))) - return false; - if (!(ret = vsir_program_init(parser->program, version, instruction_reserve))) - vkd3d_free(parser->program); - return ret; + parser->program = program; } void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1a1d01e7..196d92ef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1407,10 +1407,9 @@ struct vkd3d_shader_parser_ops void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vsir_program *program, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops, - unsigned int instruction_reserve); + const struct vkd3d_shader_parser_ops *ops); void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4);

1 0