July 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 5541cf32c55a43b6acb5a50afb4b10204a73e479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5541cf32c55a43b6acb5a50a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:32:12 2021 +0800 user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area. Having a SCROLL_DrawNCScrollBar() in scroll.c enables it to access global variables there. So that global variables access in SCROLL_DrawScrollBar() can be moved outside of it and SCROLL_DrawScrollBar() can then be refactored into a function without access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/nonclient.c | 6 +----- dlls/user32/scroll.c | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 0b0f1c28015..78b393fcddb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,6 +179,7 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ +extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index e56c03deaf0..50ecb0c4e2e 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1027,11 +1027,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); /* Draw the scroll-bars */ - - if (dwStyle & WS_VSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); - if (dwStyle & WS_HSCROLL) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawNCScrollBar( hwnd, hdc, dwStyle & WS_HSCROLL, dwStyle & WS_VSCROLL ); /* Draw the "size-box" */ if ((dwStyle & WS_VSCROLL) && (dwStyle & WS_HSCROLL)) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9113d57263b..5fc75ca42e7 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -646,6 +646,14 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, } } +void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) +{ + if (draw_horizontal) + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + if (draw_vertical) + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); +} + /*********************************************************************** * SCROLL_DrawSizeGrip *

1 0

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: b5abd534941e3b2559832d9afcb758a266e7eb29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5abd534941e3b2559832d9a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:32:22 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent(). So that SCROLL_DrawScrollBar() can eventually be hooked by a themed scroll bar drawing function and use a single function to draw scroll bars, instead of hooking multiple scroll bar drawing functions that draw different parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 15 ++++++++++++++- dlls/user32/scroll.c | 33 ++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 78b393fcddb..9bb6a0047d1 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,8 +179,21 @@ extern BOOL NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down ) DECLSPEC_HIDDEN; extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ + +/* Scroll-bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; -extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 5fc75ca42e7..01868bd4238 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -74,17 +74,6 @@ typedef struct /* Scroll timer id */ #define SCROLL_TIMER 0 - /* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - /* What to do after SCROLL_SetScrollInfo() */ #define SA_SSI_HIDE 0x0001 #define SA_SSI_SHOW 0x0002 @@ -583,8 +572,8 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, * * Redraw the whole scrollbar. */ -void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, - BOOL arrows, BOOL interior ) +void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, BOOL arrows, + BOOL interior ) { INT arrowSize, thumbSize, thumbPos; RECT rect; @@ -611,8 +600,8 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, { if( vertical == SCROLL_trackVertical && GetCapture() == hwnd ) SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (SCROLL_trackHitTest == SCROLL_TOP_ARROW), - (SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) ); + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_ARROW, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_ARROW ); else SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); @@ -649,9 +638,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) { if (draw_horizontal) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, SCROLL_trackHitTest, TRUE, TRUE ); if (draw_vertical) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, SCROLL_trackHitTest, TRUE, TRUE ); } /*********************************************************************** @@ -684,7 +673,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) ); if (!hdc) return; - SCROLL_DrawScrollBar( hwnd, hdc, nBar, arrows, interior ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_trackHitTest, arrows, interior ); ReleaseDC( hwnd, hdc ); } @@ -831,8 +820,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -929,8 +917,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_ARROW: - SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -1430,7 +1417,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); } else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, SCROLL_trackHitTest, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break;

1 0

Zhiyi Zhang : uxtheme: Avoid memory leaks.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 6f00a2983aa54bf540ecff79d9fddd5059f2da41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f00a2983aa54bf540ecff79… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:33:49 2021 +0800 uxtheme: Avoid memory leaks. A THEME_FILE struct and four global ATOMs are leaked when unloading uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/main.c | 8 ++++++-- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxthemedll.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5e5610a1f84..5f79dd6ed0d 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -31,14 +31,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /***********************************************************************/ /* For the moment, do nothing here. */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpv); + TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); UXTHEME_InitSystem(hInstDLL); break; + case DLL_PROCESS_DETACH: + if (reserved) break; + UXTHEME_UninitSystem(); + break; } return TRUE; } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index b18794740a8..dcd2a660042 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -509,6 +509,16 @@ void UXTHEME_InitSystem(HINSTANCE hInst) UXTHEME_LoadTheme(); } +void UXTHEME_UninitSystem(void) +{ + MSSTYLES_SetActiveTheme(NULL, FALSE); + + GlobalDeleteAtom(atWindowTheme); + GlobalDeleteAtom(atSubAppName); + GlobalDeleteAtom(atSubIdList); + GlobalDeleteAtom(atDialogThemeEnabled); +} + /*********************************************************************** * IsAppThemed (UXTHEME.@) */ diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index fee152c9c34..fdf529b422a 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -95,6 +95,7 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; +extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

Henri Verbeet : d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 78bdc84bcb8c08d1a7b5a2789e73d2451112fd6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78bdc84bcb8c08d1a7b5a278… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 5 17:02:33 2021 +0200 d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d043af7051a..f8bd8578cdc 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2980,6 +2980,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 struct d3d_device_context_state *state_impl, *prev_impl; struct d3d_device *device = context->device; struct wined3d_state *wined3d_state; + static unsigned int once; TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); @@ -3010,7 +3011,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 device->state = state_impl; d3d_device_context_state_private_release(prev_impl); - if (d3d_device_is_d3d10_active(device)) + if (d3d_device_is_d3d10_active(device) && !once++) FIXME("D3D10 interface emulation not fully implemented yet!\n"); wined3d_mutex_unlock(); }

1 0

