February 2022 - Wine-commits

Jinoh Kang : server: Attempt to complete I/O request immediately in recv_socket.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: e5ce4fa917a0e679e5a9444a5e277b141918fb29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ce4fa917a0e679e5a9444a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Feb 10 01:17:59 2022 +0900 server: Attempt to complete I/O request immediately in recv_socket. Make recv_socket alert the async immediately if poll() call detects that there are incoming data in the socket, bypassing the wineserver's main polling loop. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++---- dlls/ntdll/unix/sync.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/sock.c | 21 ++++++++++++++++++++- server/trace.c | 1 + 8 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 71dfcdd1114..03a9a93d04a 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -686,6 +686,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi NTSTATUS status; unsigned int i; ULONG options; + BOOL nonblocking, alerted; if (unix_flags & MSG_OOB) { @@ -756,16 +757,29 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if ((!NT_ERROR(status) || wait_handle) && status != STATUS_PENDING) + nonblocking = reply->nonblocking; + } + SERVER_END_REQ; + + alerted = status == STATUS_ALERTED; + if (alerted) + { + status = try_recv( fd, async, &information ); + if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) + status = STATUS_PENDING; + } + + if (status != STATUS_PENDING) + { + if (!NT_ERROR(status) || (wait_handle && !alerted)) { io->Status = status; io->Information = information; } + release_fileio( &async->io ); } - SERVER_END_REQ; - - if (status != STATUS_PENDING) release_fileio( &async->io ); + if (alerted) set_async_direct_result( &wait_handle, status, information ); if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); return status; } diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 442243d8bcf..ee25dfd0099 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2510,3 +2510,29 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG } #endif + +/* Notify direct completion of async and close the wait handle if it is no longer needed. + * This function is a no-op (returns status as-is) if the supplied handle is NULL. + */ +void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ) +{ + NTSTATUS ret; + + if (!*optional_handle) return; + + SERVER_START_REQ( set_async_direct_result ) + { + req->handle = wine_server_obj_handle( *optional_handle ); + req->status = status; + req->information = information; + ret = wine_server_call( req ); + if (ret == STATUS_SUCCESS) + *optional_handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + if (ret != STATUS_SUCCESS) + ERR( "cannot report I/O result back to server: %08x\n", ret ); + + return; +} diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a79edabc37c..75f03706401 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -274,6 +274,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf extern void init_files(void) DECLSPEC_HIDDEN; extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; +extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information ); extern void dbg_init(void) DECLSPEC_HIDDEN; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5ed95a41c19..be63b290353 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1772,6 +1772,8 @@ struct recv_socket_reply struct reply_header __header; obj_handle_t wait; unsigned int options; + int nonblocking; + char __pad_20[4]; }; @@ -6282,7 +6284,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 744 +#define SERVER_PROTOCOL_VERSION 745 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index ce05e9a38c6..5c0f9a86822 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1456,6 +1456,7 @@ enum server_fd_type @REPLY obj_handle_t wait; /* handle to wait on for blocking recv */ unsigned int options; /* device open options */ + int nonblocking; /* is socket non-blocking? */ @END diff --git a/server/request.h b/server/request.h index 128b70fe3cf..98e23bfd4ba 100644 --- a/server/request.h +++ b/server/request.h @@ -1049,7 +1049,8 @@ C_ASSERT( FIELD_OFFSET(struct recv_socket_request, total) == 60 ); C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); -C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, nonblocking) == 16 ); +C_ASSERT( sizeof(struct recv_socket_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, status) == 56 ); C_ASSERT( FIELD_OFFSET(struct send_socket_request, total) == 60 ); diff --git a/server/sock.c b/server/sock.c index 512b7c0f78e..38aaaac9e39 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3422,6 +3422,24 @@ DECL_HANDLER(recv_socket) if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && sock->rd_shutdown) status = STATUS_PIPE_DISCONNECTED; + /* NOTE: If read_q is not empty, we cannot really tell if the already queued asyncs + * NOTE: will not consume all available data; if there's no data available, + * NOTE: the current request won't be immediately satiable. */ + if ((status == STATUS_PENDING || status == STATUS_DEVICE_NOT_READY) && !async_queued( &sock->read_q )) + { + struct pollfd pollfd; + pollfd.fd = get_unix_fd( sock->fd ); + pollfd.events = req->oob ? POLLPRI : POLLIN; + pollfd.revents = 0; + if (poll(&pollfd, 1, 0) >= 0 && pollfd.revents) + { + /* Give the client opportunity to complete synchronously. + * If it turns out that the I/O request is not actually immediately satiable, + * the client may then choose to re-queue the async (with STATUS_PENDING). */ + status = STATUS_ALERTED; + } + } + sock->pending_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); sock->reported_events &= ~(req->oob ? AFD_POLL_OOB : AFD_POLL_READ); @@ -3438,7 +3456,7 @@ DECL_HANDLER(recv_socket) if (timeout) async_set_timeout( async, timeout, STATUS_IO_TIMEOUT ); - if (status == STATUS_PENDING) + if (status == STATUS_PENDING || status == STATUS_ALERTED) queue_async( &sock->read_q, async ); /* always reselect; we changed reported_events above */ @@ -3446,6 +3464,7 @@ DECL_HANDLER(recv_socket) reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( fd ); + reply->nonblocking = sock->nonblocking; release_object( async ); } release_object( sock ); diff --git a/server/trace.c b/server/trace.c index 6b50b9d0d18..1fb39d4f997 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2040,6 +2040,7 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) { fprintf( stderr, " wait=%04x", req->wait ); fprintf( stderr, ", options=%08x", req->options ); + fprintf( stderr, ", nonblocking=%d", req->nonblocking ); } static void dump_send_socket_request( const struct send_socket_request *req )

