- Wine-Commits - list.winehq.org

Esme Povirk : gdiplus: Restore hdc argument to gdip_format_string.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: c37fea89e6202e82e91d6af75f94441a76a9c130 URL: https://gitlab.winehq.org/wine/wine/-/commit/c37fea89e6202e82e91d6af75f9444… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 23 20:19:14 2024 +0000 gdiplus: Restore hdc argument to gdip_format_string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56345 --- dlls/gdiplus/gdiplus_private.h | 3 ++- dlls/gdiplus/graphics.c | 27 ++++++++++++++------------- dlls/gdiplus/graphicspath.c | 6 +++--- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c88b5407257..1ae03d7126e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -621,6 +621,7 @@ struct gdip_font_link_info { struct gdip_format_string_info { GpGraphics *graphics; + HDC hdc; GDIPCONST WCHAR *string; INT index; INT length; @@ -636,7 +637,7 @@ struct gdip_format_string_info { typedef GpStatus (*gdip_format_string_callback)(struct gdip_format_string_info *info); -GpStatus gdip_format_string(GpGraphics *graphics, +GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 74271a49418..85b25e1ac24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5217,7 +5217,7 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD IUnknown_Release(unk); get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL); - IMLangFontLink_GetFontCodePages(iMLFL, info->graphics->hdc, hfont, &font_codepages); + IMLangFontLink_GetFontCodePages(iMLFL, info->hdc, hfont, &font_codepages); while (progress < length) { @@ -5232,10 +5232,10 @@ static void generate_font_link_info(struct gdip_format_string_info *info, DWORD } else { - IMLangFontLink_MapFont(iMLFL, info->graphics->hdc, string_codepages, hfont, &map_hfont); - old_font = SelectObject(info->graphics->hdc, map_hfont); - GdipCreateFontFromDC(info->graphics->hdc, &gpfont); - SelectObject(info->graphics->hdc, old_font); + IMLangFontLink_MapFont(iMLFL, info->hdc, string_codepages, hfont, &map_hfont); + old_font = SelectObject(info->hdc, map_hfont); + GdipCreateFontFromDC(info->hdc, &gpfont); + SelectObject(info->hdc, old_font); IMLangFontLink_ReleaseFont(iMLFL, map_hfont); section->font = gpfont; } @@ -5271,9 +5271,9 @@ static void font_link_get_text_extent_point(struct gdip_format_string_info *info to_measure_length = min(length - (i - index), section->end - i); get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL); - oldhfont = SelectObject(info->graphics->hdc, hfont); - GetTextExtentExPointW(info->graphics->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux); - SelectObject(info->graphics->hdc, oldhfont); + oldhfont = SelectObject(info->hdc, hfont); + GetTextExtentExPointW(info->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux); + SelectObject(info->hdc, oldhfont); DeleteObject(hfont); max_ext -= sizeaux.cx; @@ -5301,7 +5301,7 @@ static void release_font_link_info(struct gdip_font_link_info *font_link_info) } } -GpStatus gdip_format_string(GpGraphics *graphics, +GpStatus gdip_format_string(GpGraphics *graphics, HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) @@ -5321,6 +5321,7 @@ GpStatus gdip_format_string(GpGraphics *graphics, struct gdip_format_string_info info; info.graphics = graphics; + info.hdc = hdc; info.rect = rect; info.bounds = &bounds; info.user_data = user_data; @@ -5645,7 +5646,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, gdi_transform_acquire(graphics); - stat = gdip_format_string(graphics, string, length, font, &scaled_rect, stringFormat, + stat = gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, stringFormat, (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); gdi_transform_release(graphics); @@ -5755,7 +5756,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, gdi_transform_acquire(graphics); - gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE, + gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); gdi_transform_release(graphics); @@ -5814,7 +5815,7 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info) REAL underline_y, underline_height; int i; - GetOutlineTextMetricsW(info->graphics->hdc, sizeof(otm), &otm); + GetOutlineTextMetricsW(info->hdc, sizeof(otm), &otm); underline_height = otm.otmsUnderscoreSize / args->rel_height; underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2; @@ -5942,7 +5943,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; - gdip_format_string(graphics, string, length, font, &scaled_rect, format, TRUE, + gdip_format_string(graphics, hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); gdi_transform_release(graphics); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 6009f941b7d..54d9f252c2f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1019,7 +1019,7 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) TTPOLYGONHEADER *ph = NULL, *origph; char *start; DWORD len, ofs = 0; - len = GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity); + len = GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity); if (len == GDI_ERROR) { status = GenericError; @@ -1033,7 +1033,7 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) status = OutOfMemory; break; } - GetGlyphOutlineW(info->graphics->hdc, info->string[i], GGO_BEZIER, &gm, len, start, &identity); + GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, len, start, &identity); ofs = 0; while (ofs < len) @@ -1161,7 +1161,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(graphics, string, length, NULL, &scaled_layout_rect, + status = gdip_format_string(graphics, dc, string, length, NULL, &scaled_layout_rect, format, TRUE, format_string_callback, &args); DeleteDC(dc);