Henri Verbeet : d2d1: Do not clear the device context state in d2d_device_context_draw().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: da44bcc9d074f634315fd1e042a18c99189fb25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da44bcc9d074f634315fd1e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 5 17:02:34 2021 +0200 d2d1: Do not clear the device context state in d2d_device_context_draw(). Clearing the state should no longer be needed now that we use SwapDeviceContextState() and have our own dedicated state object. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 3b444321c87..44840f0010f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -139,7 +139,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D11Device1_GetImmediateContext1(device, &context); ID3D11DeviceContext1_SwapDeviceContextState(context, render_target->d3d_state, &prev_state); - ID3D11DeviceContext1_ClearState(context); ID3D11DeviceContext1_IASetInputLayout(context, shape_resources->il); ID3D11DeviceContext1_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in state_stencil().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 3ed5dd13367b0b5a90147690cbe95235f1448526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed5dd13367b0b5a90147690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 5 17:02:35 2021 +0200 wined3d: Use wined3d_mask_from_size() in state_stencil(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 264a9974b40..a9183278d86 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1072,7 +1072,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & wined3d_mask_from_size(state->fb.depth_stencil->format->stencil_size); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op);

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 76cef0869f48bac5a1875c9b3c09f4ed8d17388b URL: https://source.winehq.org/git/wine.git/?a=commit;h=76cef0869f48bac5a1875c9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 5 17:02:36 2021 +0200 wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 87fcb868197..f91261ebbbe 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3231,7 +3231,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) { VK_CALL(vkCmdSetStencilReference(vk_command_buffer, VK_STENCIL_FACE_FRONT_AND_BACK, - state->stencil_ref & ((1 << dsv->format->stencil_size) - 1))); + state->stencil_ref & wined3d_mask_from_size(dsv->format->stencil_size))); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC))

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_render_pass_vk_init().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: d888cbcb205194e38c939a1de58589ddc58574c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d888cbcb205194e38c939a1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 5 17:02:37 2021 +0200 wined3d: Use wined3d_mask_from_size() in wined3d_render_pass_vk_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f91261ebbbe..cbff3968179 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1154,7 +1154,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = 0; attachment_count = 0; - mask = key->rt_mask & ((1u << WINED3D_MAX_RENDER_TARGETS) - 1); + mask = key->rt_mask & wined3d_mask_from_size(WINED3D_MAX_RENDER_TARGETS); while (mask) { i = wined3d_bit_scan(&mask); @@ -1181,7 +1181,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = i + 1; } - mask = ~key->rt_mask & ((1u << rt_count) - 1); + mask = ~key->rt_mask & wined3d_mask_from_size(rt_count); while (mask) { i = wined3d_bit_scan(&mask);

1 0

Zebediah Figura : server: Don't check the user data for NULL in async_terminate().
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: 3f04fdd87699c653409d8e87cf25f30db18f8cbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f04fdd87699c653409d8e87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 11:19:59 2021 -0500 server: Don't check the user data for NULL in async_terminate(). This semantically reverts 481517178ff7dd542966d7f11f3d61b3fc8a0776. That commit was used to implement NtFlushBuffersFile, which at the time didn't use a callback function. 9050b58f0769fca75c4cebed7be3cce51989814e changed it to use irp_completion(), since the result of a blocking flush needed to be taken from the IOSB. As of 97afac469fbe012e22acc1f1045c88b1004a241f that's not true anymore, but on the other hand it is theoretically possible for a device driver to touch the Information member of the IOSB, and we don't seem to lose anything by making all asyncs take a common path. Since all asyncs pass user data and there's no clear reason for them not to, let's get rid of a bit of extra code complexity that's no longer used. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/server/async.c b/server/async.c index 4dedb27f3d8..0425e4eddf7 100644 --- a/server/async.c +++ b/server/async.c @@ -161,18 +161,14 @@ void async_terminate( struct async *async, unsigned int status ) if (!async->direct_result) { - if (async->data.user) - { - apc_call_t data; - - memset( &data, 0, sizeof(data) ); - data.type = APC_ASYNC_IO; - data.async_io.user = async->data.user; - data.async_io.sb = async->data.iosb; - data.async_io.status = status; - thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); - } - else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); + apc_call_t data; + + memset( &data, 0, sizeof(data) ); + data.type = APC_ASYNC_IO; + data.async_io.user = async->data.user; + data.async_io.sb = async->data.iosb; + data.async_io.status = status; + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } async_reselect( async );

1 0

Zebediah Figura : server: Call the close_handle callback and release_object_from_handle() in the same loop.
by Alexandre Julliard 05 Jul '21

05 Jul '21

Module: wine Branch: master Commit: a17469b165d30f14c3340608602085f7603496b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17469b165d30f14c3340608… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 11:20:00 2021 -0500 server: Call the close_handle callback and release_object_from_handle() in the same loop. Several server objects check if the last handle is being closed in their close_handle callback. If a process holds the last two handles to an object, this code path currently won't be triggered. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/server/handle.c b/server/handle.c index 6efd82f2ff9..15da701ee99 100644 --- a/server/handle.c +++ b/server/handle.c @@ -174,21 +174,16 @@ static void handle_table_destroy( struct object *obj ) assert( obj->ops == &handle_table_ops ); - /* first notify all objects that handles are being closed */ - if (table->process) - { - for (i = 0, entry = table->entries; i <= table->last; i++, entry++) - { - struct object *obj = entry->ptr; - if (obj) obj->ops->close_handle( obj, table->process, index_to_handle(i) ); - } - } - for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { struct object *obj = entry->ptr; entry->ptr = NULL; - if (obj) release_object_from_handle( obj ); + if (obj) + { + if (table->process) + obj->ops->close_handle( obj, table->process, index_to_handle(i) ); + release_object_from_handle( obj ); + } } free( table->entries ); }

1 0