1 0

Zhiyi Zhang : user32: Use COLOR_BTNFACE to fill scroll bar background.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 0457376c0a3a3ae39cf41476157b51e942c6f80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0457376c0a3a3ae39cf41476… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:04 2022 +0800 user32: Use COLOR_BTNFACE to fill scroll bar background. Fix foobar2000 wrong scroll bar size box color when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- dlls/user32/scroll.c | 4 ++-- dlls/user32/tests/scroll.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..a9768defa3c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1073,7 +1073,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) else r.left = r.right - GetSystemMetrics(SM_CXVSCROLL) + 1; r.top = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1; - FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) ); + FillRect( hdc, &r, GetSysColorBrush( COLOR_BTNFACE ) ); } ReleaseDC( hwnd, hdc ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a3f0becbbd6..c5bfb0b2203 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -585,7 +585,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES { RECT rc = *rect; - FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, &rc, GetSysColorBrush( COLOR_BTNFACE ) ); rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); @@ -594,7 +594,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES if (style & SBS_SIZEBOX) { - FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, rect, GetSysColorBrush( COLOR_BTNFACE ) ); return; } } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index c378669991b..154d3c8d434 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,7 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc);

1 0

Zhiyi Zhang : uxtheme: Use COLOR_BTNFACE to fill scroll bar background.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 19a77a8b6a71f349e630f532330635202c2179bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a77a8b6a71f349e630f532… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:19 2022 +0800 uxtheme: Use COLOR_BTNFACE to fill scroll bar background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 4 ++-- dlls/user32/tests/scroll.c | 1 - dlls/uxtheme/scrollbar.c | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 069d1200c82..2fe6ad68426 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -888,8 +888,8 @@ static void test_themed_background(void) {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq, TRUE}, + {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, + {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq}, }; uxtheme = LoadLibraryA("uxtheme.dll"); diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 154d3c8d434..57bf759879c 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,6 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc); diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 0e42de7d77f..e96e5e89b69 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -62,8 +62,9 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else state = SZB_RIGHTALIGN; - if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) - DrawThemeParentBackground(hwnd, dc, NULL); + /* Tests show that COLOR_BTNFACE is used instead of DrawThemeParentBackground() for drawing + * background */ + FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); } else { int uppertrackstate, lowertrackstate, thumbstate;

1 0

Zhiyi Zhang : comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 8ce869f40b0887bd465f27ac1db7393067540aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce869f40b0887bd465f27ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:29 2022 +0800 comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE. Fix foobar2000 having an extra edge around tree view non-client size box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d00bba8e625..23e87bdce04 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5498,18 +5498,25 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) /* Draw themed border */ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { - HTHEME theme = GetWindowTheme (infoPtr->hwnd); + int cxEdge, cyEdge; + LONG ex_style; + HTHEME theme; HDC dc; RECT r; HRGN cliprgn; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + if (!(ex_style & WS_EX_CLIENTEDGE)) + return DefWindowProcW(infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); + + theme = GetWindowTheme(infoPtr->hwnd); if (!theme) return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1)

1 0

Zhiyi Zhang : comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 0cbfa9be51eafc985678bf2d67c34fb906282e05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbfa9be51eafc985678bf2d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:36 2022 +0800 comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered. On XP, when a pushlike checkbox or radio button is checked and hovered, PBS_HOT is used. In later versions of Windows, PBS_PRESSED is used. This patch changes pushlike checkboxes and radio buttons to use the new behavior because it seems more intuitive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52436 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2ce12252460..ee7c2c288b1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -396,7 +396,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_cb_states[3][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED }, + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED }, { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL } }; static const int rb_states[2][DRAW_STATE_COUNT] = @@ -407,7 +407,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_rb_states[2][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED } + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED } }; static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE);

