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

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state().
by Alexandre Julliard July 5, 2021

July 5, 2021

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

Zhiyi Zhang : user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb().
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: ac6817de54c9c4b12c8de56f20ce45b95be26e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6817de54c9c4b12c8de56f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:31:13 2021 +0800 user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb(). SCROLL_MovingThumb is a global variable. Gradually move it out of scroll bar drawing functions so that those drawing functions can be refactored in a way that doesn't need access to global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 85485eede57..9113d57263b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -484,8 +484,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, 0, vertical, FALSE, FALSE ); - - SCROLL_MovingThumb = !SCROLL_MovingThumb; } /*********************************************************************** @@ -625,6 +623,7 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) { SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = FALSE; } else { @@ -867,7 +866,10 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) vertical, SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) + { SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); + SCROLL_MovingThumb = TRUE; + } } else if (msg == WM_LBUTTONUP) {

1 0

Zhiyi Zhang : user32: Remove SCROLL_DrawInterior_9x().
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: d164f0627934b181f8a4c14526226b91829c4872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d164f0627934b181f8a4c145… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:31:03 2021 +0800 user32: Remove SCROLL_DrawInterior_9x(). SCROLL_DrawInterior_9x() has the same functionality as SCROLL_DrawInterior(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 102 +++------------------------------------------------ 1 file changed, 5 insertions(+), 97 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index ba8fe7966ec..85485eede57 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -108,11 +108,9 @@ static BOOL SCROLL_ShowScrollBar( HWND hwnd, INT nBar, BOOL fShowH, BOOL fShowV ); static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, const SCROLLINFO *info, BOOL bRedraw ); -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ); +static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, + INT thumbSize, INT thumbPos, UINT flags, BOOL vertical, + BOOL top_selected, BOOL bottom_selected ); /********************************************************************* @@ -484,9 +482,8 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, else if( pos > max_size ) pos = max_size; - SCROLL_DrawInterior_9x( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, - rect, arrowSize, thumbSize, pos, - 0, vertical, FALSE, FALSE ); + SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, + 0, vertical, FALSE, FALSE ); SCROLL_MovingThumb = !SCROLL_MovingThumb; } @@ -496,95 +493,6 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, * * Draw the scroll bar interior (everything except the arrows). */ -static void SCROLL_DrawInterior_9x( HWND hwnd, HDC hdc, INT nBar, - RECT *rect, INT arrowSize, - INT thumbSize, INT thumbPos, - UINT flags, BOOL vertical, - BOOL top_selected, BOOL bottom_selected ) -{ - RECT r; - HPEN hSavePen; - HBRUSH hSaveBrush,hBrush; - - /* Only scrollbar controls send WM_CTLCOLORSCROLLBAR. - * The window-owned scrollbars need to call DEFWND_ControlColor - * to correctly setup default scrollbar colors - */ - if (nBar == SB_CTL) - { - hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSCROLLBAR, - (WPARAM)hdc,(LPARAM)hwnd); - } - else - { - hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR ); - } - - hSavePen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME) ); - hSaveBrush = SelectObject( hdc, hBrush ); - - /* Calculate the scroll rectangle */ - r = *rect; - if (vertical) - { - r.top += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.bottom -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - else - { - r.left += arrowSize - SCROLL_ARROW_THUMB_OVERLAP; - r.right -= (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - } - - /* Draw the scroll rectangles and thumb */ - if (!thumbPos) /* No thumb to draw */ - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, r.bottom - r.top, - PATCOPY ); - - /* cleanup and return */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); - return; - } - - if (vertical) - { - PatBlt( hdc, r.left, r.top, - r.right - r.left, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - top_selected ? 0x0f0000 : PATCOPY ); - r.top += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left, r.top + thumbSize, - r.right - r.left, - r.bottom - r.top - thumbSize, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.bottom = r.top + thumbSize; - } - else /* horizontal */ - { - PatBlt( hdc, r.left, r.top, - thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP), - r.bottom - r.top, - top_selected ? 0x0f0000 : PATCOPY ); - r.left += thumbPos - (arrowSize - SCROLL_ARROW_THUMB_OVERLAP); - PatBlt( hdc, r.left + thumbSize, r.top, - r.right - r.left - thumbSize, - r.bottom - r.top, - bottom_selected ? 0x0f0000 : PATCOPY ); - r.right = r.left + thumbSize; - } - - /* Draw the thumb */ - DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT | BF_MIDDLE ); - - /* cleanup */ - SelectObject( hdc, hSavePen ); - SelectObject( hdc, hSaveBrush ); -} - - static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT *rect, INT arrowSize, INT thumbSize, INT thumbPos,

