wine-devel March 2021

wine-devel@winehq.org

75 participants
800 discussions

[PATCH 1/5] wined3d: Use VK_FORMAT_D24_UNORM_S8_UINT when available.
by Matteo Bruni 08 Mar '21

08 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/utils.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 233cd49209f..22b893b8745 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4142,7 +4142,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, VK_FORMAT_D32_SFLOAT_S8_UINT, }, {WINED3DFMT_X32_TYPELESS_G8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, - {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, + {WINED3DFMT_D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; @@ -4182,6 +4182,16 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; if (properties.bufferFeatures & VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT) format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_TEXTURE; + if (vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + if (~properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + format->vk_format = vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + } + } flags = 0; texture_flags = properties.linearTilingFeatures | properties.optimalTilingFeatures; -- 2.26.2

4 10

[PATCH v2 4/4] gdi32: Remove needTransform variable of freetype_get_glyph_outline()
by Huw Davies 08 Mar '21

08 Mar '21

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 52 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0f14072037c..b602323168c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2639,8 +2639,8 @@ enum matrices_index matrix_unrotated }; -static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, - FT_Matrix matrices[3] ) +static FT_Matrix *get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) { static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; BOOL needs_transform = FALSE; @@ -2739,7 +2739,7 @@ static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const needs_transform = TRUE; } - return needs_transform; + return needs_transform ? matrices : NULL; } static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) @@ -2836,12 +2836,11 @@ static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, return adv; } -static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, - BOOL needs_transform, const FT_Matrix metrices[3] ) +static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, const FT_Matrix *matrices ) { FT_BBox bbox = { 0, 0, 0, 0 }; - if (!needs_transform) + if (!matrices) { bbox.xMin = (metrics->horiBearingX) & -64; bbox.xMax = (metrics->horiBearingX + metrics->width + 63) & -64; @@ -2860,7 +2859,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); - pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if (xc == 0 && yc == 0) { bbox.xMin = bbox.xMax = vec.x; @@ -2886,14 +2885,13 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, } static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, - BOOL vertical, BOOL vertical_metrics, - BOOL needs_transform, const FT_Matrix matrices[3], + BOOL vertical, BOOL vertical_metrics, const FT_Matrix *matrices, GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; - if (!needs_transform) + if (!matrices) { adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; @@ -2967,7 +2965,7 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3015,7 +3013,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, ft_bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3033,7 +3031,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, } static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3081,7 +3079,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT ft_bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3111,7 +3109,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT } static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, GLYPHMETRICS *gm, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3189,7 +3187,7 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (!buf || !buflen) return needed; if (needed > buflen) return GDI_ERROR; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); #ifdef FT_LCD_FILTER_H @@ -3500,8 +3498,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph FT_Error err; FT_BBox bbox; FT_Int load_flags = get_load_flags(format); - FT_Matrix matrices[3]; - BOOL needsTransform = FALSE; + FT_Matrix transform_matrices[3], *matrices = NULL; BOOL vertical_metrics; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -3512,7 +3509,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph format &= ~GGO_UNHINTED; - needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); + matrices = get_transform_matrices( font, tategaki, lpmat, transform_matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only @@ -3520,7 +3517,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0)) vertical_metrics = FALSE; - if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (matrices || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph, load_flags); @@ -3557,9 +3554,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, - lpgm, abc ); + bbox = get_transformed_bbox( &metrics, matrices ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, matrices, lpgm, abc ); switch (format) { @@ -3568,21 +3564,21 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph case GGO_BITMAP: return get_mono_glyph_bitmap( ft_face->glyph, bbox, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case GGO_GRAY2_BITMAP: case GGO_GRAY4_BITMAP: case GGO_GRAY8_BITMAP: case WINE_GGO_GRAY16_BITMAP: return get_antialias_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case WINE_GGO_HRGB_BITMAP: case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: return get_subpixel_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, lpgm, buflen, buf ); + matrices, lpgm, buflen, buf ); case GGO_NATIVE: if (ft_face->glyph->format == ft_glyph_format_outline) @@ -3592,7 +3588,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -3612,7 +3608,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.23.0

1 0

[PATCH v2 3/4] gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric().
by Huw Davies 08 Mar '21