1 0

Hugh McMaster : kernelbase: Implement SetCurrentConsoleFontEx.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 27df7f518caa237cd629e26131dbd23b1685c4d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27df7f518caa237cd629e261… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 9 20:43:54 2022 +0100 kernelbase: Implement SetCurrentConsoleFontEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 ------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 40 ++++++++++++++++++++-------------------- dlls/kernelbase/console.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 1 + programs/conhost/conhost.c | 25 ++++++++++++++++++++++--- programs/conhost/conhost.h | 14 +++++++++----- programs/conhost/window.c | 28 ++++++++++++++++++---------- 9 files changed, 108 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27df7f518caa237cd629…

1 0

Zebediah Figura : wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo().
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 06e178e87f1bd40400160741e7a1d003e461c6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e178e87f1bd40400160741… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:34 2022 -0600 wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..f3ec5c03c85 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,6 +456,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; + bo->b.map_ptr = NULL; bo->b.buffer_offset = idx * object_size; bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size;

1 0

Zebediah Figura : wined3d: Set resource->client.addr in buffer_resource_sub_resource_map() only if persistently mapping.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 28285f1e76980412cfb40cfa81174ca441e9b5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28285f1e76980412cfb40cfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:35 2022 -0600 wined3d: Set resource->client.addr in buffer_resource_sub_resource_map() only if persistently mapping. Be consistent with wined3d_cs_map_upload_bo(). This may change in the future, but for now we depend on this logic in the Vulkan backend. This fixes test_dynamic_map_synchronization() on 32-bit architectures with the Vulkan backend, which is currently broken because we try to perform accelerated NOOVERWRITE maps while unmapping the same BOs. Fixes: d8e8ab21c0f9f00d295c035534637115a5d70f9f Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f3b5fd316e..a06bfb984ad 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1002,7 +1002,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (wined3d_map_persistent()) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) {

1 0

Zebediah Figura : wined3d: Call wined3d_context_unmap_bo_address() when updating a buffer BO.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: d9e8f4b4584077f6a1cff8386bdb216981e87234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e8f4b4584077f6a1cff838… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 20:27:36 2022 -0600 wined3d: Call wined3d_context_unmap_bo_address() when updating a buffer BO. That is, don't just flush it, but unmap it as well. As of d8e8ab21c0f9f00d295c035534637115a5d70f9f, we can get here even when !wined3d_map_persistent(). Thus we currently end up leaving BOs mapped when performing an accelerated DISCARD map. Try to avoid that. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a06bfb984ad..50e3e9fe2b4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1156,9 +1156,27 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi } if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object) - wined3d_context_flush_bo_address(context, &upload_bo->addr, size); + { + struct wined3d_range range; + + /* We need to flush changes, which is implicitly done by + * wined3d_context_unmap_bo_address() even if we aren't actually going + * to unmap. + * + * We would also like to free up virtual address space used by this BO + * if it's at a premium—note that this BO was allocated for an + * accelerated map. Hence we unmap the BO instead of merely flushing it; + * if we don't care about unmapping BOs then + * wined3d_context_unmap_bo_address() will flush and return. + */ + range.offset = offset; + range.size = size; + wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); + } else + { wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); + } } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer,

1 0

Eric Pouech : fltlib: Enable compilation with long types.
by Alexandre Julliard 10 Feb '22

10 Feb '22

Module: wine Branch: master Commit: 2891f987ac9e69b7e8455fefd446dc318e2468ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2891f987ac9e69b7e8455fef… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:42:31 2022 +0100 fltlib: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltlib/Makefile.in | 1 - dlls/fltlib/fltlib.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index f7281c69c9d..d969421644a 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fltlib.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 5af6bbb13c9..a6cf060b3d1 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -33,7 +33,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption LPSECURITY_ATTRIBUTES lpSecurityAttributes, HANDLE *hPort) { - FIXME("(%s, %d, %p, %d, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, + FIXME("(%s, %ld, %p, %ld, %p, %p) stub\n", debugstr_w(lpPortName), dwOptions, lpContext, dwSizeOfContext, lpSecurityAttributes, hPort); *hPort = INVALID_HANDLE_VALUE; @@ -46,7 +46,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, LPHANDLE handle) { - FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); + FIXME("(%lu, %p, %lu, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); }

1 0