September 2020 - Wine-devel

[PATCH v4 1/2] msvcrt: Use default user locale when only codepage is passed to setlocale.
by Piotr Caban 18 Sep '20

18 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Supersedes 192842. dlls/msvcrt/locale.c | 174 ++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 101 deletions(-)

2 2

[PATCH] msvcp90: Add manifest.
by Dmitry Timoshkov 18 Sep '20

18 Sep '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcp90/Makefile.in | 2 ++ dlls/msvcp90/msvcp90.manifest | 7 +++++++ dlls/msvcp90/msvcp90.rc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 dlls/msvcp90/msvcp90.manifest create mode 100644 dlls/msvcp90/msvcp90.rc diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index b7e7b73423..b4034fc3f0 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ misc.c \ msvcp_main.c \ string.c + +RC_SRCS = msvcp90.rc diff --git a/dlls/msvcp90/msvcp90.manifest b/dlls/msvcp90/msvcp90.manifest new file mode 100644 index 0000000000..588a0fd7b4 --- /dev/null +++ b/dlls/msvcp90/msvcp90.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr90.dll"/> + <file name="msvcp90.dll"/> + <file name="msvcm90.dll"/> +</assembly> diff --git a/dlls/msvcp90/msvcp90.rc b/dlls/msvcp90/msvcp90.rc new file mode 100644 index 0000000000..61a58daf45 --- /dev/null +++ b/dlls/msvcp90/msvcp90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for msvcp90 + * + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: msvcp90.manifest */ +WINE_MANIFEST 24 msvcp90.manifest -- 2.26.2

1 0

[PATCH] sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo().
by Dmitry Timoshkov 18 Sep '20

18 Sep '20

Some applications call IAssemblyCache::QueryAssemblyInfo(), then append DLL name to the returned path, and call GetFileAttributes() to check DLL existence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/sxs/cache.c | 18 ++++++++---------- dlls/sxs/tests/cache.c | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 1b0e1e8908..bb203f50c0 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -122,23 +122,22 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W return wcslwr( ret ); } -static WCHAR *build_manifest_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, - const WCHAR *version ) +static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, + const WCHAR *version ) { - static const WCHAR fmtW[] = - {'%','s','m','a','n','i','f','e','s','t','s','\\','%','s','.','m','a','n','i','f','e','s','t',0}; WCHAR *path = NULL, *ret, sxsdir[MAX_PATH]; unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += ARRAY_SIZE(fmtW); - len += build_sxs_path( sxsdir ); + len += build_sxs_path( sxsdir ) + 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, path ); return NULL; } - swprintf( ret, len, fmtW, sxsdir, path ); + lstrcpyW( ret, sxsdir ); + lstrcatW( ret, path ); + lstrcatW( ret, L"\\" ); HeapFree( GetProcessHeap(), 0, path ); return ret; } @@ -202,7 +201,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( struct cache *cache = impl_from_IAssemblyCache( iface ); IAssemblyName *name_obj; const WCHAR *arch, *name, *token, *type, *version; - WCHAR *p, *path = NULL; + WCHAR *path = NULL; unsigned int len; HRESULT hr; @@ -232,7 +231,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } cache_lock( cache ); - if (!wcscmp( type, win32W )) path = build_manifest_path( arch, name, token, version ); + if (!wcscmp( type, win32W )) path = build_dll_path( arch, name, token, version ); else if (!wcscmp( type, win32_policyW )) path = build_policy_path( arch, name, token, version ); else { @@ -250,7 +249,6 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( info->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; TRACE("assembly is installed\n"); } - if ((p = wcsrchr( path, '\\' ))) *p = 0; len = lstrlenW( path ) + 1; if (info->pszCurrentAssemblyPathBuf) { diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 19dd4b865e..59c51ad886 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -162,6 +162,8 @@ static void test_QueryAssemblyInfo( void ) ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); + lstrcatW( path, L"comctl32.dll" ); + ok( GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES, "%s should exist\n", wine_dbgstr_w( path )); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); -- 2.26.2

1 0

[PATCH] d3d10core/tests: Add test for NULL resource parameters for _CopySubresourceRegion().
by Paul Gofman 18 Sep '20

18 Sep '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index deb6144a4be..b37e5a43a8c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -9819,6 +9819,11 @@ static void test_copy_subresource_region(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D10Device_CopySubresourceRegion(device, NULL, 0, + 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); -- 2.26.2

2 1

[PATCH v2 3/3] d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Formatting * Dynamically allocate file name buffer. dlls/d3dx10_43/d3dx10_43_main.c | 24 ++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- 2 files changed, 23 insertions(+), 5 deletions(-)

2 1

[PATCH v2 2/3] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 40 +++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)

2 1