1 0

Alexandre Julliard : ntdll: Add a wrapper macro for ARM64EC syscalls.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 0c59e8622bbd51331a6bb3d0bc7b2a47a9c59a66 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c59e8622bbd51331a6bb3d0bc7b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 12:42:29 2024 +0100 ntdll: Add a wrapper macro for ARM64EC syscalls. --- dlls/ntdll/signal_arm64ec.c | 463 ++++++++++++++++++++++---------------------- 1 file changed, 232 insertions(+), 231 deletions(-)

1 0

Zebediah Figura : shell32: Also zero-initialize the background menu.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: f7c665fd6ec73bdd781e2f5c3fac41c606172865 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7c665fd6ec73bdd781e2f5c3fac41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 17:10:32 2024 -0600 shell32: Also zero-initialize the background menu. Fixes: 063a377df4fe7d9118dec1d4fd198f97c2eba710 --- dlls/shell32/shlview_cmenu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 9057d7c0175..a5592d3c830 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1541,8 +1541,8 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri ContextMenu *This; HRESULT hr; - This = malloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!(This = calloc(1, sizeof(*This)))) + return E_OUTOFMEMORY; This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; This->IShellExtInit_iface.lpVtbl = &ShellExtInitVtbl; @@ -1550,10 +1550,6 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri This->ref = 1; This->parent = parent; - This->pidl = NULL; - This->apidl = NULL; - This->cidl = 0; - This->desktop = desktop; if (parent) IShellFolder_AddRef(parent);

1 0

Esme Povirk : gdiplus: Switch to a struct for gdip_format_string callback args.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: f2c92c68a21bdda69df0bd24023a658e5e8f9032 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2c92c68a21bdda69df0bd24023a65… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 23 19:48:59 2024 +0000 gdiplus: Switch to a struct for gdip_format_string callback args. --- dlls/gdiplus/gdiplus_private.h | 22 +++++--- dlls/gdiplus/graphics.c | 116 ++++++++++++++++++++--------------------- dlls/gdiplus/graphicspath.c | 24 ++++----- 3 files changed, 83 insertions(+), 79 deletions(-)

1 0

