November 2019 - Wine-Devel - list.winehq.org

[PATCH] ucrtbase: Implement t and j printf length modifiers.
by Ambrož Bizjak Nov. 1, 2019

Nov. 1, 2019

Hi, This adds support for t (ptrdiff_t) and j (intmax_t/uintmax_t) length modifiers. This fixes an issue in Planet Coaster where many in-game values would otherwise show as "jd". I've confirmed the fix works within Steam Play with a local Proton build. These length modifiers have appeared in VS2015 together with z, so putting the code under "_MSVCR_VER >= 140" seems correct. Tests are included and they passed for me on 32-bit and 64-bit. Regards, Ambroz Bizjak

2 1

[PATCH] ole32/tests: Fix some test failures on Windows XP.
by Sven Baars Nov. 1, 2019

Nov. 1, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- These tests started failing since 1e6b130b85d33d38231fc15b5b5e9bf41a24e0b6 dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 69a38d48b2..8412ee45a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -757,7 +757,7 @@ static void test_CoGetClassObject(void) IUnknown_Release(pUnk); hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001235 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); @@ -1573,7 +1573,7 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); - ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001234 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); deactivate_context(handle, ctxcookie); } -- 2.17.1

1 0

[PATCH] find: Prevent hang by properly checking for EOF
by Fabian Maurer Nov. 1, 2019

Nov. 1, 2019

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/find/find.c b/programs/find/find.c index 3794a8190f..34ca2801eb 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -36,7 +36,7 @@ static BOOL read_char_from_handle(HANDLE handle, char *char_out) if (buffer_pos >= buffer_max) { BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); - if (!success) + if (!success || !buffer_max) return FALSE; buffer_pos = 0; } -- 2.23.0

1 0

[PATCH] find: First implementation
by Fabian Maurer Nov. 1, 2019