[PATCH v2 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Ziqing Hui 18 Sep '20

18 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Formatting. dlls/d3dx10_43/d3dx10_43_main.c | 56 +++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 6 ++-- 2 files changed, 57 insertions(+), 5 deletions(-)

2 1

[PATCH vkd3d v2] vkd3d: Print VK_MEMORY_HEAP_MULTI_INSTANCE_BIT in debug_vk_memory_heap_flags().
by Zebediah Figura 18 Sep '20

18 Sep '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 7abfd42e..f9f26635 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -699,11 +699,12 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) { - char buffer[50]; + char buffer[80]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } FLAG_TO_STR(VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + FLAG_TO_STR(VK_MEMORY_HEAP_MULTI_INSTANCE_BIT) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags); -- 2.28.0

2 1

[PATCH vkd3d-shader 1/3] vkd3d-shader: Print oC registers as o in versions >= 4.
by Isabella Bosia 18 Sep '20

18 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d86a84a..02abbf9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -700,7 +700,9 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, break; case VKD3DSPR_COLOROUT: - shader_addline(buffer, "oC"); + shader_addline(buffer, "o"); + if (!shader_ver_ge(shader_version, 4, 0)) + shader_addline(buffer, "C"); break; case VKD3DSPR_DEPTHOUT: -- 2.25.1

2 5

[PATCH vkd3d] vkd3d-shader: Separate the allocated and used mask in struct vkd3d_shader_signature_element.
by Zebediah Figura 18 Sep '20

18 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/vkd3d_shader.h | 8 +++++++- libs/vkd3d-shader/dxbc.c | 10 +++++++--- libs/vkd3d-shader/spirv.c | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed6ac44c..fce65593 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1125,8 +1125,14 @@ struct vkd3d_shader_signature_element enum vkd3d_shader_component_type component_type; /** Register index. */ unsigned int register_index; - /** Register mask. */ + /** Mask of the register components allocated to this varying. */ unsigned int mask; + /** + * Subset of \ref mask which the shader reads from or writes to. Unlike + * Direct3D shader bytecode, the output mask is not inverted, i.e. bits set + * in this field denote components which are written to. + */ + unsigned int used_mask; /** Minimum interpolation precision. */ enum vkd3d_shader_minimum_precision min_precision; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a62974a6..e03ff259 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2139,7 +2139,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, for (i = 0; i < count; ++i) { - DWORD name_offset; + DWORD name_offset, mask; if (has_stream_index) read_dword(&ptr, &e[i].stream_index); @@ -2157,7 +2157,11 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); read_dword(&ptr, &e[i].register_index); - read_dword(&ptr, &e[i].mask); + read_dword(&ptr, &mask); + e[i].mask = mask & 0xff; + e[i].used_mask = (mask >> 8) & 0xff; + if (tag == TAG_OSGN || tag == TAG_OSG1 || tag == TAG_OSG5) + e[i].used_mask = e[i].mask & ~e[i].used_mask; if (has_min_precision) read_dword(&ptr, &e[i].min_precision); @@ -2167,7 +2171,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, precision %u.\n", e[i].stream_index, debugstr_a(e[i].semantic_name), e[i].semantic_index, e[i].sysval_semantic, - e[i].component_type, e[i].register_index, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff, e[i].min_precision); + e[i].component_type, e[i].register_index, e[i].used_mask, e[i].mask, e[i].min_precision); } s->elements = e; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec6987b8..fa0d4e08 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4139,7 +4139,7 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa if (current->register_index != reg_idx) continue; - write_mask |= current->mask & 0xff; + write_mask |= current->mask; ++count; if (current->sysval_semantic) @@ -4216,7 +4216,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi builtin = get_spirv_builtin_for_sysval(compiler, sysval); - write_mask = signature_element->mask & 0xff; + write_mask = signature_element->mask; component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) @@ -4228,8 +4228,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi else { component_type = signature_element->component_type; - input_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); - component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask & 0xff); + input_component_count = vkd3d_write_mask_component_count(signature_element->mask); + component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } if ((use_private_var = builtin && builtin->fixup_pfn)) @@ -4657,10 +4657,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); - write_mask = signature_element->mask & 0xff; + write_mask = signature_element->mask; component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); - output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); + output_component_count = vkd3d_write_mask_component_count(signature_element->mask); if (builtin) { component_type = builtin->component_type; @@ -4833,9 +4833,9 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi unsigned int i, index, array_idx; uint32_t output_id; - dst_write_mask = output->mask & 0xff; + dst_write_mask = output->mask; write_mask &= dst_write_mask; - use_mask = (output->mask >> 8) & 0xff; + use_mask = output->used_mask; if (!write_mask) return; @@ -4847,7 +4847,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } swizzle = get_shader_output_swizzle(compiler, output->register_index); - uninit_mask = dst_write_mask & use_mask; + uninit_mask = dst_write_mask & ~use_mask; if (uninit_mask) { /* Set values to 0 for not initialized shader output components. */ @@ -6180,7 +6180,7 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx const struct vkd3d_shader_signature_element *output = &output_signature->elements[i]; const struct vkd3d_shader_signature_element *input = &input_signature->elements[i]; - assert((input->mask & 0xff) == (output->mask & 0xff)); + assert(input->mask == output->mask); assert(input->component_type == output->component_type); if ((input_builtin = get_spirv_builtin_for_sysval(compiler, vkd3d_siv_from_sysval(input->sysval_semantic)))) @@ -6191,7 +6191,7 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx else { component_type = input->component_type; - component_count = vkd3d_write_mask_component_count(input->mask & 0xff); + component_count = vkd3d_write_mask_component_count(input->mask); } if (input_builtin) -- 2.28.0

2 1