Esme Povirk : gdiplus: Pass gdip_format_string_info to font link functions.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 0d0d37bbea2c59820d35082007dbedc0bd531c65 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d0d37bbea2c59820d35082007dbed… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Feb 23 20:05:12 2024 +0000 gdiplus: Pass gdip_format_string_info to font link functions. --- dlls/gdiplus/graphics.c | 51 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b7f10d9f56d..74271a49418 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5199,8 +5199,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w } /* Populates gdip_font_link_info struct based on the base_font and input string */ -static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD length, GDIPCONST GpFont *base_font, - struct gdip_font_link_info *font_link_info) +static void generate_font_link_info(struct gdip_format_string_info *info, DWORD length, GDIPCONST GpFont *base_font) { IUnknown *unk; IMLangFontLink *iMLFL; @@ -5210,21 +5209,21 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l struct gdip_font_link_section *section; DWORD font_codepages, string_codepages; - list_init(&font_link_info->sections); - font_link_info->base_font = base_font; + list_init(&info->font_link_info.sections); + info->font_link_info.base_font = base_font; GetGlobalFontLinkObject((void**)&unk); IUnknown_QueryInterface(unk, &IID_IMLangFontLink, (void**)&iMLFL); IUnknown_Release(unk); - get_font_hfont(graphics, base_font, NULL, &hfont, NULL, NULL); - IMLangFontLink_GetFontCodePages(iMLFL, graphics->hdc, hfont, &font_codepages); + get_font_hfont(info->graphics, base_font, NULL, &hfont, NULL, NULL); + IMLangFontLink_GetFontCodePages(iMLFL, info->graphics->hdc, hfont, &font_codepages); while (progress < length) { section = calloc(1, sizeof(*section)); section->start = progress; - IMLangFontLink_GetStrCodePages(iMLFL, &string[progress], length - progress, + IMLangFontLink_GetStrCodePages(iMLFL, &info->string[progress], length - progress, font_codepages, &string_codepages, &processed); if (font_codepages & string_codepages) @@ -5233,16 +5232,16 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l } else { - IMLangFontLink_MapFont(iMLFL, graphics->hdc, string_codepages, hfont, &map_hfont); - old_font = SelectObject(graphics->hdc, map_hfont); - GdipCreateFontFromDC(graphics->hdc, &gpfont); - SelectObject(graphics->hdc, old_font); + IMLangFontLink_MapFont(iMLFL, info->graphics->hdc, string_codepages, hfont, &map_hfont); + old_font = SelectObject(info->graphics->hdc, map_hfont); + GdipCreateFontFromDC(info->graphics->hdc, &gpfont); + SelectObject(info->graphics->hdc, old_font); IMLangFontLink_ReleaseFont(iMLFL, map_hfont); section->font = gpfont; } section->end = section->start + processed; - list_add_tail(&font_link_info->sections, &section->entry); + list_add_tail(&info->font_link_info.sections, &section->entry); progress += processed; } @@ -5250,7 +5249,7 @@ static void generate_font_link_info(GpGraphics *graphics, WCHAR *string, DWORD l IMLangFontLink_Release(iMLFL); } -static void font_link_get_text_extent_point(struct gdip_font_link_info *font_link_info, GpGraphics *graphics, LPCWSTR string, +static void font_link_get_text_extent_point(struct gdip_format_string_info *info, INT index, int length, int max_ext, LPINT fit, SIZE *size) { DWORD to_measure_length; @@ -5265,16 +5264,16 @@ static void font_link_get_text_extent_point(struct gdip_font_link_info *font_lin if (fit) *fit = 0; - LIST_FOR_EACH_ENTRY(section, &font_link_info->sections, struct gdip_font_link_section, entry) + LIST_FOR_EACH_ENTRY(section, &info->font_link_info.sections, struct gdip_font_link_section, entry) { if (i >= section->end) continue; to_measure_length = min(length - (i - index), section->end - i); - get_font_hfont(graphics, section->font, NULL, &hfont, NULL, NULL); - oldhfont = SelectObject(graphics->hdc, hfont); - GetTextExtentExPointW(graphics->hdc, &string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux); - SelectObject(graphics->hdc, oldhfont); + get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL); + oldhfont = SelectObject(info->graphics->hdc, hfont); + GetTextExtentExPointW(info->graphics->hdc, &info->string[i], to_measure_length, max_ext, &fitaux, NULL, &sizeaux); + SelectObject(info->graphics->hdc, oldhfont); DeleteObject(hfont); max_ext -= sizeaux.cx; @@ -5393,10 +5392,10 @@ GpStatus gdip_format_string(GpGraphics *graphics, halign = format->align; - generate_font_link_info(graphics, stringdup, length, font, &info.font_link_info); + generate_font_link_info(&info, length, font); while(sum < length){ - font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, length - sum, nwidth, &fit, &size); + font_link_get_text_extent_point(&info, sum, length - sum, nwidth, &fit, &size); fitcpy = fit; if(fit == 0) @@ -5444,7 +5443,7 @@ GpStatus gdip_format_string(GpGraphics *graphics, else lineend = fit; - font_link_get_text_extent_point(&info.font_link_info, graphics, stringdup, sum, lineend, nwidth, &j, &size); + font_link_get_text_extent_point(&info, sum, lineend, nwidth, &j, &size); bounds.Width = size.cx; @@ -5566,10 +5565,10 @@ static GpStatus measure_ranges_callback(struct gdip_format_string_info *info) range_rect.Y = info->bounds->Y / args->rel_height; range_rect.Height = info->bounds->Height / args->rel_height; - font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_start - info->index, INT_MAX, NULL, &range_size); + font_link_get_text_extent_point(info, info->index, range_start - info->index, INT_MAX, NULL, &range_size); range_rect.X = (info->bounds->X + range_size.cx) / args->rel_width; - font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, range_end - info->index, INT_MAX, NULL, &range_size); + font_link_get_text_extent_point(info, info->index, range_end - info->index, INT_MAX, NULL, &range_size); range_rect.Width = (info->bounds->X + range_size.cx) / args->rel_width - range_rect.X; stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion); @@ -5800,7 +5799,7 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info) to_draw_length = min(info->length - (i - info->index), section->end - i); TRACE("index %d, todraw %ld, used %s\n", i, to_draw_length, section->font == info->font_link_info.base_font ? "base font" : "map"); - font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, i, to_draw_length, 0, NULL, &size); + font_link_get_text_extent_point(info, i, to_draw_length, 0, NULL, &size); stat = draw_driver_string(info->graphics, &info->string[i], to_draw_length, section->font, info->format, args->brush, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); @@ -5826,10 +5825,10 @@ static GpStatus draw_string_callback(struct gdip_format_string_info *info) SIZE text_size; INT ofs = info->underlined_indexes[i] - info->index; - font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs, INT_MAX, NULL, &text_size); + font_link_get_text_extent_point(info, info->index, ofs, INT_MAX, NULL, &text_size); start_x = text_size.cx / args->rel_width; - font_link_get_text_extent_point(&info->font_link_info, info->graphics, info->string, info->index, ofs+1, INT_MAX, NULL, &text_size); + font_link_get_text_extent_point(info, info->index, ofs+1, INT_MAX, NULL, &text_size); end_x = text_size.cx / args->rel_width; GdipFillRectangle(info->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height);