08 Mar '21

1 0

[PATCH v2 2/4] gdi32: Remove incoming_font argument of get_advance_metric().
by Huw Davies 08 Mar '21

08 Mar '21

1 0

[PATCH] comctl32/listview: Fix the listview sorting error.
by Haoyang Chen 08 Mar '21

08 Mar '21

The original sequence may be stored in lparam. During the sorting process, this sequence is out-of-order, but lparam remains unchanged. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/dpa.c | 13 ++++++-- dlls/comctl32/tests/listview.c | 59 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 36b3a422e8c..69e9d0a33bb 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -818,8 +818,17 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam); if ((hdpa->nItemCount > 1) && (hdpa->ptrs)) - DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1, - pfnCompare, lParam); + { + LPVOID *ptrs = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, + hdpa->nItemCount * sizeof(LPVOID)); + if (!ptrs) + return FALSE; + memcpy(ptrs, hdpa->ptrs, hdpa->nItemCount * sizeof(LPVOID)); + DPA_QuickSort (ptrs, 0, hdpa->nItemCount - 1, pfnCompare, lParam); + + memcpy(hdpa->ptrs, ptrs, hdpa->nItemCount * sizeof(LPVOID)); + HeapFree (hdpa->hHeap, 0, ptrs); + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..7b036a9f6c1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2921,6 +2921,28 @@ static INT WINAPI test_CallBackCompare(LPARAM first, LPARAM second, LPARAM lPara return (first > second ? 1 : -1); } +static INT WINAPI test_CallBackCompare1(LPARAM first, LPARAM second, LPARAM lParam) +{ + CHAR str1[5]; + CHAR str2[5]; + INT r; + HWND hwnd = (HWND)lParam; + LV_ITEMA item = {0}; + + if (first == second) return 0; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str1; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, first, (LPARAM)&item); + expect(TRUE, r); + + item.pszText = str2; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, second, (LPARAM)&item); + expect(TRUE, r); + + return atoi(str1) > atoi(str2) ? 1 : -1; +} + static void test_sorting(void) { HWND hwnd; @@ -2929,6 +2951,9 @@ static void test_sorting(void) LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; + static CHAR before_sort_array[][5] = {"6","3","1","4","2"}; + static CHAR after_sort_arary[][5] = {"1","2","3","4","6"}; + INT i; hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2979,6 +3004,40 @@ static void test_sorting(void) DestroyWindow(hwnd); + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + + item.mask = LVIF_PARAM | LVIF_TEXT; + item.iSubItem = 0; + item.cchTextMax = 5; + + for (i = 0; i < sizeof(before_sort_array)/5; i++) + { + item.iItem = i; + item.lParam = i; + item.pszText = &before_sort_array[i][0]; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(i, r); + } + + r = SendMessageA(hwnd, LVM_SORTITEMS, (WPARAM)(LPARAM)hwnd, (LPARAM)test_CallBackCompare1); + expect(TRUE, r); + + for (i = 0; i < sizeof(after_sort_arary)/5; i++) + { + CHAR str[5]; + item.iItem = i; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, i, (LPARAM)&item); + expect(TRUE, r); + + expect(0, strcmp(str,&after_sort_arary[i][0])); + } + + DestroyWindow(hwnd); + /* switch to LVS_SORTASCENDING when some items added */ hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); -- 2.20.1

3 6

[PATCH vkd3d 1/5] vkd3d-shader: Move the remainder of hlsl_parser_compile() to hlsl_compile_shader().
by Zebediah Figura 08 Mar '21

