- Wine-Devel - list.winehq.org

[PATCH 3/3] windowscodecs/tests: Rename test_dds_bgr565 to test_dds_rgb565.
by Ziqing Hui July 22, 2020

July 22, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- We have "32bpp ARGB", "32bpp XRGB", "64bpp ABGR", "96bpp ABGR", "128bpp ABGR". For the 16bpp 5:6:5 image, it should be "RGB565" instead of "BGR565". dlls/windowscodecs/tests/ddsformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Simplify init_decoder().
by Ziqing Hui July 22, 2020

July 22, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Remove the test data in test_dds_decoder_initialize().
by Ziqing Hui July 22, 2020

July 22, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 87 ++++++++++++---------------- 1 file changed, 36 insertions(+), 51 deletions(-)

2 1

[PATCH 5/5] include: Fix conflicting definitions of NULL, wchar_t, wint_t, wctype_t.
by Puetz Kevin A July 22, 2020

July 22, 2020

When <basetyps.h> defines wchar_t, it must obey -f(no-)short-wchar by referring to __WCHAR_TYPE__ which may not be `unsigned short`. Similarly, windef.h defining NULL may need to use GCC's __null. Otherwise one-definition-rule problems arise depending on whether wine or libc headers are included first. Implementing these by deferring to the C89-specified libc headers, (or msvcrt's versions with -mno-cygwin) ensures matching definitions. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/basetyps.h | 8 +++++--- include/tchar.h | 9 +-------- include/windef.h | 11 +++++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index b0dd5d77f4..e6243d5a59 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -91,9 +91,11 @@ typedef unsigned long error_status_t; #endif #ifndef _WCHAR_T_DEFINED -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif +# ifndef __cplusplus +# define __need_wchar_t // tells GCC's stddef.h to only define wchar_t +# include <stddef.h> +# undef __need_wchar_t +# endif #define _WCHAR_T_DEFINED #endif diff --git a/include/tchar.h b/include/tchar.h index 6c9035c219..0049ea7e7a 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -232,14 +232,7 @@ extern "C" { #endif /* tchar mappings */ #ifdef _UNICODE -#if !defined(_WINT_T_DEFINED) && !defined(__WINT_TYPE__) -typedef unsigned short wint_t; -#endif - -#ifndef _WCTYPE_T_DEFINED -typedef unsigned short wctype_t; -#define _WCTYPE_T_DEFINED -#endif +#include <wchar.h> #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) diff --git a/include/windef.h b/include/windef.h index 521c3ab451..e26ffe6ff4 100644 --- a/include/windef.h +++ b/include/windef.h @@ -206,11 +206,14 @@ extern "C" { /* Misc. constants. */ -#undef NULL -#ifdef __cplusplus -#define NULL 0 -#else +#ifndef NULL +#ifdef RC_INVOKED #define NULL ((void*)0) +#else +#define __need_NULL // tells GCC's stddef.h to only define NULL +#include <stddef.h> +#undef __need_NULL +#endif #endif #ifdef FALSE

2 6

[PATCH] iphlpapi: Fix buffer reallocation in get_pid_map().
by Paul Gofman July 22, 2020

July 22, 2020

Related to https://bugs.winehq.org/show_bug.cgi?id=49590 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 03e53abfb44..d8c2ce029b4 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1912,6 +1912,7 @@ static struct pid_map *get_pid_map( unsigned int *num_entries ) HeapFree( GetProcessHeap(), 0, buffer ); return NULL; } + buffer = new_buffer; } if (!(map = HeapAlloc( GetProcessHeap(), 0, map_count * sizeof(*map) ))) -- 2.26.2

1 0

[PATCH] kernel32: Zero initialize module data in fetch_module().
by Paul Gofman July 22, 2020

July 22, 2020

Otherwise unitialized name string pointers may be freed in CreateToolhelp32Snapshot(). Related to https://bugs.winehq.org/show_bug.cgi?id=49590 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/toolhelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index d55e8185f29..d072ccaefcb 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -108,9 +108,9 @@ static BOOL fetch_module( DWORD process, DWORD flags, LDR_DATA_TABLE_ENTRY **ldr while (curr != head) { if (!*num) - *ldr_mod = HeapAlloc( GetProcessHeap(), 0, sizeof(LDR_DATA_TABLE_ENTRY) ); + *ldr_mod = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LDR_DATA_TABLE_ENTRY) ); else - *ldr_mod = HeapReAlloc( GetProcessHeap(), 0, *ldr_mod, + *ldr_mod = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, *ldr_mod, (*num + 1) * sizeof(LDR_DATA_TABLE_ENTRY) ); if (!*ldr_mod) break; if (!ReadProcessMemory( hProcess, -- 2.26.2