1 0

Conor McCarthy : vkd3d-shader/dxil: Move the resource kind helper functions up.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: vkd3d Branch: master Commit: 292bbdefbf9cbaf092702f8621352430444107c6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/292bbdefbf9cbaf092702f8621352… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 12 16:17:08 2024 +1000 vkd3d-shader/dxil: Move the resource kind helper functions up. --- libs/vkd3d-shader/dxil.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ac688e85..582d4ff2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1937,6 +1937,16 @@ static const struct sm6_type *sm6_parser_get_type(struct sm6_parser *sm6, uint64 return &sm6->types[type_id]; } +static bool resource_kind_is_texture(enum dxil_resource_kind kind) +{ + return kind >= RESOURCE_KIND_TEXTURE1D && kind <= RESOURCE_KIND_TEXTURECUBEARRAY; +} + +static bool resource_kind_is_multisampled(enum dxil_resource_kind kind) +{ + return kind == RESOURCE_KIND_TEXTURE2DMS || kind == RESOURCE_KIND_TEXTURE2DMSARRAY; +} + static int global_symbol_compare(const void *a, const void *b) { return vkd3d_u32_compare(((const struct sm6_symbol *)a)->id, ((const struct sm6_symbol *)b)->id); @@ -6778,16 +6788,6 @@ static bool sm6_parser_resources_load_register_range(struct sm6_parser *sm6, return true; } -static bool resource_kind_is_texture(enum dxil_resource_kind kind) -{ - return kind >= RESOURCE_KIND_TEXTURE1D && kind <= RESOURCE_KIND_TEXTURECUBEARRAY; -} - -static bool resource_kind_is_multisampled(enum dxil_resource_kind kind) -{ - return kind == RESOURCE_KIND_TEXTURE2DMS || kind == RESOURCE_KIND_TEXTURE2DMSARRAY; -} - static enum vkd3d_shader_resource_type shader_resource_type_from_dxil_resource_kind(enum dxil_resource_kind kind) { if (resource_kind_is_texture(kind))

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic GetDimensions.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: vkd3d Branch: master Commit: c083b1d0fc0dac5f7a50f763be5c1fe6b859baa4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c083b1d0fc0dac5f7a50f763be5c1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 12 16:18:40 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic GetDimensions. --- libs/vkd3d-shader/dxil.c | 96 ++++++++++++++++++++++++++++++++++++ tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/srv-buffers.shader_test | 2 +- 3 files changed, 99 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 582d4ff2..26a8a5c1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -388,6 +388,7 @@ enum dx_intrinsic_opcode DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, DX_BUFFER_STORE = 69, + DX_GET_DIMENSIONS = 72, DX_ATOMIC_BINOP = 78, DX_ATOMIC_CMP_XCHG = 79, DX_DERIV_COARSEX = 83, @@ -2356,6 +2357,23 @@ static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instructio dst->u.reg = param->reg; } +static bool instruction_dst_param_init_temp_vector(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6) +{ + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + struct vkd3d_shader_dst_param *param; + + if (!(param = instruction_dst_params_alloc(ins, 1, sm6))) + return false; + + vsir_dst_param_init(param, VKD3DSPR_TEMP, vkd3d_data_type_from_sm6_type(sm6_type_get_scalar_type(dst->type, 0)), 1); + param->write_mask = VKD3DSP_WRITEMASK_ALL; + param->reg.idx[0].offset = 0; + param->reg.dimension = VSIR_DIMENSION_VEC4; + dst->u.reg = param->reg; + + return true; +} + /* Recurse through the block tree while maintaining a current value count. The current * count is the sum of the global count plus all declarations within the current function. * Store into value_capacity the highest count seen. */ @@ -4047,6 +4065,80 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_dx_get_dimensions(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_params; + unsigned int is_texture, component_count; + enum dxil_resource_kind resource_kind; + struct vkd3d_shader_dst_param *dst; + const struct sm6_value *resource; + + resource = operands[0]; + if (!sm6_value_validate_is_handle(resource, sm6)) + return; + is_texture = resource->u.handle.d->resource_type != VKD3D_SHADER_RESOURCE_BUFFER; + resource_kind = resource->u.handle.d->kind; + + instruction_init_with_resource(ins, is_texture ? VKD3DSIH_RESINFO : VKD3DSIH_BUFINFO, resource, sm6); + + if (!(src_params = instruction_src_params_alloc(ins, 1 + is_texture, sm6))) + return; + src_param_init_vector_from_reg(&src_params[is_texture], &resource->u.handle.reg); + + if (is_texture) + { + ins->flags = VKD3DSI_RESINFO_UINT; + src_param_init_from_value(&src_params[0], operands[1]); + component_count = VKD3D_VEC4_SIZE; + + if (resource_kind_is_multisampled(resource_kind)) + { + instruction_dst_param_init_temp_vector(ins++, sm6); + state->temp_idx = 1; + + /* DXIL does not have an instrinsic for sample info, and resinfo is expected to return + * the sample count in .w for MS textures. The result is always a struct of 4 x uint32. */ + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_SAMPLE_INFO); + ins->flags = VKD3DSI_SAMPLE_INFO_UINT; + + if (!(src_params = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_vector_from_reg(&src_params[0], &resource->u.handle.reg); + src_params[0].swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); + + if (!instruction_dst_param_init_temp_vector(ins, sm6)) + return; + dst = ins->dst; + dst->write_mask = VKD3DSP_WRITEMASK_3; + + /* Move the result to an SSA in case another instruction overwrites r0 before + * the components are extracted for use. */ + ++ins; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + if (!(src_params = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_param_init_vector_from_reg(&src_params[0], &dst->reg); + + state->ins = ins; + state->code_block->instruction_count += 2; + } + } + else + { + if (!operands[1]->is_undefined) + { + WARN("Ignoring unexpected operand.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring an unexpected defined LOD value for buffer GetDimensions."); + } + component_count = 1 + (resource_kind == RESOURCE_KIND_STRUCTUREDBUFFER); + } + + instruction_dst_param_init_ssa_vector(ins, component_count, sm6); +} + static enum vkd3d_shader_opcode sm6_dx_map_tertiary_op(enum dx_intrinsic_opcode op) { switch (op) @@ -4636,6 +4728,7 @@ struct sm6_dx_opcode_info e -> half/float g -> half/float/double H -> handle + D -> Dimensions S -> splitdouble v -> void o -> overloaded @@ -4666,6 +4759,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_FMAX ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FMIN ] = {"g", "RR", sm6_parser_emit_dx_binary}, [DX_FRC ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_GET_DIMENSIONS ] = {"D", "Hi", sm6_parser_emit_dx_get_dimensions}, [DX_IBFE ] = {"m", "iiR", sm6_parser_emit_dx_tertiary}, [DX_HCOS ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_HSIN ] = {"g", "R", sm6_parser_emit_dx_unary}, @@ -4743,6 +4837,8 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_floating_point(type); case 'H': return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type; + case 'D': + return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.Dimensions"); case 'S': return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble"); case 'v': diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test index 0528d141..5676f361 100644 --- a/tests/hlsl/getdimensions.shader_test +++ b/tests/hlsl/getdimensions.shader_test @@ -28,7 +28,7 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (2.0, 3.0, 2.0, 3.0) [srv 1] @@ -53,5 +53,5 @@ float4 main() : sv_target } [test] -todo(sm>=6) draw quad +draw quad probe all rgba (2.0, 2.0, 1.0, 2.0) diff --git a/tests/hlsl/srv-buffers.shader_test b/tests/hlsl/srv-buffers.shader_test index 8ba73cc8..de4ac90f 100644 --- a/tests/hlsl/srv-buffers.shader_test +++ b/tests/hlsl/srv-buffers.shader_test @@ -185,5 +185,5 @@ float4 main() : sv_target return width; } [test] -todo draw quad +todo(sm<6) draw quad probe all rgba (4.0, 4.0, 4.0, 4.0)

