March 2018 - Wine-Commits - list.winehq.org

Józef Kucia : winevulkan: Simplify vkEnumerateDeviceExtensionProperties().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 1585b50fea761637cc415eccae94c62b7294ac7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1585b50fea761637cc415ecc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:51 2018 +0200 winevulkan: Simplify vkEnumerateDeviceExtensionProperties(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 41 ++++++++++------------------------------ dlls/winevulkan/vulkan_private.h | 4 ++-- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7294383..8e04e88 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -54,7 +54,7 @@ static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) if (!phys_dev) return; - heap_free(phys_dev->properties); + heap_free(phys_dev->extensions); heap_free(phys_dev); } @@ -115,10 +115,9 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties); - object->properties = heap_calloc(num_properties, sizeof(*object->properties)); - if (!object->properties) + if (!(object->extensions = heap_calloc(num_properties, sizeof(*object->extensions)))) { - ERR("Failed to allocate memory for device properties!\n"); + ERR("Failed to allocate memory for device extensions!\n"); goto err; } @@ -126,11 +125,11 @@ static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstanc { if (wine_vk_device_extension_supported(host_properties[i].extensionName)) { - memcpy(&object->properties[j], &host_properties[i], sizeof(*object->properties)); + object->extensions[j] = host_properties[i]; j++; } } - object->num_properties = num_properties; + object->extension_count = num_properties; heap_free(host_properties); return object; @@ -672,9 +671,6 @@ void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallba VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_dev, const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - VkResult res; - unsigned int i, num_copies; - TRACE("%p, %p, %p, %p\n", phys_dev, layer_name, count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ @@ -686,32 +682,15 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ if (!properties) { - *count = phys_dev->num_properties; + *count = phys_dev->extension_count; return VK_SUCCESS; } - if (*count < phys_dev->num_properties) - { - /* Incomplete is a type of success used to signal the application - * that not all devices got copied. - */ - num_copies = *count; - res = VK_INCOMPLETE; - } - else - { - num_copies = phys_dev->num_properties; - res = VK_SUCCESS; - } - - for (i = 0; i < num_copies; i++) - { - memcpy(&properties[i], &phys_dev->properties[i], sizeof(phys_dev->properties[i])); - } - *count = num_copies; + *count = min(*count, phys_dev->extension_count); + memcpy(properties, phys_dev->extensions, *count * sizeof(*properties)); - TRACE("Result %d, extensions copied %u\n", res, num_copies); - return res; + TRACE("Returning %u extensions.\n", *count); + return *count < phys_dev->extension_count ? VK_INCOMPLETE : VK_SUCCESS; } VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 419e6ac..7f2f242 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -86,8 +86,8 @@ struct VkPhysicalDevice_T struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ - uint32_t num_properties; - VkExtensionProperties *properties; + uint32_t extension_count; + VkExtensionProperties *extensions; VkPhysicalDevice phys_dev; /* native physical device */ };

1 0