Nov. 1, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44975 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/Makefile.in | 4 +- programs/find/find.c | 170 ++++++++++++++++++++++++++++++++++++- programs/find/find.rc | 25 ++++++ programs/find/resources.h | 27 ++++++ programs/find/tests/find.c | 6 +- 5 files changed, 225 insertions(+), 7 deletions(-) create mode 100644 programs/find/find.rc create mode 100644 programs/find/resources.h diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index 0c6b334f29..f572a371b4 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,5 +1,7 @@ MODULE = find.exe - +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c + +RC_SRCS = find.rc diff --git a/programs/find/find.c b/programs/find/find.c index 0c8ba1fcd7..3794a8190f 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -16,18 +16,180 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <stdlib.h> +#include <shlwapi.h> + +#include "wine/heap.h" #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(find); +static BOOL read_char_from_handle(HANDLE handle, char *char_out) +{ + static char buffer[4096]; + static UINT buffer_max = 0; + static UINT buffer_pos = 0; + + /* Read next content into buffer */ + if (buffer_pos >= buffer_max) + { + BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); + if (!success) + return FALSE; + buffer_pos = 0; + } + + *char_out = buffer[buffer_pos++]; + return TRUE; +} + +/* Read a line from a handle, returns NULL if the end is reached */ +static WCHAR* read_line_from_handle(HANDLE handle) +{ + int line_max = 4096; + int length = 0; + WCHAR *line_converted; + int line_converted_length; + BOOL success; + char *line = heap_alloc(line_max); + + for (;;) + { + char c; + success = read_char_from_handle(handle, &c); + + /* Check for EOF */ + if (!success) + { + if (length == 0) + return NULL; + else + break; + } + + if (c == '\n') + break; + + /* Make sure buffer is large enough */ + if (length + 1 >= line_max) + { + line_max *= 2; + line = heap_realloc(line, line_max); + } + + line[length++] = c; + } + + line[length] = 0; + if (length - 1 >= 0 && line[length - 1] == '\r') /* Strip \r of windows line endings */ + line[length - 1] = 0; + + line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); + line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); + + heap_free(line); + + return line_converted; +} + +static void write_to_stdout(const WCHAR *str) +{ + char *str_converted; + UINT str_converted_length; + DWORD bytes_written; + UINT str_length = lstrlenW(str); + int codepage = CP_ACP; + + str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); + str_converted = heap_alloc(str_converted_length); + WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); + + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); + if (bytes_written < str_converted_length) + ERR("Failed to write output\n"); + + heap_free(str_converted); +} + +static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) +{ + void *found; + WCHAR lineending[] = {'\r', '\n', 0}; + + if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) + return FALSE; + + found = wcsstr(line, tofind); + + if (found) + { + write_to_stdout(line); + write_to_stdout(lineending); + return TRUE; + } + + return FALSE; +} + +static void output_resource_message(int id) +{ + WCHAR buffer[64]; + LoadStringW(GetModuleHandleW(NULL), id, buffer, ARRAY_SIZE(buffer)); + write_to_stdout(buffer); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *line; + WCHAR *tofind = NULL; int i; + int exitcode; + HANDLE input; - WINE_FIXME("stub:"); + TRACE("running find:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + TRACE(" %s", wine_dbgstr_w(argv[i])); + } + TRACE("\n"); + + input = GetStdHandle(STD_INPUT_HANDLE); + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '/') + { + output_resource_message(IDS_INVALID_SWITCH); + return 2; + } + else if(tofind == NULL) + { + tofind = argv[i]; + } + else + { + FIXME("Searching files not supported yet\n"); + return 1000; + } + } + + if (tofind == NULL) + { + output_resource_message(IDS_INVALID_PARAMETER); + return 2; + } + + exitcode = 1; + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } - return 0; + return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc new file mode 100644 index 0000000000..8c358c8677 --- /dev/null +++ b/programs/find/find.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2019 Fabian Maurer + * + * 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 + */ + +#include "resources.h" + +STRINGTABLE +{ + IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" + IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" +} diff --git a/programs/find/resources.h b/programs/find/resources.h new file mode 100644 index 0000000000..2ebe197b7d --- /dev/null +++ b/programs/find/resources.h @@ -0,0 +1,27 @@ +/* + * Resource IDs + * + * Copyright 2019 Fabian Maurer + * + * 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 + */ + +#ifndef __WINE_FIND_RESOURCES_H +#define __WINE_FIND_RESOURCES_H + +#define IDS_INVALID_PARAMETER 1000 +#define IDS_INVALID_SWITCH 1001 + +#endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 8af21a53fa..147b59c8ce 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -90,7 +90,6 @@ static void check_find_output(const BYTE *child_output, int child_output_len, co } - todo_wine_if(out_expected_len != 0) ok_(file, line)(strings_are_equal, "\n#################### Expected:\n" "%s\n" "#################### But got:\n" @@ -176,7 +175,6 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp check_find_output(child_output, child_output_len, out_expected, out_expected_len, file, line); - todo_wine_if(exitcode_expected != 0) ok_(file, line)(exitcode == exitcode_expected, "Expected exitcode %d, got %d\n", exitcode_expected, exitcode); heap_free(child_output); @@ -227,7 +225,9 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("test", "", "FIND: Parameter format not correct\r\n", 2); + todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); } @@ -238,6 +238,7 @@ static void test_singleline_without_switches(void) run_find_stdin_str("\"test\"", "", "", 1); run_find_stdin_str("\"test\"", "test", "test\r\n", 0); run_find_stdin_str("\"test\"", "test2", "test2\r\n", 0); + run_find_stdin_str("\"test\"", "test\r2", "test\r2\r\n", 0); run_find_stdin_str("\"test2\"", "test", "", 1); } @@ -297,6 +298,7 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */ + todo_wine run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } -- 2.23.0

2 3