1 0

Zhiyi Zhang : user32: Avoid unnecessary scroll bar drawing.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 4819ea8509bdbdfb01148deb6000d7f790bdc531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4819ea8509bdbdfb01148deb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 5 20:30:55 2021 +0800 user32: Avoid unnecessary scroll bar drawing. These drawing operations are either overwritten by other drawing functions later or not needed at all. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a63039262c7..ba8fe7966ec 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -594,12 +594,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, RECT r; HPEN hSavePen; HBRUSH hSaveBrush,hBrush; - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; - - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); /* Select the correct brush and pen */ @@ -672,11 +666,6 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, Rectangle( hdc, r.left+1, r.top+1, r.right-1, r.bottom-1 ); DrawEdge( hdc, &r, EDGE_RAISED, BF_RECT ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, rect, vertical, arrowSize, thumbSize ); - /* cleanup */ SelectObject( hdc, hSavePen ); SelectObject( hdc, hSaveBrush ); @@ -695,7 +684,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, RECT rect; BOOL vertical; SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); - BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb; DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -711,11 +699,6 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, /* do not draw if the scrollbar rectangle is empty */ if(IsRectEmpty(&rect)) return; - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); - /* Draw the arrows */ if (arrows && arrowSize) @@ -728,14 +711,19 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); } - if( interior ) - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); - if (Save_SCROLL_MovingThumb && - (SCROLL_TrackingWin == hwnd) && - (SCROLL_TrackingBar == nBar)) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + if (interior) + { + if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) + { + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + } + else + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, FALSE, FALSE ); + } + } /* if scroll bar has focus, reposition the caret */ if(hwnd==GetFocus() && (nBar==SB_CTL)) @@ -975,9 +963,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, FALSE, FALSE ); @@ -994,9 +979,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) { - if (SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); lastMousePos = pos; SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect, @@ -1005,9 +987,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - if (!SCROLL_MovingThumb) - SCROLL_DrawMovingThumb( hdc, &rect, vertical, - arrowSize, thumbSize ); + SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); + SCROLL_MovingThumb = TRUE; } } break; @@ -1077,6 +1058,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) /* Terminate tracking */ SCROLL_TrackingWin = 0; + SCROLL_MovingThumb = FALSE; } ReleaseDC( hwnd, hdc );

1 0

Jacek Caban : gdi32: Move CreateDiscardableBitmap implementation to objects.c.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 0204ebbc67a67fa6d4070416c88b1eccc773f422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0204ebbc67a67fa6d4070416… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 5 13:41:28 2021 +0200 gdi32: Move CreateDiscardableBitmap implementation to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 18 ------------------ dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 22629f95af4..99b5d42a0d5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -474,24 +474,6 @@ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) } -/****************************************************************************** - * CreateDiscardableBitmap [GDI32.@] - * - * Creates a discardable bitmap. - * - * RETURNS - * Success: Handle to bitmap - * Failure: NULL - */ -HBITMAP WINAPI CreateDiscardableBitmap( - HDC hdc, /* [in] Handle to device context */ - INT width, /* [in] Bitmap width */ - INT height) /* [in] Bitmap height */ -{ - return CreateCompatibleBitmap( hdc, width, height ); -} - - /****************************************************************************** * NtGdiGetBitmapDimension (win32u.@) * diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index a7d565e32ed..b83ee139387 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -215,3 +215,13 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, return NtGdiCreateBitmap( width, height, planes, bpp, bits ); } + +/****************************************************************************** + * CreateDiscardableBitmap (GDI32.@) + * + * Creates a discardable bitmap. + */ +HBITMAP WINAPI CreateDiscardableBitmap( HDC hdc, INT width, INT height ) +{ + return CreateCompatibleBitmap( hdc, width, height ); +}

1 0

Henri Verbeet : d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState().
by Alexandre Julliard July 5, 2021

July 5, 2021

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