Józef Kucia : winex11: Return Wine Vulkan driver device functions from vkGetInstanceProcAddr().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: efddcedd162c869ca6a3f72bb7e57084b00ffd61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efddcedd162c869ca6a3f72b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:50 2018 +0200 winex11: Return Wine Vulkan driver device functions from vkGetInstanceProcAddr(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 62 ++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 6dce7ae..f881b0f 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -480,6 +480,35 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkQueuePresentKHR, }; +static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulkan_funcs, + const char *name) +{ + if (!name || name[0] != 'v' || name[1] != 'k') + return NULL; + + name += 2; + + if (!strcmp(name, "AcquireNextImageKHR")) + return vulkan_funcs->p_vkAcquireNextImageKHR; + if (!strcmp(name, "CreateSwapchainKHR")) + return vulkan_funcs->p_vkCreateSwapchainKHR; + if (!strcmp(name, "DestroySwapchainKHR")) + return vulkan_funcs->p_vkDestroySwapchainKHR; + if (!strcmp(name, "GetDeviceProcAddr")) + return vulkan_funcs->p_vkGetDeviceProcAddr; + if (!strcmp(name, "GetSwapchainImagesKHR")) + return vulkan_funcs->p_vkGetSwapchainImagesKHR; + if (!strcmp(name, "QueuePresentKHR")) + return vulkan_funcs->p_vkQueuePresentKHR; + + return NULL; +} + +static void *X11DRV_get_vk_device_proc_addr(const char *name) +{ + return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); +} + static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vulkan_funcs, VkInstance instance, const char *name) { @@ -515,7 +544,9 @@ static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vul if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - return NULL; + name -= 2; + + return get_vulkan_driver_device_proc_addr(vulkan_funcs, name); } static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name) @@ -523,35 +554,6 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); } -static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulkan_funcs, - const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') - return NULL; - - name += 2; - - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; - if (!strcmp(name, "CreateSwapchainKHR")) - return vulkan_funcs->p_vkCreateSwapchainKHR; - if (!strcmp(name, "DestroySwapchainKHR")) - return vulkan_funcs->p_vkDestroySwapchainKHR; - if (!strcmp(name, "GetDeviceProcAddr")) - return vulkan_funcs->p_vkGetDeviceProcAddr; - if (!strcmp(name, "GetSwapchainImagesKHR")) - return vulkan_funcs->p_vkGetSwapchainImagesKHR; - if (!strcmp(name, "QueuePresentKHR")) - return vulkan_funcs->p_vkQueuePresentKHR; - - return NULL; -} - -static void *X11DRV_get_vk_device_proc_addr(const char *name) -{ - return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); -} - const struct vulkan_funcs *get_vulkan_driver(UINT version) { if (version != WINE_VULKAN_DRIVER_VERSION)

1 0

Józef Kucia : winex11: Print error message when libvulkan cannot be loaded.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 1fab177c07f230409db749def137e03f60334d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fab177c07f230409db749de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:48 2018 +0200 winex11: Print error message when libvulkan cannot be loaded. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c633579..108ef19 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -134,7 +134,11 @@ static BOOL wine_vk_init(void) if (init_done) return (vulkan_handle != NULL); init_done = TRUE; - if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) return FALSE; + if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) + { + ERR("Failed to load %s\n", SONAME_LIBVULKAN); + return FALSE; + } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkAcquireNextImageKHR)

1 0

Austin English : wininet: Add ParseX509EncodedCertificateForListBoxEntry stub.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: c8861df6d11343d4742afed32b7a9fc5a50e2ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8861df6d11343d4742afed3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 28 03:20:02 2018 +0000 wininet: Add ParseX509EncodedCertificateForListBoxEntry stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/dialogs.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 938daa8..b13b566 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -574,6 +574,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) } /*********************************************************************** + * ParseX509EncodedCertificateForListBoxEntry (@) + */ +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) +{ + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * ShowX509EncodedCertificate (@) */ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index e4337a2..7ef28d6 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -216,7 +216,7 @@ @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stdcall LoadUrlCacheContent() -@ stub ParseX509EncodedCertificateForListBoxEntry +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) diff --git a/include/winineti.h b/include/winineti.h index 5b6f15f..5e38424 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -120,6 +120,7 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD); BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); #define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo)

1 0