[PATCH v5 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam Nov. 1, 2019

Nov. 1, 2019

Enumeration of devices was checked in real boxes and device was enumerated once at least: windows 10, windows 8, windows XP and windows98. The last one is worth of checking I think, since old interfaces were used in this old windows only. And some games work only in this box.

2 1

[PATCH 1/2] d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags.
by Paul Gofman Nov. 1, 2019

Nov. 1, 2019

Fixes test failures on older Testbot Windows versions in test_sample_attached_rtv(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 47a974e9fc..675a9ee49c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29392,6 +29392,7 @@ static void test_sample_attached_rtv(void) struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; D3D11_TEXTURE2D_DESC texture_desc; + D3D_FEATURE_LEVEL feature_level; D3D11_SAMPLER_DESC sampler_desc; ID3D11DepthStencilView *dsview; ID3D11BlendState *blend_state; @@ -29475,6 +29476,8 @@ static void test_sample_attached_rtv(void) device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; @@ -29644,6 +29647,16 @@ static void test_sample_attached_rtv(void) for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) { + if (ds_tests[i].dsv_flags && feature_level < D3D_FEATURE_LEVEL_11_0) + { + static unsigned int skip_once; + + if (!skip_once++) + skip("Read only depths or stencils are not supported.\n"); + + continue; + } + texture_desc.Format = ds_tests[i].texture_format; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr); -- 2.23.0

3 4

[PATCH v5 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam Nov. 1, 2019

Nov. 1, 2019

2 1

[PATCH] vkd3d: Store a copy of Vulkan view object handles in descriptors.
by Conor McCarthy Nov. 1, 2019

Nov. 1, 2019

In vk_write_descriptor_set_from_d3d12_desc() this avoids memory reads from the view object on the heap which often cause cache misses. It is a relatively simple (but hacky) change for a 0.5% frame rate increase in SotTR. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 10 ++++------ libs/vkd3d/resource.c | 38 ++++++++++++++++++++++++-------------- libs/vkd3d/vkd3d_private.h | 7 ++++++- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0532ec0..69d1baa 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2548,8 +2548,6 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des uint32_t descriptor_range_magic, VkDescriptorSet vk_descriptor_set, uint32_t vk_binding, unsigned int index) { - const struct vkd3d_view *view = descriptor->u.view; - if (descriptor->magic != descriptor_range_magic) return false; @@ -2582,12 +2580,12 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { - vk_descriptor_write->pTexelBufferView = &view->u.vk_buffer_view; + vk_descriptor_write->pTexelBufferView = (const VkBufferView *)&descriptor->u.v.vk_view; } else { vk_image_info->sampler = VK_NULL_HANDLE; - vk_image_info->imageView = view->u.vk_image_view; + vk_image_info->imageView = descriptor->u.v.vk_view; vk_image_info->imageLayout = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV ? VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL : VK_IMAGE_LAYOUT_GENERAL; @@ -2596,7 +2594,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des break; case VKD3D_DESCRIPTOR_MAGIC_SAMPLER: - vk_image_info->sampler = view->u.vk_sampler; + vk_image_info->sampler = descriptor->u.v.vk_view; vk_image_info->imageView = VK_NULL_HANDLE; vk_image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -2649,7 +2647,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + ? descriptor->u.v.vk_counter_view : VK_NULL_HANDLE; if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) bindings->uav_counter_dirty_mask |= 1u << register_idx; bindings->vk_uav_counter_views[register_idx] = vk_counter_view; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d6e999e..5627aef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2044,7 +2044,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr struct d3d12_desc destroy_desc; pthread_mutex_t *mutex; - destroy_desc.u.view = NULL; + destroy_desc.u.v.view = NULL; mutex = d3d12_device_get_descriptor_mutex(device, dst); pthread_mutex_lock(mutex); @@ -2053,7 +2053,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr if ((dst->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || dst->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || dst->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) - && !InterlockedDecrement(&dst->u.view->refcount)) + && !InterlockedDecrement(&dst->u.v.view->refcount)) destroy_desc = *dst; *dst = *src; @@ -2061,8 +2061,8 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr pthread_mutex_unlock(mutex); /* Destroy the view after unlocking to reduce wait time. */ - if (destroy_desc.u.view) - vkd3d_view_destroy_descriptor(destroy_desc.u.view, &destroy_desc, device); + if (destroy_desc.u.v.view) + vkd3d_view_destroy_descriptor(destroy_desc.u.v.view, &destroy_desc, device); } static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) @@ -2089,7 +2089,7 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, || src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || src->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) { - vkd3d_view_incref(src->u.view); + vkd3d_view_incref(src->u.v.view); } tmp = *src; @@ -2527,7 +2527,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, { descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } return; @@ -2563,7 +2564,8 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, @@ -2593,7 +2595,8 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } void d3d12_desc_create_srv(struct d3d12_desc *descriptor, @@ -2697,7 +2700,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UAV_FLAGS flags) @@ -2734,7 +2738,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, { descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; } return; @@ -2770,7 +2775,8 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -2803,7 +2809,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_buffer_view; if (counter_resource) { @@ -2820,6 +2827,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ view->vk_counter_view = VK_NULL_HANDLE; d3d12_desc_destroy(descriptor, device); } + descriptor->u.v.vk_counter_view = view->vk_counter_view; } /* FIXME: Clears are implemented only for R32_UINT buffer UAVs. */ @@ -2883,7 +2891,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - descriptor->u.view = view; + descriptor->u.v.view = view; + descriptor->u.v.vk_view = view->u.vk_image_view; descriptor->uav.texture.vk_aspect_mask = vkd3d_desc.format->vk_aspect_mask; descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; @@ -3046,7 +3055,8 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, sampler->magic = VKD3D_DESCRIPTOR_MAGIC_SAMPLER; sampler->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLER; - sampler->u.view = view; + sampler->u.v.view = view; + sampler->u.v.vk_view = view->u.vk_sampler; } HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d62fda..0f2d916 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -480,7 +480,12 @@ struct d3d12_desc union { VkDescriptorBufferInfo vk_cbv_info; - struct vkd3d_view *view; + struct + { + struct vkd3d_view *view; + void *vk_view; + VkBufferView vk_counter_view; + } v; } u; union -- 2.23.0