Francois Gouget : ntdll/tests: Improve the RtlWaitOnAddress() timeout checks.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: e72c71d27d67462480026edc2b756a66578db7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72c71d27d67462480026edc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 18:10:39 2021 +0200 ntdll/tests: Improve the RtlWaitOnAddress() timeout checks. GetTickCount()'s granularity represents 15% of the time we want to mesure, making it hard to not get failures. So use NtQuerySystemTime() instead since we already depend on it. Narrow down the acceptable range again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 82f8188d176..81be7de00f6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2266,10 +2266,10 @@ static void test_semaphore(void) static void test_wait_on_address(void) { - DWORD ticks; SIZE_T size; NTSTATUS status; - LARGE_INTEGER timeout; + LARGE_INTEGER start, end, timeout; + DWORD elapsed; LONG64 address, compare; if (!pRtlWaitOnAddress) @@ -2298,13 +2298,13 @@ static void test_wait_on_address(void) /* values match */ address = 0; compare = 0; - pNtQuerySystemTime(&timeout); - timeout.QuadPart += 100*10000; - ticks = GetTickCount(); + pNtQuerySystemTime(&start); + timeout.QuadPart = start.QuadPart + 100 * 10000; status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2314,12 +2314,13 @@ static void test_wait_on_address(void) compare = ~0; compare <<= size * 8; + pNtQuerySystemTime(&start); timeout.QuadPart = -100 * 10000; - ticks = GetTickCount(); status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Only count test driver load notify.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 7c7e77da9d4d133e992fbbde1f1f27b0c2c8fe5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7e77da9d4d133e992fbbde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 5 11:38:23 2021 +0200 ntoskrnl.exe/tests: Only count test driver load notify. Sometimes Windows loads other drivers when we don't expect it, and this causes spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..225699df402 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -313,8 +313,7 @@ static WCHAR test_load_image_name[MAX_PATH]; static void WINAPI test_load_image_notify_routine(UNICODE_STRING *image_name, HANDLE process_id, IMAGE_INFO *image_info) { - if (test_load_image_notify_count == -1 - || (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp"))) + if (image_name->Buffer && wcsstr(image_name->Buffer, L".tmp")) { ++test_load_image_notify_count; test_image_info = *image_info; @@ -380,7 +379,7 @@ static void test_load_driver(void) || !wcscmp(test_load_image_name, full_name->Name.Buffer), "Expected image path name %ls, got %ls.\n", full_name->Name.Buffer, test_load_image_name); - test_load_image_notify_count = -1; + test_load_image_notify_count = 0; ret = ZwLoadDriver(&name); ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); @@ -395,7 +394,7 @@ static void test_load_driver(void) ret = PsRemoveLoadImageNotifyRoutine(test_load_image_notify_routine); ok(ret == STATUS_PROCEDURE_NOT_FOUND, "Got unexpected status %#x.\n", ret); - ok(test_load_image_notify_count == -1, "Got unexpected test_load_image_notify_count %u.\n", + ok(test_load_image_notify_count == 0, "Got unexpected test_load_image_notify_count %u.\n", test_load_image_notify_count); RtlFreeUnicodeString(&image_path); }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: ebb161243e9d3e6bba3ea5e484e3b706383a192c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb161243e9d3e6bba3ea5e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 5 10:44:51 2021 +0200 ntoskrnl.exe/tests: Sync test utils with wine/test.h. Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 ++-- dlls/ntoskrnl.exe/tests/driver.h | 10 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/utils.h | 290 ++++++++++++++++++++++++++------- 6 files changed, 258 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb161243e9d3e6bba3e…

1 0

Zebediah Figura : server: Remove special handling of STATUS_MORE_PROCESSING_REQUIRED.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: e2b9131bd9b019b6d6867ad741eb7e4f1916ca9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2b9131bd9b019b6d6867ad7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 11:20:02 2021 -0500 server: Remove special handling of STATUS_MORE_PROCESSING_REQUIRED. This was used to implement AcceptEx() using multiple APCs, and made obsolete by 0bbd3f66178abdc6ea15d30d2eb3b033367f8407. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/async.c b/server/async.c index 0425e4eddf7..dbd4859edc4 100644 --- a/server/async.c +++ b/server/async.c @@ -396,7 +396,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; - if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ if (async->data.apc) {

1 0