Matteo Bruni : wined3d: Limit clears to the size of the framebuffer.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: c830b0706b9c727067b4a1258e89d4382818a7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c830b0706b9c727067b4a125… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 21:05:15 2018 +0200 wined3d: Limit clears to the size of the framebuffer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8edb74f..2f0c4ed 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -531,7 +531,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewport; + struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + RECT view_rect; unsigned int i; op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), @@ -553,12 +555,21 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { for (i = 0; i < rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_acquire(state->fb->render_targets[i]->resource); + if ((view = state->fb->render_targets[i])) + { + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); + } } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_acquire(state->fb->depth_stencil->resource); + { + view = state->fb->depth_stencil; + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); + } cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Jacek Caban : kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 0ca7c5c4e22fe7f0ae43596fe5ab7d27af5ff65e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca7c5c4e22fe7f0ae43596f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:51 2018 +0200 kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 36 ++++++++---- dlls/kernel32/tests/pipe.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 4e85aed..fcf1be7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1715,29 +1715,41 @@ BOOL WINAPI DisconnectNamedPipe(HANDLE hPipe) /*********************************************************************** * TransactNamedPipe (KERNEL32.@) - * - * BUGS - * should be done as a single operation in the wineserver or kernel */ BOOL WINAPI TransactNamedPipe( HANDLE handle, LPVOID write_buf, DWORD write_size, LPVOID read_buf, DWORD read_size, LPDWORD bytes_read, LPOVERLAPPED overlapped) { - BOOL r; - DWORD count; + IO_STATUS_BLOCK default_iosb, *iosb = &default_iosb; + HANDLE event = NULL; + void *cvalue = NULL; + NTSTATUS status; - TRACE("%p %p %d %p %d %p %p\n", - handle, write_buf, write_size, read_buf, + TRACE("%p %p %u %p %u %p %p\n", handle, write_buf, write_size, read_buf, read_size, bytes_read, overlapped); if (overlapped) - FIXME("Doesn't support overlapped operation as yet\n"); + { + event = overlapped->hEvent; + iosb = (IO_STATUS_BLOCK *)overlapped; + if (((ULONG_PTR)event & 1) == 0) cvalue = overlapped; + } + else + { + iosb->Information = 0; + } - r = WriteFile(handle, write_buf, write_size, &count, NULL); - if (r) - r = ReadFile(handle, read_buf, read_size, bytes_read, NULL); + status = NtFsControlFile(handle, event, NULL, cvalue, iosb, FSCTL_PIPE_TRANSCEIVE, + write_buf, write_size, read_buf, read_size); - return r; + if (bytes_read) *bytes_read = overlapped && status ? 0 : iosb->Information; + + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 22d120f..fa677cf 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3011,6 +3011,44 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_flush_done(flush_thread); } +#define overlapped_transact(a,b,c,d,e,f) _overlapped_transact(__LINE__,a,b,c,d,e,f) +static void _overlapped_transact(unsigned line, HANDLE caller, void *write_buf, DWORD write_size, + void *read_buf, DWORD read_size, OVERLAPPED *overlapped) +{ + BOOL res; + + memset(overlapped, 0, sizeof(*overlapped)); + overlapped->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + res = TransactNamedPipe(caller, write_buf, write_size, read_buf, read_size, NULL, overlapped); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_IO_PENDING, + "TransactNamedPipe returned: %x(%u)\n", res, GetLastError()); +} + +#define overlapped_transact_failure(a,b,c,d,e,f) _overlapped_transact_failure(__LINE__,a,b,c,d,e,f) +static void _overlapped_transact_failure(unsigned line, HANDLE caller, void *write_buf, DWORD write_size, + void *read_buf, DWORD read_size, DWORD expected_error) +{ + OVERLAPPED overlapped; + BOOL res; + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + res = TransactNamedPipe(caller, write_buf, write_size, read_buf, read_size, NULL, &overlapped); + ok_(__FILE__,line)(!res, "TransactNamedPipe succeeded\n"); + + if (GetLastError() == ERROR_IO_PENDING) /* win8+ */ + { + _test_overlapped_failure(line, caller, &overlapped, expected_error); + } + else + { + ok_(__FILE__,line)(GetLastError() == expected_error, + "TransactNamedPipe returned error %u, expected %u\n", + GetLastError(), expected_error); + CloseHandle(overlapped.hEvent); + } +} + static void child_process_write_pipe(HANDLE pipe) { OVERLAPPED overlapped; @@ -3146,6 +3184,105 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) CloseHandle(client); } +static void test_transact(HANDLE caller, HANDLE callee, DWORD write_buf_size, DWORD read_buf_size) +{ + OVERLAPPED overlapped, overlapped2, read_overlapped, write_overlapped; + char buf[10000], read_buf[10000]; + + memset(buf, 0xaa, sizeof(buf)); + + /* simple transact call */ + overlapped_transact(caller, (BYTE*)"abc", 3, read_buf, 100, &overlapped); + overlapped_write_sync(callee, (BYTE*)"test", 4); + test_overlapped_result(caller, &overlapped, 4, FALSE); + ok(!memcmp(read_buf, "test", 4), "unexpected read_buf\n"); + overlapped_read_sync(callee, read_buf, 1000, 3, FALSE); + ok(!memcmp(read_buf, "abc", 3), "unexpected read_buf\n"); + + /* transact fails if there is already data in read buffer */ + overlapped_write_sync(callee, buf, 1); + overlapped_transact_failure(caller, buf, 2, read_buf, 1, ERROR_PIPE_BUSY); + overlapped_read_sync(caller, read_buf, 1000, 1, FALSE); + + /* transact doesn't block on write */ + overlapped_write_async(caller, buf, write_buf_size+2000, &write_overlapped); + overlapped_transact(caller, buf, 2, read_buf, 1, &overlapped); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 1); + test_overlapped_result(caller, &overlapped, 1, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), write_buf_size+2000, FALSE); + test_overlapped_result(caller, &write_overlapped, write_buf_size+2000, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 2, FALSE); + + /* transact with already pending read */ + overlapped_read_async(callee, read_buf, 10, &read_overlapped); + overlapped_transact(caller, buf, 5, read_buf, 6, &overlapped); + test_overlapped_result(callee, &read_overlapped, 5, FALSE); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 10); + test_overlapped_result(caller, &overlapped, 6, TRUE); + overlapped_read_sync(caller, read_buf, sizeof(read_buf), 4, FALSE); + + /* 0-size messages */ + overlapped_transact(caller, buf, 5, read_buf, 0, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 5, FALSE); + overlapped_write_sync(callee, buf, 0); + test_overlapped_result(caller, &overlapped, 0, FALSE); + + overlapped_transact(caller, buf, 0, read_buf, 0, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 0, FALSE); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 0); + test_overlapped_result(caller, &overlapped, 0, FALSE); + + /* reply transact with another transact */ + overlapped_transact(caller, buf, 3, read_buf, 100, &overlapped); + overlapped_read_sync(callee, read_buf, 1000, 3, FALSE); + overlapped_transact(callee, buf, 4, read_buf, 100, &overlapped2); + test_overlapped_result(caller, &overlapped, 4, FALSE); + overlapped_write_sync(caller, buf, 1); + test_overlapped_result(caller, &overlapped2, 1, FALSE); + + if (!pCancelIoEx) return; + + /* cancel keeps written data */ + overlapped_write_async(caller, buf, write_buf_size+2000, &write_overlapped); + overlapped_transact(caller, buf, 2, read_buf, 1, &overlapped); + test_not_signaled(overlapped.hEvent); + cancel_overlapped(caller, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), write_buf_size+2000, FALSE); + test_overlapped_result(caller, &write_overlapped, write_buf_size+2000, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 2, FALSE); +} + +static void test_TransactNamedPipe(void) +{ + HANDLE client, server; + BYTE buf[10]; + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + overlapped_transact_failure(client, buf, 2, buf, 1, ERROR_BAD_PIPE); + CloseHandle(client); + CloseHandle(server); + + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_BYTE, &client, &server); + overlapped_transact_failure(client, buf, 2, buf, 1, ERROR_BAD_PIPE); + CloseHandle(client); + CloseHandle(server); + + trace("testing server->client transaction...\n"); + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, &client, &server); + test_transact(server, client, 5000, 6000); + CloseHandle(client); + CloseHandle(server); + + trace("testing client->server transaction...\n"); + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, &client, &server); + test_transact(client, server, 6000, 5000); + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3186,4 +3323,5 @@ START_TEST(pipe) test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); test_overlapped_transport(FALSE, FALSE); + test_TransactNamedPipe(); }

1 0

Józef Kucia : winex11: Get rid of wine_vk_load_instance_extensions().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 45cea4b4595c50d72121aeb3321abc3351066359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45cea4b4595c50d72121aeb3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:49 2018 +0200 winex11: Get rid of wine_vk_load_instance_extensions(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 73 +++++++++++++---------------------------------- 1 file changed, 20 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 108ef19..6dce7ae 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -80,50 +80,9 @@ static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *); static void *X11DRV_get_vk_device_proc_addr(const char *name); static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name); -static struct VkExtensionProperties *winex11_vk_instance_extensions = NULL; -static unsigned int winex11_vk_instance_extensions_count = 0; - -static void wine_vk_load_instance_extensions(void) +static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { - uint32_t num_properties; - VkExtensionProperties *properties; - unsigned int i; - - pvkEnumerateInstanceExtensionProperties(NULL, &num_properties, NULL); - - properties = heap_calloc(num_properties, sizeof(*properties)); - if (!properties) - return; - - /* We will return the same number of instance extensions reported by the host back to - * winevulkan. Along the way we may replace xlib extensions with their win32 equivalents. - * Winevulkan will perform more detailed filtering as it knows whether it has thunks - * for a particular extension. - */ - pvkEnumerateInstanceExtensionProperties(NULL, &num_properties, properties); - for (i = 0; i < num_properties; i++) - { - /* For now the only x11 extension we need to fixup. Long-term we may need an array. */ - if (!strcmp(properties[i].extensionName, "VK_KHR_xlib_surface")) - { - TRACE("Substituting VK_KHR_xlib_surface for VK_KHR_win32_surface\n"); - - memset(properties[i].extensionName, 0, sizeof(properties[i].extensionName)); - snprintf(properties[i].extensionName, sizeof(properties[i].extensionName), "VK_KHR_win32_surface"); - properties[i].specVersion = 6; /* Revision as of 4/24/2017 */ - } - - TRACE("Loaded extension: %s\n", properties[i].extensionName); - } - - winex11_vk_instance_extensions = properties; - winex11_vk_instance_extensions_count = num_properties; -} - -/* Helper function to convert VkSurfaceKHR (uint64_t) to a surface pointer. */ -static inline struct wine_vk_surface * surface_from_handle(VkSurfaceKHR handle) -{ - return ((struct wine_vk_surface *)(uintptr_t)handle); + return (struct wine_vk_surface *)(uintptr_t)handle; } static BOOL wine_vk_init(void) @@ -160,8 +119,6 @@ static BOOL wine_vk_init(void) LOAD_FUNCPTR(vkQueuePresentKHR) #undef LOAD_FUNCPTR - wine_vk_load_instance_extensions(); - return TRUE; } @@ -376,6 +333,7 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ uint32_t *count, VkExtensionProperties* properties) { unsigned int i; + VkResult res; TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); @@ -386,20 +344,29 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return VK_ERROR_LAYER_NOT_PRESENT; } - if (!properties) - { - *count = winex11_vk_instance_extensions_count; - return VK_SUCCESS; - } + /* We will return the same number of instance extensions reported by the host back to + * winevulkan. Along the way we may replace xlib extensions with their win32 equivalents. + * Winevulkan will perform more detailed filtering as it knows whether it has thunks + * for a particular extension. + */ + res = pvkEnumerateInstanceExtensionProperties(layer_name, count, properties); + if (!properties || res < 0) + return res; - *count = min(*count, winex11_vk_instance_extensions_count); for (i = 0; i < *count; i++) { - properties[i] = winex11_vk_instance_extensions[i]; + /* For now the only x11 extension we need to fixup. Long-term we may need an array. */ + if (!strcmp(properties[i].extensionName, "VK_KHR_xlib_surface")) + { + TRACE("Substituting VK_KHR_xlib_surface for VK_KHR_win32_surface\n"); + + snprintf(properties[i].extensionName, sizeof(properties[i].extensionName), "VK_KHR_win32_surface"); + properties[i].specVersion = 6; /* Revision as of 4/24/2017 */ + } } TRACE("Returning %u extensions.\n", *count); - return *count < winex11_vk_instance_extensions_count ? VK_INCOMPLETE : VK_SUCCESS; + return res; } static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name)

