August 2018 - Wine-commits - list.winehq.org

Józef Kucia : dxgi: Choose exact formats for D3D12 swapchain fallback formats.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 79bc939b40fff52a50d31e761c626f88180788f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79bc939b40fff52a50d31e76… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 24 15:44:06 2018 +0200 dxgi: Choose exact formats for D3D12 swapchain fallback formats. Mainly to avoid gamma correction issues. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f25..101f2d1 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1694,6 +1694,32 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) @@ -1734,10 +1760,11 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, if (i == format_count) { /* Try to create a swapchain with format conversion. */ + format = get_swapchain_fallback_format(format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); for (i = 0; i < format_count; ++i) { - if (formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) { format = formats[i].format; break; @@ -1757,20 +1784,6 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, return S_OK; } -static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; - default: - FIXME("Unhandled format %#x.\n", vk_format); - return DXGI_FORMAT_UNKNOWN; - } -} - static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, VkMemoryPropertyFlags flags, uint32_t *memory_type_index)

1 0

Hans Leidekker : winhttp: Use winsock sockets.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: ca56f992803420ef37d7a87158e572f981005e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca56f992803420ef37d7a871… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 27 14:36:38 2018 +0200 winhttp: Use winsock sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca56f992803420ef37d7…

1 0

Hans Leidekker : winhttp: Avoid double free on connection error.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 96a6053feda4e16480c21d01b3688a8d38e5ad6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a6053feda4e16480c21d01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 27 14:36:39 2018 +0200 winhttp: Avoid double free on connection error. Reported by Stefan Dösinger. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 9662402..c141185 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -234,7 +234,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock if (!ret) { WARN("unable to connect to host (%u)\n", get_last_error()); - netconn_close( conn ); + closesocket( conn->socket ); + heap_free( conn ); return NULL; } return conn;

1 0

Alex Henrie : shell32: Add "trash folder" icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 5d60f1697a26341b4bc9c702bfc02274a7aa988d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d60f1697a26341b4bc9c702… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:04 2018 -0600 shell32: Add "trash folder" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3ec02bd..cb8e25c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -622,6 +622,9 @@ IDI_SHELL_TO_FILE_PRINTER ICON resources/printer.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index bf1d52c..65ac1d7 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -234,6 +234,7 @@ #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 +#define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add "trash mixed" icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 9aabf827ed594b3631cfc847d70e57a0d3b46ba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aabf827ed594b3631cfc847… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:05 2018 -0600 shell32: Add "trash mixed" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index cb8e25c..cf4d0f5 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -625,6 +625,9 @@ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 65ac1d7..86770af 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -235,6 +235,7 @@ #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_TRASH_FOLDER 143 +#define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add file overwrite icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: fb706ed7f871ce632210cf9356c8e43789f032aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb706ed7f871ce632210cf93… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:06 2018 -0600 shell32: Add file overwrite icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index cf4d0f5..2af0205 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -628,6 +628,10 @@ IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 86770af..c6b1400 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -236,6 +236,7 @@ #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 +#define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add folder overwrite icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 6d4e625cb28d7e6e798b5304b125f0c89647d0e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4e625cb28d7e6e798b5304… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:07 2018 -0600 shell32: Add folder overwrite icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2af0205..169d345 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -632,6 +632,10 @@ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico /* @makedep: resources/delete.ico */ IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico + /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c6b1400..81f41fc 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -237,6 +237,7 @@ #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_FILE_OVERWRITE 145 +#define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alexandre Julliard : server: Scale coordinates in get_window_children_from_point based on DPI awareness.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 87d1a4a329b3572209f052a7ed13cd602ee1dda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87d1a4a329b3572209f052a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 13:32:57 2018 +0200 server: Scale coordinates in get_window_children_from_point based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 5 ++- include/wine/server_protocol.h | 4 +- server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + server/window.c | 96 ++++++++++++++++++++++++------------------ 6 files changed, 65 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=87d1a4a329b3572209f0…

1 0

Alexandre Julliard : user32: Scale coordinates in Get/SetCursorPos() based on DPI awareness.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 910f3ed4daaac96842159cfeef0b64ed2e533ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=910f3ed4daaac96842159cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:19:13 2018 +0200 user32: Scale coordinates in Get/SetCursorPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ab9b70f..9d87393 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -240,6 +240,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { BOOL ret; DWORD last_change; + UINT dpi; if (!pt) return FALSE; @@ -256,6 +257,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) /* query new position from graphics driver if we haven't updated recently */ if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); + if (ret && (dpi = get_thread_dpi())) + { + DPI_AWARENESS_CONTEXT context; + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + *pt = map_dpi_point( *pt, get_monitor_dpi( MonitorFromPoint( *pt, MONITOR_DEFAULTTOPRIMARY )), dpi ); + SetThreadDpiAwarenessContext( context ); + } return ret; } @@ -289,14 +297,19 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { + POINT pt = { x, y }; BOOL ret; INT prev_x, prev_y, new_x, new_y; + UINT dpi; + + if ((dpi = get_thread_dpi())) + pt = map_dpi_point( pt, dpi, get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ))); SERVER_START_REQ( set_cursor ) { req->flags = SET_CURSOR_POS; - req->x = x; - req->y = y; + req->x = pt.x; + req->y = pt.y; if ((ret = !wine_server_call( req ))) { prev_x = reply->prev_x;

1 0

Alexandre Julliard : user32: Scale coordinates in ClipCursor() based on DPI awareness.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 8bca1b29cd5358a63e10532ac85f456e1b145fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bca1b29cd5358a63e10532a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 27 14:20:01 2018 +0200 user32: Scale coordinates in ClipCursor() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 99337ab..f11f5e4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2116,12 +2116,22 @@ HCURSOR WINAPI GetCursor(void) */ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) { + UINT dpi; BOOL ret; RECT new_rect; TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); - if (rect && (rect->left > rect->right || rect->top > rect->bottom)) return FALSE; + if (rect) + { + if (rect->left > rect->right || rect->top > rect->bottom) return FALSE; + if ((dpi = get_thread_dpi())) + { + new_rect = map_dpi_rect( *rect, dpi, + get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY ))); + rect = &new_rect; + } + } SERVER_START_REQ( set_cursor ) { @@ -2155,6 +2165,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { + DPI_AWARENESS_CONTEXT context; + UINT dpi; BOOL ret; if (!rect) return FALSE; @@ -2171,6 +2183,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) } } SERVER_END_REQ; + + if (ret && (dpi = get_thread_dpi())) + { + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + *rect = map_dpi_rect( *rect, get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY )), dpi ); + SetThreadDpiAwarenessContext( context ); + } return ret; }

1 0