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

[PATCH] msvcrt: Handle negative zero (-0.0) in _ecvt and others.

by Lauri Kenttä

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- dlls/msvcrt/math.c | 24 ++++++++++++++++++++---- dlls/msvcrt/tests/printf.c | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6b2d08a8294..cdc93a6b75a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2588,6 +2588,10 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) if( number < 0) { *sign = TRUE; number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? TRUE : FALSE; + number = 0; } else *sign = FALSE; /* handle cases with zero ndigits or less */ @@ -2651,6 +2655,10 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int if( number < 0) { *sign = TRUE; number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? TRUE : FALSE; + number = 0; } else *sign = FALSE; len = _snprintf(result, prec + 7, "%.*le", prec - 1, number); @@ -2692,8 +2700,12 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) if (number < 0) { - *sign = 1; - number = -number; + *sign = 1; + number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? 1 : 0; + number = 0; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); @@ -2776,8 +2788,12 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int if (number < 0) { - *sign = 1; - number = -number; + *sign = 1; + number = -number; + } else if(number == 0) { + /* handle negative zero correctly */ + *sign = signbit(number) ? 1 : 0; + number = 0; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 8960671f23e..14fd75d2b3c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -647,6 +647,10 @@ static struct { { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, + /* -0.0 with different precisions */ + { -0.0, 5, "00000", "00000", 0, 0, 1 }, + { -0.0, 0, "", "", 0, 0, 1 }, + { -0.0, -1, "", "", 0, 0, 1 }, /* Numbers > 1.0 with 0 or -ve precision */ { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, -- 2.31.0

March 31, 2021

[PATCH] include: Add ID2D1DeviceContext1 definition.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_2.idl | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 3506c796ccb..39e285dc221 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -18,8 +18,6 @@ import "d2d1_1.idl"; -interface ID2D1DeviceContext1; - typedef enum D2D1_RENDERING_PRIORITY { D2D1_RENDERING_PRIORITY_NORMAL = 0, @@ -27,6 +25,40 @@ typedef enum D2D1_RENDERING_PRIORITY D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff, } D2D1_RENDERING_PRIORITY; +[ + object, + uuid(a16907d7-bc02-4801-99e8-8cf7f485f774), + local, +] +interface ID2D1GeometryRealization : ID2D1Resource +{ +} + +[ + object, + uuid(d37f57e4-6908-459f-a199-e72f24f79987), + local, +] +interface ID2D1DeviceContext1 : ID2D1DeviceContext +{ + HRESULT CreateFilledGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [out] ID2D1GeometryRealization **realization + ); + HRESULT CreateStrokedGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [in] float stroke_width, + [in] ID2D1StrokeStyle *stroke_style, + [out] ID2D1GeometryRealization **realization + ); + void DrawGeometryRealization( + [in] ID2D1GeometryRealization *realization, + [in] ID2D1Brush *brush + ); +} + [ object, uuid(d21768e1-23a4-4823-a14b-7c3eba85d658), -- 2.30.2

March 31, 2021

Re: [PATCH 3/5] winex11.drv: Don't remap root_window relative coordinates.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > On 3/31/21 7:52 PM, Alexandre Julliard wrote: >> Rémi Bernon <rbernon(a)codeweavers.com> writes: >> >>> @@ -599,15 +599,15 @@ static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data * >>> 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) >>> + else 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 ); >>> + 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 ); >>> + } >> This is wrong, you'd still need to map them for the client window. > > Can this happen? I don't think we register input for the client windows. > > As far as I can see the event's window is always the whole_window, for > which we selected pointer motion events, and that received input. It was happening at some point. I think we might as well keep the check in case we change things and get client window events again, but otherwise the if() should be removed. -- Alexandre Julliard julliard(a)winehq.org

March 31, 2021

Re: [PATCH] jscript: Support calling properties with getters.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=88032 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w7u_el (32 bit report) === mshtml: script.c:624: Test failed: L"/index.html?es5.js:date_now: unexpected Date.now() result 1617216315498 expected 1617216315560"

March 31, 2021

Re: [PATCH 3/5] winex11.drv: Don't remap root_window relative coordinates.

by Rémi Bernon

On 3/31/21 7:52 PM, Alexandre Julliard wrote: > Rémi Bernon <rbernon(a)codeweavers.com> writes: > >> @@ -599,15 +599,15 @@ static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data * >> 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) >> + else 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 ); >> + 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 ); >> + } > > This is wrong, you'd still need to map them for the client window. > Can this happen? I don't think we register input for the client windows. As far as I can see the event's window is always the whole_window, for which we selected pointer motion events, and that received input. -- Rémi Bernon <rbernon(a)codeweavers.com>

March 31, 2021

[PATCH] winevulkan: Fix queue creation with mixed queue flags.

by Georg Lehmann

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

March 31, 2021

[PATCH] jscript: Support calling properties with getters.

by Jacek Caban

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(-)

March 31, 2021

Re: [PATCH 3/5] winex11.drv: Don't remap root_window relative coordinates.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > @@ -599,15 +599,15 @@ static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data * > 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) > + else 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 ); > + 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 ); > + } This is wrong, you'd still need to map them for the client window. -- Alexandre Julliard julliard(a)winehq.org

March 31, 2021

Re: [PATCH 2/8] winedevice: Move service_handler() to ntoskrnl.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 89 ++++++++++++++++++++++- > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- > programs/winedevice/device.c | 106 ++-------------------------- > 3 files changed, 93 insertions(+), 104 deletions(-) This looks like it's going to break the Android driver. -- Alexandre Julliard julliard(a)winehq.org

March 31, 2021

Re: [PATCH 5/5] d3d11: Use wined3d_device_context_draw_indirect().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=88031 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 error: patch failed: dlls/wined3d/cs.c:1072 error: patch failed: dlls/wined3d/device.c:4484 error: patch failed: dlls/wined3d/wined3d.spec:168 error: patch failed: dlls/wined3d/wined3d_private.h:4735 error: patch failed: include/wine/wined3d.h:2563 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 error: patch failed: dlls/wined3d/cs.c:1072 error: patch failed: dlls/wined3d/device.c:4484 error: patch failed: dlls/wined3d/wined3d.spec:168 error: patch failed: dlls/wined3d/wined3d_private.h:4735 error: patch failed: include/wine/wined3d.h:2563 Task: Patch failed to apply

March 31, 2021