1 0

Sven Baars : oleaut32: Use scientific notation if it prevents a loss of accuracy.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: wine Branch: master Commit: 8a8d1dedcf1229abb0fd90b93a8beae7765af5fd URL: https://gitlab.winehq.org/wine/wine/-/commit/8a8d1dedcf1229abb0fd90b93a8bea… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Feb 24 21:11:17 2024 +0100 oleaut32: Use scientific notation if it prevents a loss of accuracy. --- dlls/oleaut32/tests/vartype.c | 22 ++++++++++++++++------ dlls/oleaut32/vartype.c | 14 +++++++++++--- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 795446d0987..8516689d1bd 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4679,12 +4679,22 @@ static void test_VarBstrFromR8(void) { static const struct r8_test tests_en[] = { - { 0.5, L"0.5" }, - { 0.05, L"0.05" }, - { 0.005, L"0.005" }, - { 0.0005, L"0.0005" }, - { 0.00005, L"0.00005" }, - { 0.000005, L"0.000005" }, + { 0.56789, L"0.56789" }, + { 5.6789e-2, L"0.056789" }, + { 5.6789e-3, L"0.0056789" }, + { 5.6789e-4, L"0.00056789" }, + { 5.6789e-5, L"0.000056789" }, + { 5.6789e-6, L"0.0000056789" }, + { 5.6789e-7, L"0.00000056789" }, + { 5.6789e-8, L"0.000000056789" }, + { 5.6789e-9, L"0.0000000056789" }, + { 5.6789e-10, L"0.00000000056789" }, + { 5.6789e-11, L"0.000000000056789" }, + { 5.6789e-12, L"5.6789E-12" }, + { 5.6789e-13, L"5.6789E-13" }, + { 5.6789e-14, L"5.6789E-14" }, + { 5.6789e-15, L"5.6789E-15" }, + { 5.6789e-16, L"5.6789E-16" }, { 1.0e8, L"100000000" }, { 1.0e12, L"1000000000000" }, diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index d11fb41d1b3..747705f94e2 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6550,10 +6550,18 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY; len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*G", locale, ndigits, dblIn); e = wcschr(buff, 'E'); - if (e && labs(wcstol(e+1, NULL, 10)) < ndigits) + if (e) { - len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*f", locale, ndigits, dblIn); - while (len > 0 && (buff[len-1] == '0')) len--; + int extra_decimals; + WCHAR *dot; + + dot = wcschr(buff, '.'); + extra_decimals = dot ? e - dot - 2 : 0; + if (labs(wcstol(e+1, NULL, 10)) + extra_decimals < ndigits) + { + len = _swprintf_l(buff, ARRAY_SIZE(buff), L"%.*f", locale, ndigits, dblIn); + while (len > 0 && (buff[len-1] == '0')) len--; + } } buff[len] = 0; _free_locale(locale);