08 Mar '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 44 +++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 47 +--------------------------------------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0486c952..02fa4843 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -188,6 +188,22 @@ bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) return rb_get(&ctx->functions, name) != NULL; } +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + unsigned int hlsl_type_component_count(struct hlsl_type *type) { struct hlsl_struct_field *field; @@ -1606,7 +1622,9 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + struct hlsl_ir_function_decl *entry_func; const struct hlsl_profile_info *profile; + const char *entry_point; struct hlsl_ctx ctx; int ret; @@ -1615,6 +1633,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info ERR("No HLSL source info given.\n"); return VKD3D_ERROR_INVALID_ARGUMENT; } + entry_point = hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"; if (!(profile = get_target_info(hlsl_source_info->profile))) { @@ -1627,9 +1646,30 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - ret = hlsl_lexer_compile(&ctx, text, hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"); + hlsl_lexer_compile(&ctx, text); - hlsl_ctx_cleanup(&ctx); + if (ctx.failed) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) + { + const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; + hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, + "Entry point \"%s\" is not defined.", entry_point); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!hlsl_type_is_void(entry_func->return_type) + && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) + hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Entry point \"%s\" is missing a return value semantic.", entry_point); + + ret = hlsl_emit_dxbc(&ctx, entry_func); + + hlsl_ctx_cleanup(&ctx); return ret; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 73ba2bec..4af021ec 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -518,6 +518,7 @@ void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; @@ -571,7 +572,6 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) DECLSPEC_HIDDEN; -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) DECLSPEC_HIDDEN; #endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 4cc0a3ea..da54d57b 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -282,7 +282,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) ctx->location.column += yyget_leng(ctx->scanner); } -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) { YY_BUFFER_STATE buffer; int ret; @@ -291,7 +291,7 @@ int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entry buffer = yy_scan_string(text, ctx->scanner); yy_switch_to_buffer(buffer, ctx->scanner); - ret = hlsl_parser_compile(ctx, entrypoint); + ret = hlsl_yyparse(ctx->scanner, ctx); yy_delete_buffer(buffer, ctx->scanner); yylex_destroy(ctx->scanner); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae151181..66747740 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -286,22 +286,6 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } -static struct hlsl_ir_function_decl *get_func_entry(struct hlsl_ctx *ctx, const char *name) -{ - struct hlsl_ir_function_decl *decl; - struct hlsl_ir_function *func; - struct rb_entry *entry; - - if ((entry = rb_get(&ctx->functions, name))) - { - func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); - RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) - return decl; - } - - return NULL; -} - static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) { struct hlsl_ir_function_decl *func; @@ -334,7 +318,7 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo } else { - if ((func = get_func_entry(ctx, decl->name))) + if ((func = hlsl_get_func_decl(ctx, decl->name))) { hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Variable '%s' is already defined as a function.", decl->name); @@ -3012,32 +2996,3 @@ expr: list_move_tail($$, $3); vkd3d_free($3); } - -%% - -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) -{ - struct hlsl_ir_function_decl *entry_func; - - yyparse(ctx->scanner, ctx); - - if (ctx->failed) - return VKD3D_ERROR_INVALID_SHADER; - - if (!(entry_func = get_func_entry(ctx, entrypoint))) - { - const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name}; - - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint); - return VKD3D_ERROR_INVALID_SHADER; - } - - if (!hlsl_type_is_void(entry_func->return_type) - && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) - { - hlsl_error(ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, - "Entry point \"%s\" is missing a return value semantic.", entry_func->func->name); - } - - return hlsl_emit_dxbc(ctx, entry_func); -} -- 2.30.1

5 17

[PATCH 5/5] riched20: Store the host as the window prop.
by Huw Davies 08 Mar '21

