March 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] winex11.drv: Introduce new map_event_coords helper.
by Rémi Bernon 31 Mar '21

31 Mar '21

Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This patch has been in staging and proton for a while and been sent already but it silently dropped off the patch list. It's causing conflicts with some other patches I have that deal with __wine_send_input and that I'd like to send too, and so I cleaned it up a bit and I'm now sending it with Gabriel's blessing. I can reproduce the issue with Winamp, but not on my regular desktop. The issue is however pretty easy to reproduce when there's lag between Wine and X11, such as when using a remote X11 server. dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dd25f8b172c..8a379e5a3b7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -587,6 +587,34 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_event_coords + * + * Map the input event coordinates so they're relative to the desktop. + */ +static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +{ + POINT pt = { input->u.mi.dx, input->u.mi.dy }; + + TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + + TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -618,24 +646,8 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + pt = map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100) -- 2.30.2

3 12

[PATCH] jscript: Support calling properties with getters.
by Jacek Caban 31 Mar '21

31 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 130 ++++++++++++++++++++++----------------- dlls/mshtml/tests/es5.js | 13 ++++ 2 files changed, 85 insertions(+), 58 deletions(-)

2 1

[PATCH] winevulkan: Fix queue creation with mixed queue flags.
by Georg Lehmann 31 Mar '21

31 Mar '21