1 0

Alexandre Julliard : Release 9.3.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 1b32ac45f821ee1fe06a3dc4f903a81a190216c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b32ac45f821ee1fe06a3dc4f903a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 22:19:13 2024 +0100 Release 9.3. --- ANNOUNCE.md | 695 ++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 411 insertions(+), 309 deletions(-)

1 0

Hans Leidekker : wbemprox: Protect tables with a critical section.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 9015eebf87e3de8f9c541299e529c9667cc4847b URL: https://gitlab.winehq.org/wine/wine/-/commit/9015eebf87e3de8f9c541299e529c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 22 16:35:12 2024 +0100 wbemprox: Protect tables with a critical section. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56334 --- dlls/wbemprox/class.c | 2 +- dlls/wbemprox/query.c | 5 +++-- dlls/wbemprox/table.c | 25 +++++++++++++++++++++---- dlls/wbemprox/wbemprox_private.h | 4 ++-- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 1570a5e534a..8e585c2f360 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -236,7 +236,7 @@ static struct record *create_record( struct table *table ) record->fields[i].u.ival = 0; } record->count = table->num_cols; - record->table = addref_table( table ); + record->table = grab_table( table ); return record; } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index d7990305003..a6599334f58 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -54,11 +54,12 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa case VIEW_TYPE_SELECT: { - struct table *table = grab_table( ns, class ); + struct table *table = find_table( ns, class ); HRESULT hr; if (table && (hr = append_table( view, table )) != S_OK) { + release_table( table ); free( view ); return hr; } @@ -631,7 +632,7 @@ static HRESULT get_antecedent_table( enum wbm_namespace ns, const WCHAR *assoccl } if ((hr = do_query( ns, str, &query )) != S_OK) goto done; - if (query->view->table_count) *table = addref_table( query->view->table[0] ); + if (query->view->table_count) *table = grab_table( query->view->table[0] ); else *table = NULL; done: diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index ab386efa06b..67f57878ea5 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -29,6 +29,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static CRITICAL_SECTION table_cs; +static CRITICAL_SECTION_DEBUG table_debug = +{ + 0, 0, &table_cs, + { &table_debug.ProcessLocksList, &table_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": table_cs") } +}; +static CRITICAL_SECTION table_cs = { &table_debug, -1, 0, 0, 0, 0 }; + HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { UINT i; @@ -329,6 +338,7 @@ void free_table( struct table *table ) { if (!table) return; + EnterCriticalSection( &table_cs ); clear_table( table ); if (table->flags & TABLE_FLAG_DYNAMIC) { @@ -339,20 +349,23 @@ void free_table( struct table *table ) list_remove( &table->entry ); free( table ); } + LeaveCriticalSection( &table_cs ); } void release_table( struct table *table ) { if (!InterlockedDecrement( &table->refs )) free_table( table ); + LeaveCriticalSection( &table_cs ); } -struct table *addref_table( struct table *table ) +struct table *grab_table( struct table *table ) { + EnterCriticalSection( &table_cs ); InterlockedIncrement( &table->refs ); return table; } -struct table *grab_table( enum wbm_namespace ns, const WCHAR *name ) +struct table *find_table( enum wbm_namespace ns, const WCHAR *name ) { struct table *table; @@ -363,7 +376,7 @@ struct table *grab_table( enum wbm_namespace ns, const WCHAR *name ) if (name && !wcsicmp( table->name, name )) { TRACE("returning %p\n", table); - return addref_table( table ); + return grab_table( table ); } } return NULL; @@ -395,15 +408,19 @@ BOOL add_table( enum wbm_namespace ns, struct table *table ) if (ns == WBEMPROX_NAMESPACE_LAST) return FALSE; + EnterCriticalSection( &table_cs ); LIST_FOR_EACH_ENTRY( iter, table_list[ns], struct table, entry ) { if (!wcsicmp( iter->name, table->name )) { TRACE("table %s already exists\n", debugstr_w(table->name)); + LeaveCriticalSection( &table_cs ); return FALSE; } } list_add_tail( table_list[ns], &table->entry ); + LeaveCriticalSection( &table_cs ); + TRACE("added %p\n", table); return TRUE; } @@ -414,7 +431,7 @@ BSTR get_method_name( enum wbm_namespace ns, const WCHAR *class, UINT index ) UINT i, count = 0; BSTR ret; - if (!(table = grab_table( ns, class ))) return NULL; + if (!(table = find_table( ns, class ))) return NULL; for (i = 0; i < table->num_cols; i++) { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 3c8fa403c57..8e065bee0b9 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -215,8 +215,8 @@ HRESULT execute_view( struct view * ); struct table *get_view_table( const struct view *, UINT ); void init_table_list( void ); enum wbm_namespace get_namespace_from_string( const WCHAR *namespace ); -struct table *grab_table( enum wbm_namespace, const WCHAR * ); -struct table *addref_table( struct table * ); +struct table *find_table( enum wbm_namespace, const WCHAR * ); +struct table *grab_table( struct table * ); void release_table( struct table * ); struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, UINT, BYTE *, enum fill_status (*)(struct table *, const struct expr *) );

1 0