08 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 42 +++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1da34555352..291c9a3b677 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -67,6 +67,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; + texthost->editor = NULL; return texthost; } @@ -315,16 +316,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbar ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); const DWORD mask = WS_VSCROLL| WS_HSCROLL| ES_AUTOVSCROLL| ES_AUTOHSCROLL| ES_DISABLENOSCROLL; - if (editor) + if (host->editor) + { + *scrollbar = host->editor->styleFlags & mask; + } + else { - *scrollbar = editor->styleFlags & mask; - } else { DWORD style = GetWindowLongW( host->window, GWL_STYLE ); if (style & WS_VSCROLL) style |= ES_AUTOVSCROLL; @@ -371,20 +373,21 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); DWORD style; DWORD dwBits = 0; - if (editor) + if (host->editor) { - style = editor->styleFlags; - if (editor->mode & TM_RICHTEXT) + style = host->editor->styleFlags; + if (host->editor->mode & TM_RICHTEXT) dwBits |= TXTBIT_RICHTEXT; - if (editor->bWordWrap) + if (host->editor->bWordWrap) dwBits |= TXTBIT_WORDWRAP; if (style & ECO_AUTOWORDSELECTION) dwBits |= TXTBIT_AUTOWORDSEL; - } else { + } + else + { DWORD dwScrollBar; style = GetWindowLongW( host->window, GWL_STYLE ); @@ -438,11 +441,10 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); HWND hwnd = host->window; UINT id; - if (!editor || !editor->hwndParent) return S_OK; + if (!host->editor || !host->editor->hwndParent) return S_OK; id = GetWindowLongW(hwnd, GWLP_ID); @@ -465,7 +467,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR info->hwndFrom = hwnd; info->idFrom = id; info->code = iNotify; - SendMessageW(editor->hwndParent, WM_NOTIFY, id, (LPARAM)info); + SendMessageW( host->editor->hwndParent, WM_NOTIFY, id, (LPARAM)info ); break; } @@ -481,7 +483,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW(editor->hwndParent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); + SendMessageW( host->editor->hwndParent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)hwnd ); break; case EN_MSGFILTER: @@ -511,10 +513,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); - DWORD style = editor ? editor->styleFlags - : GetWindowLongW( host->window, GWL_STYLE ); + DWORD style = host->editor ? host->editor->styleFlags : GetWindowLongW( host->window, GWL_STYLE ); *width = (style & ES_SELECTIONBAR) ? 225 : 0; /* in HIMETRIC */ return S_OK; } @@ -746,7 +746,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host->editor ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; } @@ -754,6 +754,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { + struct host *host; ME_TextEditor *editor; HRESULT hr; LRESULT res = 0; @@ -761,8 +762,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, TRACE( "enter hwnd %p msg %04x (%s) %lx %lx, unicode %d\n", hwnd, msg, get_msg_name(msg), wparam, lparam, unicode ); - editor = (ME_TextEditor *)GetWindowLongPtrW( hwnd, 0 ); - if (!editor) + host = (struct host *)GetWindowLongPtrW( hwnd, 0 ); + if (!host) { if (msg == WM_NCCREATE) { @@ -774,6 +775,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else return DefWindowProcW( hwnd, msg, wparam, lparam ); } + editor = host->editor; switch (msg) { case WM_ERASEBKGND: -- 2.23.0

1 0

[PATCH 4/5] riched20: Remove an unused critsec.
by Huw Davies 08 Mar '21

08 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txtsrv.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 3d0eec6f769..49d1c706076 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -34,14 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); struct text_services { - IUnknown IUnknown_inner; - ITextServices ITextServices_iface; - IUnknown *outer_unk; - LONG ref; - ITextHost *host; - CRITICAL_SECTION csTxtSrv; - ME_TextEditor *editor; - char spare[256]; + IUnknown IUnknown_inner; + ITextServices ITextServices_iface; + IUnknown *outer_unk; + LONG ref; + ITextHost *host; + ME_TextEditor *editor; + char spare[256]; /* for bug #12179 */ }; static inline struct text_services *impl_from_IUnknown( IUnknown *iface ) @@ -95,8 +94,6 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) if (!ref) { ME_DestroyEditor( services->editor ); - services->csTxtSrv.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &services->csTxtSrv ); CoTaskMemFree( services ); } return ref; @@ -378,8 +375,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services = CoTaskMemAlloc( sizeof(*services) ); if (services == NULL) return E_OUTOFMEMORY; - InitializeCriticalSection( &services->csTxtSrv ); - services->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); services->ref = 1; services->host = text_host; /* Don't take a ref of the host - this would lead to a mutual dependency */ services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; -- 2.23.0

1 0

[PATCH 3/5] riched32/tests: Add a todo_wine for a test that has always failed.
by Huw Davies 08 Mar '21

08 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched32/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f361d49478e..f4f6ebeb709 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -155,7 +155,7 @@ static void test_WM_GETTEXTLENGTH(void) { SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); } DestroyWindow(hwndRichEdit); -- 2.23.0

1 0

[PATCH 2/5] riched32/tests: Use the system locale to determine rtl and multibyte behaviour.
by Huw Davies 08 Mar '21

08 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 950c175bbbe..f361d49478e 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -53,7 +53,7 @@ static HWND new_richedit(HWND parent) { static BOOL is_rtl(void) { LOCALESIGNATURE sig; - return (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + return (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); } @@ -1440,7 +1440,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE(); -- 2.23.0

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2021