The Vulkan spec says: The queueFamilyIndex member of each element of pQueueCreateInfos must be unique within pQueueCreateInfos, except that two members can share the same queueFamilyIndex if one is a protected-capable queue and one is not a protected-capable queue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 83 ++++++++++++++++++-------------- dlls/winevulkan/vulkan_private.h | 6 ++- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b2045295718..0beb09329d2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -323,25 +323,21 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, } } -static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, - uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) +static void wine_vk_device_get_queues(struct VkDevice_T *device, + uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags, + struct VkQueue_T* queues) { VkDeviceQueueInfo2 queue_info; - struct VkQueue_T *queues; unsigned int i; - if (!(queues = heap_calloc(queue_count, sizeof(*queues)))) - { - ERR("Failed to allocate memory for queues\n"); - return NULL; - } - for (i = 0; i < queue_count; i++) { struct VkQueue_T *queue = &queues[i]; queue->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; queue->device = device; + queue->family_index = family_index; + queue->queue_index = i; queue->flags = flags; /* The Vulkan spec says: @@ -365,8 +361,6 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, WINE_VK_ADD_DISPATCHABLE_MAPPING(device->phys_dev->instance, queue, queue->queue); } - - return queues; } static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) @@ -438,17 +432,18 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src */ static void wine_vk_device_free(struct VkDevice_T *device) { + struct VkQueue_T *queue; if (!device) return; if (device->queues) { unsigned int i; - for (i = 0; i < device->max_queue_families; i++) + for (i = 0; i < device->queue_count; i++) { - if (device->queues[i] && device->queues[i]->queue) - WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, device->queues[i]); - heap_free(device->queues[i]); + queue = &device->queues[i]; + if (queue && queue->queue) + WINE_VK_REMOVE_HANDLE_MAPPING(device->phys_dev->instance, queue); } heap_free(device->queues); device->queues = NULL; @@ -764,7 +759,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, const VkAllocationCallbacks *allocator, VkDevice *device) { VkDeviceCreateInfo create_info_host; - uint32_t max_queue_families; + struct VkQueue_T *next_queue; struct VkDevice_T *object; unsigned int i; VkResult res; @@ -819,17 +814,18 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, /* We need to cache all queues within the device as each requires wrapping since queues are * dispatchable objects. */ - phys_dev->instance->funcs.p_vkGetPhysicalDeviceQueueFamilyProperties(phys_dev->phys_dev, - &max_queue_families, NULL); - object->max_queue_families = max_queue_families; - TRACE("Max queue families: %u.\n", object->max_queue_families); + for (i = 0; i < create_info_host.queueCreateInfoCount; i++) + { + object->queue_count += create_info_host.pQueueCreateInfos[i].queueCount; + } - if (!(object->queues = heap_calloc(max_queue_families, sizeof(*object->queues)))) + if (!(object->queues = heap_calloc(object->queue_count, sizeof(*object->queues)))) { res = VK_ERROR_OUT_OF_HOST_MEMORY; goto fail; } + next_queue = object->queues; for (i = 0; i < create_info_host.queueCreateInfoCount; i++) { uint32_t flags = create_info_host.pQueueCreateInfos[i].flags; @@ -838,12 +834,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, TRACE("Queue family index %u, queue count %u.\n", family_index, queue_count); - if (!(object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count, flags))) - { - ERR("Failed to allocate memory for queues.\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto fail; - } + wine_vk_device_get_queues(object, family_index, queue_count, flags, next_queue); + next_queue += queue_count; } object->quirks = phys_dev->instance->quirks; @@ -1173,17 +1165,42 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return NULL; } +static VkQueue wine_vk_device_find_queue(VkDevice device, const VkDeviceQueueInfo2 *info) +{ + struct VkQueue_T* queue; + uint32_t i; + + for (i = 0; i < device->queue_count; i++) + { + queue = &device->queues[i]; + if (queue->family_index == info->queueFamilyIndex + && queue->queue_index == info->queueIndex + && queue->flags == info->flags) + { + return queue; + } + } + + return VK_NULL_HANDLE; +} + void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t family_index, uint32_t queue_index, VkQueue *queue) { + VkDeviceQueueInfo2 queue_info; TRACE("%p, %u, %u, %p\n", device, family_index, queue_index, queue); - *queue = &device->queues[family_index][queue_index]; + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = family_index; + queue_info.queueIndex = queue_index; + + *queue = wine_vk_device_find_queue(device, &queue_info); } void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *info, VkQueue *queue) { - struct VkQueue_T *matching_queue; const VkBaseInStructure *chain; TRACE("%p, %p, %p\n", device, info, queue); @@ -1191,13 +1208,7 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in if ((chain = info->pNext)) FIXME("Ignoring a linked structure of type %u.\n", chain->sType); - matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; - if (matching_queue->flags != info->flags) - { - WARN("No matching flags were specified %#x, %#x.\n", matching_queue->flags, info->flags); - matching_queue = VK_NULL_HANDLE; - } - *queue = matching_queue; + *queue = wine_vk_device_find_queue(device, info); } PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 322d27079ea..2b4d155ca9b 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -87,8 +87,8 @@ struct VkDevice_T struct VkPhysicalDevice_T *phys_dev; /* parent */ VkDevice device; /* native device */ - struct VkQueue_T **queues; - uint32_t max_queue_families; + struct VkQueue_T* queues; + uint32_t queue_count; unsigned int quirks; @@ -153,6 +153,8 @@ struct VkQueue_T struct VkDevice_T *device; /* parent */ VkQueue queue; /* native queue */ + uint32_t family_index; + uint32_t queue_index; VkDeviceQueueCreateFlags flags; struct wine_vk_mapping mapping; -- 2.31.1

1 0

[PATCH 1/8] ntoskrnl/tests: Fix a test failure on LUA Windows.
by Zebediah Figura 31 Mar '21

31 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50abb9f9d1f..c3ebe5b8ee1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -173,6 +173,17 @@ static BOOL testsign_create_cert(struct testsign_context *ctx) ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) -- 2.30.2

3 10

[PATCH v3 1/7] d3d11/tests: Don't use all samples for blending in multisample resolve test.
by Jan Sikorski 31 Mar '21

31 Mar '21

Shows whether the resolve happens in the right color space. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 42 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f6ba0b16748..91637df0747 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30309,105 +30309,105 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff0dec4}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffe2cdc0, TRUE}, }; if (!init_test_context(&test_context, NULL)) @@ -30424,6 +30424,8 @@ static void test_multisample_resolve(void) return; } + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, 3); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); -- 2.31.0

4 12

[PATCH 4/4] d3d11: Use nameless unions.
by Jacek Caban 31 Mar '21

31 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/d3d11/Makefile.in | 1 - dlls/d3d11/device.c | 1 + dlls/d3d11/view.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)

3 2

[PATCH] mscoree: Update Wine Mono to 6.1.1.
by Esme Povirk 31 Mar '21

31 Mar '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..e3004c972f1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..e396d855e71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.25.1

2 1

[PATCH] conhost: Fix wrapping when write_console finishes on line end.
by Gabriel Ivăncescu 31 Mar '21

31 Mar '21