2 1

[PATCH v2] usp10: Don't specify ETO_GLYPH_INDEX for bitmap fonts.
by Dmitry Timoshkov July 22, 2020

July 22, 2020

This patch uses same check as ScriptShapeOpenType() does, and fixes painting of non-latin characters in Wordpad using MS Sans Serif font. v2: SCRIPT_CACHE pointer could be NULL. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 322091c547..a6664279b5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3607,10 +3607,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!hdc || !psc) return E_INVALIDARG; if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; + fuOptions &= ETO_CLIPPED | ETO_OPAQUE; fuOptions |= ETO_IGNORELANGUAGE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + if (!psa->fNoGlyphIndex && *psc && ((ScriptCache *)*psc)->sfnt) + fuOptions |= ETO_GLYPH_INDEX; /* We do actually have glyph indices */ if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx)))) return E_OUTOFMEMORY; -- 2.26.2

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Output point sizes.
by Henri Verbeet July 22, 2020

July 22, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bbfe701..3ece044 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5615,6 +5615,19 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_primitive(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_point_size(struct vkd3d_dxbc_compiler *compiler) +{ + static const struct vkd3d_spirv_builtin point_size = {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInPointSize}; + + /* Set the point size. Point sprites are not supported in d3d10+, but + * point primitives can still be used with e.g. stream output. Vulkan + * requires the point size to always be explicitly defined when outputting + * points. */ + vkd3d_spirv_build_op_store(&compiler->spirv_builder, + vkd3d_dxbc_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0), + vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone); +} + static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5625,6 +5638,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compi { case VKD3D_PT_POINTLIST: mode = SpvExecutionModeOutputPoints; + vkd3d_dxbc_compiler_emit_point_size(compiler); break; case VKD3D_PT_LINESTRIP: mode = SpvExecutionModeOutputLineStrip; @@ -8406,6 +8420,10 @@ static void vkd3d_dxbc_compiler_emit_cut_stream(struct vkd3d_dxbc_compiler *comp static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *compiler) { vkd3d_dxbc_compiler_emit_push_constant_buffers(compiler); + + if (compiler->xfb_info && compiler->xfb_info->element_count + && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + vkd3d_dxbc_compiler_emit_point_size(compiler); } static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx) -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Add missing VKD3D_FORCE_32_BIT_ENUM enum elements.
by Henri Verbeet July 22, 2020

July 22, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b1770f..f4a2be5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -103,18 +103,24 @@ enum vkd3d_shader_parameter_type VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; enum vkd3d_shader_parameter_data_type { VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_DATA_TYPE), }; enum vkd3d_shader_parameter_name { VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_NAME), }; struct vkd3d_shader_parameter_immediate_constant @@ -684,6 +690,8 @@ enum vkd3d_shader_minimum_precision VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_MINIMUM_PRECISION), }; struct vkd3d_shader_signature_element -- 2.11.0

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Rename the VKD3D_DUMMY_SAMPLER_INDEX macro to VKD3D_SHADER_DUMMY_SAMPLER_INDEX.
by Henri Verbeet July 22, 2020

July 22, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 601f21f..2b1770f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -153,7 +153,7 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_descriptor_binding binding; }; -#define VKD3D_DUMMY_SAMPLER_INDEX ~0u +#define VKD3D_SHADER_DUMMY_SAMPLER_INDEX ~0u struct vkd3d_shader_combined_resource_sampler { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 94d7eff..bbfe701 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5250,7 +5250,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); - depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX + depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, @@ -5263,7 +5263,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); - if (current->sampler_index == VKD3D_DUMMY_SAMPLER_INDEX) + if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); else vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); @@ -7210,7 +7210,7 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru return NULL; resource_index = resource_reg->idx[0].offset; - sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_DUMMY_SAMPLER_INDEX; + sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_SHADER_DUMMY_SAMPLER_INDEX; vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); if ((entry = rb_get(&compiler->symbol_table, &key))) -- 2.11.0

1 0