1 0

Alexandre Julliard : user32: Forward more system metrics to SystemParametersInfoW.
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: c2e0ae5bfd084d9b34c46517507e5d31d61494e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e0ae5bfd084d9b34c46517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 29 17:23:37 2018 +0200 user32: Forward more system metrics to SystemParametersInfoW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 85 +++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 31 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9467163..34e0a37 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2381,6 +2381,8 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, INT WINAPI GetSystemMetrics( INT index ) { NONCLIENTMETRICSW ncm; + MINIMIZEDMETRICS mm; + ICONMETRICSW im; UINT ret; HDC hdc; @@ -2399,10 +2401,13 @@ INT WINAPI GetSystemMetrics( INT index ) return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: - get_entry( &entry_SCROLLWIDTH, 0, &ret ); - return max( 8, ret ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iScrollWidth; case SM_CYCAPTION: - return GetSystemMetrics( SM_CYSIZE ) + 1; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iCaptionHeight + 1; case SM_CXBORDER: case SM_CYBORDER: /* SM_C{X,Y}BORDER always returns 1 regardless of 'BorderWidth' value in registry */ @@ -2414,8 +2419,9 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CXHTHUMB: case SM_CYVSCROLL: case SM_CXHSCROLL: - get_entry( &entry_SCROLLHEIGHT, 0, &ret ); - return max( 8, ret ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iScrollHeight; case SM_CXICON: case SM_CYICON: return MulDiv( 32, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); @@ -2426,7 +2432,9 @@ INT WINAPI GetSystemMetrics( INT index ) if (ret >= 48) return 48; return 32; case SM_CYMENU: - return GetSystemMetrics(SM_CYMENUSIZE) + 1; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iMenuHeight + 1; case SM_CXFULLSCREEN: /* see the remark for SM_CXMAXIMIZED, at least this formulation is * correct */ @@ -2459,18 +2467,21 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CYMIN: return GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME); case SM_CXSIZE: - get_entry( &entry_CAPTIONWIDTH, 0, &ret ); - return max( 8, ret ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iCaptionWidth; case SM_CYSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iCaptionHeight; case SM_CXFRAME: - get_entry( &entry_BORDER, 0, &ret ); - return GetSystemMetrics(SM_CXDLGFRAME) + max( 1, ret ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return GetSystemMetrics(SM_CXDLGFRAME) + ncm.iBorderWidth; case SM_CYFRAME: - get_entry( &entry_BORDER, 0, &ret ); - return GetSystemMetrics(SM_CYDLGFRAME) + max( 1, ret ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return GetSystemMetrics(SM_CYDLGFRAME) + ncm.iBorderWidth; case SM_CXMINTRACK: return GetSystemMetrics(SM_CXMIN); case SM_CYMINTRACK: @@ -2482,13 +2493,15 @@ INT WINAPI GetSystemMetrics( INT index ) get_entry( &entry_DOUBLECLKHEIGHT, 0, &ret ); return ret; case SM_CXICONSPACING: - get_entry( &entry_ICONHORIZONTALSPACING, 0, &ret ); - return ret; + im.cbSize = sizeof(im); + SystemParametersInfoW( SPI_GETICONMETRICS, sizeof(im), &im, 0 ); + return im.iHorzSpacing; case SM_CYICONSPACING: - get_entry( &entry_ICONVERTICALSPACING, 0, &ret ); - return ret; + im.cbSize = sizeof(im); + SystemParametersInfoW( SPI_GETICONMETRICS, sizeof(im), &im, 0 ); + return im.iVertSpacing; case SM_MENUDROPALIGNMENT: - get_entry( &entry_MENUDROPALIGNMENT, 0, &ret ); + SystemParametersInfoW( SPI_GETMENUDROPALIGNMENT, 0, &ret, 0 ); return ret; case SM_PENWINDOWS: return 0; @@ -2507,38 +2520,48 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CYEDGE: return GetSystemMetrics(SM_CYBORDER) + 1; case SM_CXMINSPACING: - get_entry( &entry_MINHORZGAP, 0, &ret ); - return GetSystemMetrics(SM_CXMINIMIZED) + max( 0, (INT)ret ); + mm.cbSize = sizeof(mm); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0 ); + return GetSystemMetrics(SM_CXMINIMIZED) + mm.iHorzGap; case SM_CYMINSPACING: - get_entry( &entry_MINVERTGAP, 0, &ret ); - return GetSystemMetrics(SM_CYMINIMIZED) + max( 0, (INT)ret ); + mm.cbSize = sizeof(mm); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0 ); + return GetSystemMetrics(SM_CYMINIMIZED) + mm.iVertGap; case SM_CXSMICON: case SM_CYSMICON: return MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ) & ~1; case SM_CYSMCAPTION: - return GetSystemMetrics(SM_CYSMSIZE) + 1; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iSmCaptionHeight + 1; case SM_CXSMSIZE: - get_entry( &entry_SMCAPTIONWIDTH, 0, &ret ); - return ret; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iSmCaptionWidth; case SM_CYSMSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iSmCaptionHeight; case SM_CXMENUSIZE: - get_entry( &entry_MENUWIDTH, 0, &ret ); - return ret; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iMenuWidth; case SM_CYMENUSIZE: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); return ncm.iMenuHeight; case SM_ARRANGE: - get_entry( &entry_MINARRANGE, 0, &ret ); - return ret & 0x0f; + mm.cbSize = sizeof(mm); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0 ); + return mm.iArrange; case SM_CXMINIMIZED: - get_entry( &entry_MINWIDTH, 0, &ret ); - return max( 0, (INT)ret ) + 6; + mm.cbSize = sizeof(mm); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(mm), &mm, 0 ); + return mm.iWidth + 6; case SM_CYMINIMIZED: - return GetSystemMetrics( SM_CYSIZE ) + 6; + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + return ncm.iCaptionHeight + 6; case SM_CXMAXTRACK: return GetSystemMetrics(SM_CXVIRTUALSCREEN) + 4 + 2 * GetSystemMetrics(SM_CXFRAME); case SM_CYMAXTRACK:

1 0

Alexandre Julliard : user32: Add a stub for GetDpiForWindow().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: 79916de39723c76a63775233ae8a17483d4d6b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79916de39723c76a63775233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 29 15:01:22 2018 +0200 user32: Add a stub for GetDpiForWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 454d58c..9467163 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2955,6 +2955,15 @@ UINT WINAPI GetDpiForSystem(void) return display_dpi; } +/*********************************************************************** + * GetDpiForWindow (USER32.@) + */ +UINT WINAPI GetDpiForWindow( HWND hwnd ) +{ + FIXME( "stub: %p\n", hwnd ); + return GetDpiForSystem(); +} + /********************************************************************** * SetThreadDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 05bdae4..e0fdd3a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -293,6 +293,7 @@ @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() @ stdcall GetDpiForSystem() +@ stdcall GetDpiForWindow(long) @ stdcall GetFocus() @ stdcall GetForegroundWindow() @ stdcall GetGestureConfig(long long long ptr ptr long) diff --git a/include/winuser.h b/include/winuser.h index 18a6e3a..ece0109 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3675,6 +3675,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT); WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); #define GetDlgItemText WINELIB_NAME_AW(GetDlgItemText) WINUSERAPI UINT WINAPI GetDoubleClickTime(void); +WINUSERAPI UINT WINAPI GetDpiForWindow(HWND); WINUSERAPI UINT WINAPI GetDpiForSystem(void); WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void);

1 0

Alexandre Julliard : user32: Implement GetDpiForSystem().
by Alexandre Julliard March 30, 2018

March 30, 2018

Module: wine Branch: master Commit: ca878114cb5eadf3f6f4c9cb727dff04b659ad03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca878114cb5eadf3f6f4c9cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 29 14:54:08 2018 +0200 user32: Implement GetDpiForSystem(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 64 ++++++++++++++++++++++--------------------------- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4824ad2..454d58c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -625,19 +625,6 @@ void release_display_dc( HDC hdc ) LeaveCriticalSection( &display_dc_section ); } -static inline int get_display_dpi(void) -{ - static int display_dpi; - HDC hdc; - if (!display_dpi) - { - hdc = get_display_dc(); - display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); - release_display_dc( hdc ); - } - return display_dpi; -} - static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) { const ENUMLOGFONTW *elf = (const ENUMLOGFONTW *)lf; @@ -768,7 +755,7 @@ static BOOL get_twips_entry( union sysparam_all_entry *entry, UINT int_param, vo * Technical Reference to the Windows 2000 Registry -> * HKEY_CURRENT_USER -> Control Panel -> Desktop -> WindowMetrics */ - if (val < 0) val = (-val * get_display_dpi() + 720) / 1440; + if (val < 0) val = (-val * GetDpiForSystem() + 720) / 1440; entry->uint.val = val; } } @@ -952,13 +939,13 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi { case sizeof(font): if (font.lfHeight > 0) /* positive height value means points ( inch/72 ) */ - font.lfHeight = -MulDiv( font.lfHeight, get_display_dpi(), 72 ); + font.lfHeight = -MulDiv( font.lfHeight, GetDpiForSystem(), 72 ); entry->font.val = font; break; case sizeof(LOGFONT16): /* win9x-winME format */ SYSPARAMS_LogFont16To32W( (LOGFONT16 *)&font, &entry->font.val ); if (entry->font.val.lfHeight > 0) - entry->font.val.lfHeight = -MulDiv( entry->font.val.lfHeight, get_display_dpi(), 72 ); + entry->font.val.lfHeight = -MulDiv( entry->font.val.lfHeight, GetDpiForSystem(), 72 ); break; default: WARN( "Unknown format in key %s value %s\n", @@ -1509,9 +1496,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = get_entry( &entry_ICONHORIZONTALSPACING, uiParam, pvParam ); else { - int min_val = 32; - if (IsProcessDPIAware()) - min_val = MulDiv( min_val, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + int min_val = MulDiv( 32, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); ret = set_entry( &entry_ICONHORIZONTALSPACING, max( min_val, uiParam ), pvParam, fWinIni ); } break; @@ -1552,9 +1537,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = get_entry( &entry_ICONVERTICALSPACING, uiParam, pvParam ); else { - int min_val = 32; - if (IsProcessDPIAware()) - min_val = MulDiv( min_val, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); + int min_val = MulDiv( 32, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); ret = set_entry( &entry_ICONVERTICALSPACING, max( min_val, uiParam ), pvParam, fWinIni ); } break; @@ -2435,18 +2418,12 @@ INT WINAPI GetSystemMetrics( INT index ) return max( 8, ret ); case SM_CXICON: case SM_CYICON: - ret = 32; - if (IsProcessDPIAware()) - ret = MulDiv( ret, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); - return ret; + return MulDiv( 32, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); case SM_CXCURSOR: case SM_CYCURSOR: - if (IsProcessDPIAware()) - { - ret = MulDiv( 32, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ); - if (ret >= 64) return 64; - if (ret >= 48) return 48; - } + ret = MulDiv( 32, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + if (ret >= 64) return 64; + if (ret >= 48) return 48; return 32; case SM_CYMENU: return GetSystemMetrics(SM_CYMENUSIZE) + 1; @@ -2537,10 +2514,7 @@ INT WINAPI GetSystemMetrics( INT index ) return GetSystemMetrics(SM_CYMINIMIZED) + max( 0, (INT)ret ); case SM_CXSMICON: case SM_CYSMICON: - ret = 16; - if (IsProcessDPIAware()) - ret = MulDiv( ret, get_display_dpi(), USER_DEFAULT_SCREEN_DPI ) & ~1; - return ret; + return MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ) & ~1; case SM_CYSMCAPTION: return GetSystemMetrics(SM_CYSMSIZE) + 1; case SM_CXSMSIZE: @@ -2963,6 +2937,24 @@ BOOL WINAPI IsProcessDPIAware(void) return TRUE; } +/*********************************************************************** + * GetDpiForSystem (USER32.@) + */ +UINT WINAPI GetDpiForSystem(void) +{ + static int display_dpi; + + if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; + + if (!display_dpi) + { + HDC hdc = get_display_dc(); + display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); + release_display_dc( hdc ); + } + return display_dpi; +} + /********************************************************************** * SetThreadDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1bcdf2c..05bdae4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -292,6 +292,7 @@ @ stdcall GetDlgItemTextA(long long ptr long) @ stdcall GetDlgItemTextW(long long ptr long) @ stdcall GetDoubleClickTime() +@ stdcall GetDpiForSystem() @ stdcall GetFocus() @ stdcall GetForegroundWindow() @ stdcall GetGestureConfig(long long long ptr ptr long) diff --git a/include/winuser.h b/include/winuser.h index d587859..18a6e3a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3675,6 +3675,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextA(HWND,INT,LPSTR,INT); WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); #define GetDlgItemText WINELIB_NAME_AW(GetDlgItemText) WINUSERAPI UINT WINAPI GetDoubleClickTime(void); +WINUSERAPI UINT WINAPI GetDpiForSystem(void); WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT);

1 0