2 1

[PATCH v2 3/4] winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Zhiyi Zhang Nov. 1, 2019

Nov. 1, 2019

So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 162 +++++++++++++++++++++++++------------ 1 file changed, 109 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..5b0b062ff6 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,134 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rect cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime; + HKEY video_key; + HANDLE mutex; + DWORD i = 0; + INT result; + DWORD type; + LSTATUS lr; + BOOL ret = FALSE; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + return FALSE; + lr = RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime); + RegCloseKey(video_key); + if (lr) + return FALSE; + + EnterCriticalSection(&screen_section); + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + ERR("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +422,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +446,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +494,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +509,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +520,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +571,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters) -- 2.23.0

2 2

[PATCH v3 2/2] winex11.drv: Handle display device events in the desktop thread.
by Zhiyi Zhang Nov. 1, 2019

Nov. 1, 2019

This fixes a regression from 22795243b2d21e1a667215f54c3a15634735749c, which calls thread_init_display() and eventually XOpenIM() before X11DRV_InitXIM() is called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 5 +++++ dlls/winex11.drv/xinerama.c | 1 + dlls/winex11.drv/xrandr.c | 35 +++++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a323b795b8..ee867343ae 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -241,6 +241,12 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +void X11DRV_DisplayDevices_RegisterEventHandlers(void) +{ + if (handler.register_event_handlers) + handler.register_event_handlers(); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f3c6a1b3cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1833,6 +1833,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) XFlush( data->display ); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); X11DRV_InitClipboard(); + X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06cf3ffd8..35e27334db 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -743,10 +743,15 @@ struct x11drv_display_device_handler /* free_monitors will be called to free a monitor list from get_monitors */ void (*free_monitors)(struct x11drv_monitor *monitors); + + /* register_event_handlers will be called to register event handlers. + * This function pointer is optional and can be NULL when driver doesn't support it */ + void (*register_event_handlers)(void); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b5620d3403..57c77d6273 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -344,5 +344,6 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.free_gpus = xinerama_free_gpus; handler.free_adapters = xinerama_free_adapters; handler.free_monitors = xinerama_free_monitors; + handler.register_event_handlers = NULL; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 412400e3f6..0a64613fac 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1063,10 +1063,29 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } -static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { - X11DRV_DisplayDevices_Init( TRUE ); - return TRUE; + if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) + X11DRV_DisplayDevices_Init( TRUE ); + return FALSE; +} + +static void xrandr14_register_event_handlers(void) +{ + Display *display = thread_init_display(); + int event_base, error_base; + + if (!pXRRQueryExtension( display, &event_base, &error_base )) + return; + + pXRRSelectInput( display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask ); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_handler, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_handler, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_handler, + "XRandR ProviderChange" ); } #endif @@ -1115,16 +1134,8 @@ void X11DRV_XRandR_Init(void) handler.free_gpus = xrandr14_free_gpus; handler.free_adapters = xrandr14_free_adapters; handler.free_monitors = xrandr14_free_monitors; + handler.register_event_handlers = xrandr14_register_event_handlers; X11DRV_DisplayDevices_SetHandler( &handler ); - - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); - X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, - "XRandR CrtcChange" ); - X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, - "XRandR OutputChange" ); - X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, - "XRandR ProviderChange" ); } #endif } -- 2.23.0

1 0