Remember the fact we completed the entire line in cursor_x, but report it as usual in other cases as the last character on the line. When writing a new character, a newline is then written so it wraps properly. This can happen in practice when writing one character at a time to the console; right now it will keep overwriting the last character on the line. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/conhost/conhost.c | 30 ++++++++-------- programs/conhost/conhost.h | 5 +++ programs/conhost/tests/tty.c | 67 ++++++++++++++++++++++++++++++++++++ programs/conhost/window.c | 8 ++--- 4 files changed, 91 insertions(+), 19 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fbee37d..e5ec84f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -278,7 +278,7 @@ static void tty_sync( struct console *console ) if (console->active->cursor_visible) { - set_tty_cursor( console, console->active->cursor_x, console->active->cursor_y ); + set_tty_cursor( console, get_bounded_cursor_x(console->active), console->active->cursor_y ); if (!console->tty_cursor_visible) { tty_write( console, "\x1b[?25h", 6 ); /* show cursor */ @@ -307,11 +307,12 @@ static void scroll_to_cursor( struct screen_buffer *screen_buffer ) { int w = screen_buffer->win.right - screen_buffer->win.left + 1; int h = screen_buffer->win.bottom - screen_buffer->win.top + 1; + unsigned int cursor_x = get_bounded_cursor_x(screen_buffer); - if (screen_buffer->cursor_x < screen_buffer->win.left) - screen_buffer->win.left = min( screen_buffer->cursor_x, screen_buffer->width - w ); - else if (screen_buffer->cursor_x > screen_buffer->win.right) - screen_buffer->win.left = max( screen_buffer->cursor_x, w ) - w + 1; + if (cursor_x < screen_buffer->win.left) + screen_buffer->win.left = min( cursor_x, screen_buffer->width - w ); + else if (cursor_x > screen_buffer->win.right) + screen_buffer->win.left = max( cursor_x, w ) - w + 1; screen_buffer->win.right = screen_buffer->win.left + w - 1; if (screen_buffer->cursor_y < screen_buffer->win.top) @@ -1209,7 +1210,7 @@ static void update_read_output( struct console *console ) scroll_to_cursor( screen_buffer ); } if (console->is_unix) - set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); + set_tty_cursor_relative( screen_buffer->console, get_bounded_cursor_x(screen_buffer), screen_buffer->cursor_y ); tty_sync( screen_buffer->console ); update_window_config( screen_buffer->console ); } @@ -1356,7 +1357,7 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ } console->edit_line.history_index = console->history_index; - console->edit_line.home_x = console->active->cursor_x; + console->edit_line.home_x = get_bounded_cursor_x(console->active); console->edit_line.home_y = console->active->cursor_y; console->edit_line.status = STATUS_PENDING; if (edit_line_grow( console, 1 )) console->edit_line.buf[0] = 0; @@ -1716,7 +1717,7 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou info->cursor_size = screen_buffer->cursor_size; info->cursor_visible = screen_buffer->cursor_visible; - info->cursor_x = screen_buffer->cursor_x; + info->cursor_x = get_bounded_cursor_x(screen_buffer); info->cursor_y = screen_buffer->cursor_y; info->width = screen_buffer->width; info->height = screen_buffer->height; @@ -1917,10 +1918,12 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR switch (buffer[i]) { case '\b': - if (screen_buffer->cursor_x) screen_buffer->cursor_x--; + if (screen_buffer->cursor_x && screen_buffer->cursor_x < screen_buffer->width) + screen_buffer->cursor_x--; continue; case '\t': - j = min( screen_buffer->width - screen_buffer->cursor_x, 8 - (screen_buffer->cursor_x % 8) ); + j = screen_buffer->cursor_x < screen_buffer->width ? screen_buffer->cursor_x : 0; + j = min( screen_buffer->width - j, 8 - (j % 8) ); while (j--) write_char( screen_buffer, ' ', &update_rect, NULL ); continue; case '\n': @@ -1946,11 +1949,8 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR write_char( screen_buffer, buffer[i], &update_rect, NULL ); } - if (screen_buffer->cursor_x == screen_buffer->width) - { - if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) screen_buffer->cursor_x--; - else screen_buffer->cursor_x = update_rect.left; - } + if (screen_buffer->cursor_x == screen_buffer->width && !(screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT)) + screen_buffer->cursor_x = update_rect.left; scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 6f39853..9e855c3 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -140,6 +140,11 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +static inline unsigned int get_bounded_cursor_x( struct screen_buffer *screen_buffer ) +{ + return min(screen_buffer->cursor_x, screen_buffer->width - 1); +} + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 7cc37fa..db6c646 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -553,6 +553,8 @@ static void expect_char_key_(unsigned int line, WCHAR ch) static void test_write_console(void) { + BOOL expect_newline; + child_string_request(REQ_WRITE_CONSOLE, L"abc"); skip_hide_cursor(); expect_output_sequence("abc"); @@ -761,6 +763,71 @@ static void test_write_console(void) expect_empty_output(); child_set_output_mode(ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + child_set_cursor(28, 11); + skip_hide_cursor(); + expect_output_sequence("\x1b[12;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"a"); + skip_hide_cursor(); + expect_output_sequence("a"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"b"); + skip_hide_cursor(); + expect_output_sequence("b"); + expect_newline = TRUE; + if (!skip_sequence("\b")) + { + expect_newline = FALSE; + expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"c"); + skip_hide_cursor(); + if (expect_newline) expect_output_sequence("\r\n"); + expect_output_sequence("c"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_set_cursor(28, 11); + skip_hide_cursor(); + expect_output_sequence("\x1b[12;29H"); /* set cursor */ + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"x"); + skip_hide_cursor(); + expect_output_sequence("x"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"y"); + skip_hide_cursor(); + expect_output_sequence("y"); + expect_newline = TRUE; + if (!skip_sequence("\b")) + { + expect_newline = FALSE; + expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"\b"); + expect_empty_output(); + + child_string_request(REQ_WRITE_CONSOLE, L"z"); + skip_hide_cursor(); + if (expect_newline) expect_output_sequence("\r\n"); + expect_output_sequence("z"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_empty_output(); } static void test_tty_output(void) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a665cbb..456bcdd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -430,8 +430,8 @@ static void update_window_cursor( struct console *console ) { if (console->win != GetFocus() || !console->active->cursor_visible) return; - SetCaretPos( (console->active->cursor_x - console->active->win.left) * console->active->font.width, - (console->active->cursor_y - console->active->win.top) * console->active->font.height ); + SetCaretPos( (get_bounded_cursor_x(console->active) - console->active->win.left) * console->active->font.width, + (console->active->cursor_y - console->active->win.top) * console->active->font.height ); ShowCaret( console->win ); } @@ -607,10 +607,10 @@ static void update_window( struct console *console ) } } - if (update_all || console->active->cursor_x != console->window->cursor_pos.X || + if (update_all || get_bounded_cursor_x(console->active) != console->window->cursor_pos.X || console->active->cursor_y != console->window->cursor_pos.Y) { - console->window->cursor_pos.X = console->active->cursor_x; + console->window->cursor_pos.X = get_bounded_cursor_x(console->active); console->window->cursor_pos.Y = console->active->cursor_y; update_window_cursor( console ); } -- 2.30.0

3 5

[PATCH] combase: Move IGlobalOptions implementation.
by Nikolay Sivov 31 Mar '21

31 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Global options supposedly control exception handling configuration of a COM core, which is now in combase. dlls/combase/combase.c | 162 +++++++++++++++++++++++++++++++++++++- dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 96 ---------------------- dlls/ole32/oleproxy.c | 13 --- 4 files changed, 162 insertions(+), 111 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 09d455317d1..cda0d52f579 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -429,6 +429,150 @@ static void com_cleanup_tlsdata(void) NtCurrentTeb()->ReservedForOle = NULL; } +struct global_options +{ + IGlobalOptions IGlobalOptions_iface; + LONG refcount; +}; + +static inline struct global_options *impl_from_IGlobalOptions(IGlobalOptions *iface) +{ + return CONTAINING_RECORD(iface, struct global_options, IGlobalOptions_iface); +} + +static HRESULT WINAPI global_options_QueryInterface(IGlobalOptions *iface, REFIID riid, void **ppv) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualGUID(&IID_IGlobalOptions, riid) || IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; +} + +static ULONG WINAPI global_options_AddRef(IGlobalOptions *iface) +{ + struct global_options *options = impl_from_IGlobalOptions(iface); + LONG refcount = InterlockedIncrement(&options->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI global_options_Release(IGlobalOptions *iface) +{ + struct global_options *options = impl_from_IGlobalOptions(iface); + LONG refcount = InterlockedDecrement(&options->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + if (!refcount) + heap_free(options); + + return refcount; +} + +static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) +{ + FIXME("%p, %u, %lx.\n", iface, property, value); + + return S_OK; +} + +static HRESULT WINAPI global_options_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) +{ + FIXME("%p, %u, %p.\n", iface, property, value); + + return E_NOTIMPL; +} + +static const IGlobalOptionsVtbl global_options_vtbl = +{ + global_options_QueryInterface, + global_options_AddRef, + global_options_Release, + global_options_Set, + global_options_Query +}; + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("%d\n", fLock); + + return S_OK; +} + +static HRESULT WINAPI global_options_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + struct global_options *object; + HRESULT hr; + + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return E_INVALIDARG; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + object->IGlobalOptions_iface.lpVtbl = &global_options_vtbl; + object->refcount = 1; + + hr = IGlobalOptions_QueryInterface(&object->IGlobalOptions_iface, riid, ppv); + IGlobalOptions_Release(&object->IGlobalOptions_iface); + return hr; +} + +static const IClassFactoryVtbl global_options_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + global_options_CreateInstance, + class_factory_LockServer +}; + +static IClassFactory global_options_factory = { &global_options_factory_vtbl }; + +static HRESULT get_builtin_class_factory(REFCLSID rclsid, REFIID riid, void **obj) +{ + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&global_options_factory, riid, obj); + return E_UNEXPECTED; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ @@ -1569,7 +1713,11 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); - return Ole32DllGetClassObject(rclsid, riid, obj); + + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return get_builtin_class_factory(rclsid, riid, obj); + else + return Ole32DllGetClassObject(rclsid, riid, obj); } } @@ -3226,3 +3374,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + TRACE("%s, %s, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&global_options_factory, riid, obj); + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6e74cca1f24..0437714edcc 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -178,7 +178,7 @@ @ stub DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall DllGetActivationFactory(ptr ptr) -@ stdcall -private DllGetClassObject(ptr ptr ptr) ole32.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub EnableHookObject @ stdcall FreePropVariantArray(long ptr) @ stub FreePropVariantArrayWorker diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 51db61414dc..c40d8d03b2d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -924,102 +924,6 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return CLASS_E_CLASSNOTAVAILABLE; } -typedef struct { - IGlobalOptions IGlobalOptions_iface; - LONG ref; -} GlobalOptions; - -static inline GlobalOptions *impl_from_IGlobalOptions(IGlobalOptions *iface) -{ - return CONTAINING_RECORD(iface, GlobalOptions, IGlobalOptions_iface); -} - -static HRESULT WINAPI GlobalOptions_QueryInterface(IGlobalOptions *iface, REFIID riid, void **ppv) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - if (IsEqualGUID(&IID_IGlobalOptions, riid) || IsEqualGUID(&IID_IUnknown, riid)) - { - *ppv = iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI GlobalOptions_AddRef(IGlobalOptions *iface) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; -} - -static ULONG WINAPI GlobalOptions_Release(IGlobalOptions *iface) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if (!ref) - heap_free(This); - - return ref; -} - -static HRESULT WINAPI GlobalOptions_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - FIXME("(%p)->(%u %lx)\n", This, property, value); - return S_OK; -} - -static HRESULT WINAPI GlobalOptions_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) -{ - GlobalOptions *This = impl_from_IGlobalOptions(iface); - FIXME("(%p)->(%u %p)\n", This, property, value); - return E_NOTIMPL; -} - -static const IGlobalOptionsVtbl GlobalOptionsVtbl = { - GlobalOptions_QueryInterface, - GlobalOptions_AddRef, - GlobalOptions_Release, - GlobalOptions_Set, - GlobalOptions_Query -}; - -HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) -{ - GlobalOptions *global_options; - HRESULT hres; - - TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - - if (outer) - return E_INVALIDARG; - - global_options = heap_alloc(sizeof(*global_options)); - if (!global_options) - return E_OUTOFMEMORY; - global_options->IGlobalOptions_iface.lpVtbl = &GlobalOptionsVtbl; - global_options->ref = 1; - - hres = IGlobalOptions_QueryInterface(&global_options->IGlobalOptions_iface, riid, ppv); - IGlobalOptions_Release(&global_options->IGlobalOptions_iface); - return hres; -} - /*********************************************************************** * DllMain (OLE32.@) */ diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 0429e0f5495..e40e2b073e5 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -148,17 +148,6 @@ static const IClassFactoryVtbl ComCatCFVtbl = static IClassFactory ComCatCF = { &ComCatCFVtbl }; -static const IClassFactoryVtbl GlobalOptionsCFVtbl = -{ - ClassFactory_QueryInterface, - ClassFactory_AddRef, - ClassFactory_Release, - GlobalOptions_CreateInstance, - ClassFactory_LockServer -}; - -IClassFactory GlobalOptionsCF = { &GlobalOptionsCFVtbl }; - static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = { ClassFactory_QueryInterface, @@ -230,8 +219,6 @@ HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, riid, obj); else if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) return IClassFactory_QueryInterface(&ManualResetEventCF, riid, obj); - else if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) - return IClassFactory_QueryInterface(&GlobalOptionsCF, riid, obj); else if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) return FTMarshalCF_Create(riid, obj); else -- 2.30.2

1 0

[PATCH] dnsapi/tests: Don't fail on query timeouts.
by Hans Leidekker 31 Mar '21

31 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/tests/query.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 74669005a33..d68e9383204 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -40,7 +40,12 @@ static void test_DnsQuery(void) rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - ok(status == ERROR_SUCCESS, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %d\n", status); DnsRecordListFree(rec, DnsFreeRecordList); status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); -- 2.30.2

1 0