- wine-devel - winehq.org

[PATCH 3/6] user32: Pass a scroll bar tracking info parameter to SCROLL_DrawScrollBar().
by Zhiyi Zhang 06 Jul '21

06 Jul '21

Pack all scroll bar tracking information in a struct and pass that struct as a parameter to SCROLL_DrawScrollBar() instead of using global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 14 ++++- dlls/user32/scroll.c | 121 +++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 65 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 9bb6a0047d1..25ff4fe05ff 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -191,9 +191,21 @@ enum SCROLL_HITTEST SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ }; +/* Scroll bar tracking information */ +struct SCROLL_TRACKING_INFO +{ + HWND win; /* Tracking window */ + INT bar; /* SB_HORZ / SB_VERT / SB_CTL */ + INT thumb_pos; /* Thumb position */ + INT thumb_val; /* Current thumb value from thumb position */ + BOOL vertical; /* Is scroll bar vertical */ + enum SCROLL_HITTEST hit_test; /* Hit Test code of the last button-down event */ +}; + 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, enum SCROLL_HITTEST hit_test, - BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; + const struct SCROLL_TRACKING_INFO *tracking_info, 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 fdd657feda6..e941c00a562 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -80,14 +80,8 @@ typedef struct #define SA_SSI_REFRESH 0x0004 #define SA_SSI_REPAINT_ARROWS 0x0008 - /* Thumb-tracking info */ -static HWND SCROLL_TrackingWin = 0; -static INT SCROLL_TrackingBar = 0; -static INT SCROLL_TrackingPos = 0; -static INT SCROLL_TrackingVal = 0; - /* Hit test code of the last button-down event */ -static enum SCROLL_HITTEST SCROLL_trackHitTest; -static BOOL SCROLL_trackVertical; +/* Scroll Bar tracking information */ +static struct SCROLL_TRACKING_INFO g_tracking_info; /* Is the moving thumb being displayed? */ static BOOL SCROLL_MovingThumb = FALSE; @@ -456,7 +450,7 @@ static void SCROLL_DrawArrows( HDC hdc, SCROLLBAR_INFO *infoPtr, static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, INT arrowSize, INT thumbSize ) { - INT pos = SCROLL_TrackingPos; + INT pos = g_tracking_info.thumb_pos; INT max_size; if( vertical ) @@ -471,7 +465,7 @@ static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical, else if( pos > max_size ) pos = max_size; - SCROLL_DrawInterior( SCROLL_TrackingWin, hdc, SCROLL_TrackingBar, rect, arrowSize, thumbSize, pos, + SCROLL_DrawInterior( g_tracking_info.win, hdc, g_tracking_info.bar, rect, arrowSize, thumbSize, pos, 0, vertical, FALSE, FALSE ); } @@ -572,7 +566,8 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, * * Redraw the whole scrollbar. */ -void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, BOOL arrows, +void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, BOOL interior ) { INT arrowSize, thumbSize, thumbPos; @@ -598,10 +593,10 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit if (arrows && arrowSize) { - if( vertical == SCROLL_trackVertical && GetCapture() == hwnd ) + if (vertical == tracking_info->vertical && GetCapture() == hwnd) SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, - hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_ARROW, - hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_ARROW ); + hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_ARROW, + hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_ARROW ); else SCROLL_DrawArrows( hdc, infoPtr, &rect, arrowSize, vertical, FALSE, FALSE ); @@ -609,17 +604,17 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit if (interior) { - if (SCROLL_MovingThumb && SCROLL_TrackingWin == hwnd && SCROLL_TrackingBar == nBar) + if (SCROLL_MovingThumb && tracking_info->win == hwnd && tracking_info->bar == nBar) { SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = FALSE; } - else if (vertical == SCROLL_trackVertical && GetCapture() == hwnd) + else if (vertical == tracking_info->vertical && GetCapture() == hwnd) { SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, infoPtr->flags, vertical, - hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_RECT, - hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_RECT ); + hit_test == tracking_info->hit_test && hit_test == SCROLL_TOP_RECT, + hit_test == tracking_info->hit_test && hit_test == SCROLL_BOTTOM_RECT ); } else { @@ -645,9 +640,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) { if (draw_horizontal) - SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, SCROLL_trackHitTest, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); if (draw_vertical) - SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, SCROLL_trackHitTest, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); } /*********************************************************************** @@ -680,7 +675,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, SCROLL_trackHitTest, arrows, interior ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, g_tracking_info.hit_test, &g_tracking_info, arrows, interior ); ReleaseDC( hwnd, hdc ); } @@ -748,7 +743,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; - if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) + if ((g_tracking_info.hit_test == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -759,7 +754,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) HideCaret(hwnd); /* hide caret while holding down LBUTTON */ SetCapture( hwnd ); prevPt = pt; - SCROLL_trackHitTest = hittest = SCROLL_THUMB; + g_tracking_info.hit_test = hittest = SCROLL_THUMB; break; case WM_MOUSEMOVE: GetClientRect(GetParent(GetParent(hwnd)),&rect); @@ -767,7 +762,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case WM_LBUTTONUP: ReleaseCapture(); - SCROLL_trackHitTest = hittest = SCROLL_NOWHERE; + g_tracking_info.hit_test = hittest = SCROLL_NOWHERE; if (hwnd==GetFocus()) ShowCaret(hwnd); break; case WM_SYSTIMER: @@ -787,8 +782,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) { case WM_LBUTTONDOWN: /* Initialise mouse tracking */ HideCaret(hwnd); /* hide caret while holding down LBUTTON */ - SCROLL_trackVertical = vertical; - SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE ); + g_tracking_info.vertical = vertical; + g_tracking_info.hit_test = hittest = SCROLL_HitTest( hwnd, nBar, pt, FALSE ); lastClickPos = vertical ? (pt.y - rect.top) : (pt.x - rect.left); lastMousePos = lastClickPos; trackThumbPos = thumbPos; @@ -821,14 +816,14 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); - switch(SCROLL_trackHitTest) + switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ break; case SCROLL_TOP_ARROW: - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); - if (hittest == SCROLL_trackHitTest) + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, FALSE ); + if (hittest == g_tracking_info.hit_test) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { @@ -843,8 +838,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_RECT: - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); - if (hittest == SCROLL_trackHitTest) + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, FALSE, TRUE ); + if (hittest == g_tracking_info.hit_test) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { @@ -860,21 +855,20 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) case SCROLL_THUMB: if (msg == WM_LBUTTONDOWN) { - SCROLL_TrackingWin = hwnd; - SCROLL_TrackingBar = nBar; - SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos; - SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect, - vertical, - SCROLL_TrackingPos ); - if (!SCROLL_MovingThumb) + g_tracking_info.win = hwnd; + g_tracking_info.bar = nBar; + g_tracking_info.thumb_pos = trackThumbPos + lastMousePos - lastClickPos; + g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_pos ); + if (!SCROLL_MovingThumb) { SCROLL_MovingThumb = TRUE; - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, FALSE, TRUE ); } } else if (msg == WM_LBUTTONUP) { - SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, FALSE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, &g_tracking_info, FALSE, TRUE ); } else /* WM_MOUSEMOVE */ { @@ -889,22 +883,21 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) ) { lastMousePos = pos; - SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos; - SCROLL_TrackingVal = SCROLL_GetThumbVal( infoPtr, &rect, - vertical, - SCROLL_TrackingPos ); + g_tracking_info.thumb_pos = trackThumbPos + pos - lastClickPos; + g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_pos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, - MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), - (LPARAM)hwndCtl ); + MAKEWPARAM( SB_THUMBTRACK, g_tracking_info.thumb_val ), + (LPARAM)hwndCtl ); SCROLL_MovingThumb = TRUE; - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, FALSE, TRUE ); } } break; case SCROLL_BOTTOM_RECT: - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); - if (hittest == SCROLL_trackHitTest) + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, FALSE, TRUE ); + if (hittest == g_tracking_info.hit_test) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { @@ -918,8 +911,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_ARROW: - SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, TRUE, FALSE ); - if (hittest == SCROLL_trackHitTest) + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, FALSE ); + if (hittest == g_tracking_info.hit_test) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) { @@ -948,8 +941,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) if (msg == WM_LBUTTONUP) { - hittest = SCROLL_trackHitTest; - SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */ + hittest = g_tracking_info.hit_test; + g_tracking_info.hit_test = SCROLL_NOWHERE; /* Terminate tracking */ if (hittest == SCROLL_THUMB) { @@ -963,7 +956,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SB_ENDSCROLL, (LPARAM)hwndCtl ); /* Terminate tracking */ - SCROLL_TrackingWin = 0; + g_tracking_info.win = 0; SCROLL_MovingThumb = FALSE; } @@ -1115,7 +1108,7 @@ static BOOL SCROLL_GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) if (info->fMask & SIF_PAGE) info->nPage = infoPtr->page; if (info->fMask & SIF_POS) info->nPos = infoPtr->curVal; if ((info->fMask & SIF_TRACKPOS) && (info->cbSize == sizeof(*info))) - info->nTrackPos = (SCROLL_TrackingWin == WIN_GetFullHandle(hwnd)) ? SCROLL_TrackingVal : infoPtr->curVal; + info->nTrackPos = (g_tracking_info.win == WIN_GetFullHandle(hwnd)) ? g_tracking_info.thumb_val : infoPtr->curVal; if (info->fMask & SIF_RANGE) { info->nMin = infoPtr->minVal; @@ -1190,12 +1183,12 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in } if (nBar == SB_CTL && !IsWindowEnabled(hwnd)) info->rgstate[0] |= STATE_SYSTEM_UNAVAILABLE; - - pressed = ((nBar == SB_VERT) == SCROLL_trackVertical && GetCapture() == hwnd); - + + pressed = ((nBar == SB_VERT) == g_tracking_info.vertical && GetCapture() == hwnd); + /* Top/left arrow button state. MSDN says top/right, but I don't believe it */ info->rgstate[1] = 0; - if (pressed && SCROLL_trackHitTest == SCROLL_TOP_ARROW) + if (pressed && g_tracking_info.hit_test == SCROLL_TOP_ARROW) info->rgstate[1] |= STATE_SYSTEM_PRESSED; if (infoPtr->flags & ESB_DISABLE_LTUP) info->rgstate[1] |= STATE_SYSTEM_UNAVAILABLE; @@ -1204,24 +1197,24 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in info->rgstate[2] = 0; if (infoPtr->curVal == infoPtr->minVal) info->rgstate[2] |= STATE_SYSTEM_INVISIBLE; - if (pressed && SCROLL_trackHitTest == SCROLL_TOP_RECT) + if (pressed && g_tracking_info.hit_test == SCROLL_TOP_RECT) info->rgstate[2] |= STATE_SYSTEM_PRESSED; /* Thumb state */ info->rgstate[3] = 0; - if (pressed && SCROLL_trackHitTest == SCROLL_THUMB) + if (pressed && g_tracking_info.hit_test == SCROLL_THUMB) info->rgstate[3] |= STATE_SYSTEM_PRESSED; /* Page down/right region state. MSDN says down/left, but I don't believe it */ info->rgstate[4] = 0; if (infoPtr->curVal >= infoPtr->maxVal - 1) info->rgstate[4] |= STATE_SYSTEM_INVISIBLE; - if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_RECT) + if (pressed && g_tracking_info.hit_test == SCROLL_BOTTOM_RECT) info->rgstate[4] |= STATE_SYSTEM_PRESSED; /* Bottom/right arrow button state. MSDN says bottom/left, but I don't believe it */ info->rgstate[5] = 0; - if (pressed && SCROLL_trackHitTest == SCROLL_BOTTOM_ARROW) + if (pressed && g_tracking_info.hit_test == SCROLL_BOTTOM_ARROW) info->rgstate[5] |= STATE_SYSTEM_PRESSED; if (infoPtr->flags & ESB_DISABLE_RTDN) info->rgstate[5] |= STATE_SYSTEM_UNAVAILABLE; @@ -1418,7 +1411,7 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM FillRect( hdc, &rc, GetSysColorBrush(COLOR_SCROLLBAR) ); } else - SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, SCROLL_trackHitTest, TRUE, TRUE ); + SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); if (!wParam) EndPaint(hwnd, &ps); } break; -- 2.30.2

1 0

[PATCH 1/5] wined3d: Set an array of constant buffers as a single CS operation.
by Zebediah Figura 06 Jul '21

06 Jul '21

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 38 +++++++++++++++------ dlls/ntoskrnl.exe/tests/Makefile.in | 4 +-- dlls/wined3d/cs.c | 53 +++++++++++++++++------------ dlls/wined3d/device.c | 37 +++++++++++--------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.h | 5 +-- 7 files changed, 89 insertions(+), 55 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f8bd8578cdc..0385db9c138 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -560,20 +560,29 @@ static void d3d11_device_context_get_constant_buffers(ID3D11DeviceContext1 *ifac wined3d_mutex_unlock(); } -static void d3d11_device_context_set_constant_buffers(ID3D11DeviceContext1 *iface, - enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) +static void d3d11_device_context_set_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, + unsigned int start_slot, unsigned int buffer_count, ID3D11Buffer *const *buffers) { + struct wined3d_buffer *wined3d_buffers[D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; - wined3d_mutex_lock(); + if (buffer_count > ARRAY_SIZE(wined3d_buffers)) + { + WARN("Buffer count %u exceeds limit; ignoring call.\n", buffer_count); + return; + } + for (i = 0; i < buffer_count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_context_set_constant_buffer(context->wined3d_context, type, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); + wined3d_buffers[i] = buffer ? buffer->wined3d_buffer : NULL; } + + wined3d_mutex_lock(); + wined3d_device_context_set_constant_buffers(context->wined3d_context, + type, start_slot, buffer_count, wined3d_buffers); wined3d_mutex_unlock(); } @@ -4571,20 +4580,29 @@ static void d3d10_device_get_constant_buffers(ID3D10Device1 *iface, wined3d_mutex_unlock(); } -static void d3d10_device_set_constant_buffers(ID3D10Device1 *iface, - enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) +static void d3d10_device_set_constant_buffers(ID3D10Device1 *iface, enum wined3d_shader_type type, + unsigned int start_slot, unsigned int buffer_count, ID3D10Buffer *const *buffers) { + struct wined3d_buffer *wined3d_buffers[D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT]; struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int i; - wined3d_mutex_lock(); + if (buffer_count > ARRAY_SIZE(wined3d_buffers)) + { + WARN("Buffer count %u exceeds limit; ignoring call.\n", buffer_count); + return; + } + for (i = 0; i < buffer_count; ++i) { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_context_set_constant_buffer(device->immediate_context.wined3d_context, type, start_slot + i, - buffer ? buffer->wined3d_buffer : NULL); + wined3d_buffers[i] = buffer ? buffer->wined3d_buffer : NULL; } + + wined3d_mutex_lock(); + wined3d_device_context_set_constant_buffers(device->immediate_context.wined3d_context, + type, start_slot, buffer_count, wined3d_buffers); wined3d_mutex_unlock(); } diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index aa3a714d3df..d6f12bdf90a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -13,9 +13,9 @@ driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_wdf_IMPORTS = winecrt0 ntoskrnl wdfldr +driver_wdf_IMPORTS = winecrt0 ntoskrnl hal wdfldr driver_wdf_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_wdf_pnp_IMPORTS = winecrt0 ntoskrnl wdfldr +driver_wdf_pnp_IMPORTS = winecrt0 ntoskrnl hal wdfldr driver_wdf_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..05adb32ae64 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -120,7 +120,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_STREAM_OUTPUT, WINED3D_CS_OP_SET_INDEX_BUFFER, - WINED3D_CS_OP_SET_CONSTANT_BUFFER, + WINED3D_CS_OP_SET_CONSTANT_BUFFERS, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW, WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW, @@ -285,12 +285,13 @@ struct wined3d_cs_set_index_buffer unsigned int offset; }; -struct wined3d_cs_set_constant_buffer +struct wined3d_cs_set_constant_buffers { enum wined3d_cs_op opcode; enum wined3d_shader_type type; - UINT cb_idx; - struct wined3d_buffer *buffer; + unsigned int start_idx; + unsigned int count; + struct wined3d_buffer *buffers[1]; }; struct wined3d_cs_set_texture @@ -598,7 +599,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); - WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFERS); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW); WINED3D_TO_STR(WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW); @@ -1529,32 +1530,40 @@ void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_constant_buffers(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_constant_buffer *op = data; - struct wined3d_buffer *prev; + const struct wined3d_cs_set_constant_buffers *op = data; + unsigned int i; - prev = cs->state.cb[op->type][op->cb_idx]; - cs->state.cb[op->type][op->cb_idx] = op->buffer; + for (i = 0; i < op->count; ++i) + { + struct wined3d_buffer *prev = cs->state.cb[op->type][op->start_idx + i]; + struct wined3d_buffer *buffer = op->buffers[i]; - if (op->buffer) - InterlockedIncrement(&op->buffer->resource.bind_count); - if (prev) - InterlockedDecrement(&prev->resource.bind_count); + cs->state.cb[op->type][op->start_idx + i] = buffer; + + if (buffer) + InterlockedIncrement(&buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + } device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); } -void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) +void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) { - struct wined3d_cs_set_constant_buffer *op; + struct wined3d_cs_set_constant_buffers *op; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; + op = wined3d_device_context_require_space(context, offsetof(struct wined3d_cs_set_constant_buffers, buffers[count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFERS; op->type = type; - op->cb_idx = cb_idx; - op->buffer = buffer; + op->start_idx = start_idx; + op->count = count; + memcpy(op->buffers, buffers, count * sizeof(*buffers)); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2903,7 +2912,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_STREAM_OUTPUT */ wined3d_cs_exec_set_stream_output, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, - /* WINED3D_CS_OP_SET_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, + /* WINED3D_CS_OP_SET_CONSTANT_BUFFERS */ wined3d_cs_exec_set_constant_buffers, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW */ wined3d_cs_exec_set_shader_resource_view, /* WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW */ wined3d_cs_exec_set_unordered_access_view, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..e123afea96d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,8 +1696,7 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { wined3d_device_context_emit_set_shader(context, i, state->shader[i]); - for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) - wined3d_device_context_emit_set_constant_buffer(context, i, j, state->cb[i][j]); + wined3d_device_context_emit_set_constant_buffers(context, i, 0, MAX_CONSTANT_BUFFERS, state->cb[i]); for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { wined3d_device_context_emit_set_sampler(context, i, j, state->sampler[i][j]); @@ -1834,30 +1833,36 @@ struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct win return context->state->shader[type]; } -void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) +void CDECL wined3d_device_context_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) { struct wined3d_state *state = context->state; - struct wined3d_buffer *prev; + unsigned int i; - TRACE("context %p, type %#x, idx %u, buffer %p.\n", context, type, idx, buffer); + TRACE("context %p, type %#x, start_idx %u, count %u, buffers %p.\n", context, type, start_idx, count, buffers); - if (idx >= MAX_CONSTANT_BUFFERS) + if (start_idx >= MAX_CONSTANT_BUFFERS || count > MAX_CONSTANT_BUFFERS - start_idx) { - WARN("Invalid constant buffer index %u.\n", idx); + WARN("Invalid constant buffer index %u, count %u.\n", start_idx, count); return; } - prev = state->cb[type][idx]; - if (buffer == prev) + if (!memcmp(buffers, &state->cb[type][start_idx], count * sizeof(*buffers))) return; - if (buffer) - wined3d_buffer_incref(buffer); - state->cb[type][idx] = buffer; - wined3d_device_context_emit_set_constant_buffer(context, type, idx, buffer); - if (prev) - wined3d_buffer_decref(prev); + wined3d_device_context_emit_set_constant_buffers(context, type, start_idx, count, buffers); + for (i = 0; i < count; ++i) + { + struct wined3d_buffer *prev = state->cb[type][start_idx + i]; + struct wined3d_buffer *buffer = buffers[i]; + + if (buffer) + wined3d_buffer_incref(buffer); + state->cb[type][start_idx + i] = buffer; + if (prev) + wined3d_buffer_decref(prev); + } } void CDECL wined3d_device_context_set_blend_state(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 11351b60a7f..a3f7f4ba405 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -123,7 +123,7 @@ @ cdecl wined3d_device_context_reset_state(ptr) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) -@ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) +@ cdecl wined3d_device_context_set_constant_buffers(ptr long long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..f03c7130c53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4809,8 +4809,9 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * unsigned int sample_mask) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_clip_plane(struct wined3d_device_context *context, unsigned int plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 53ae13b7df5..8994a78e99f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2496,8 +2496,9 @@ void __cdecl wined3d_device_context_resolve_sub_resource(struct wined3d_device_c struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, enum wined3d_format_id format_id); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); -void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, - enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_context_set_constant_buffers(struct wined3d_device_context *context, + enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, + struct wined3d_buffer *const *buffers); void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_device_context *context, struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, -- 2.30.2

2 9

[PATCH 1/5] ws2_32/tests: Fix some connection timeout tests.
by Zebediah Figura 06 Jul '21

06 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 6 ++++-- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 8f7f4acf4f2..2637630ce8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -448,7 +448,8 @@ static void test_poll(void) addr.sin_port = 255; ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); @@ -474,6 +475,7 @@ static void test_poll(void) server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); + in_params->timeout = -1000 * 10000; in_params->count = 2; in_params->sockets[0].socket = client; in_params->sockets[0].flags = AFD_POLL_READ; @@ -1310,7 +1312,7 @@ static void test_get_events(void) ok(ret == -1, "expected failure\n"); ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ret = WaitForSingleObject(event, 2000); + ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); memset(&params, 0xcc, sizeof(params)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8617a6fb7e3..1fd75dc40d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3252,17 +3252,20 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); + todo_wine ok(ret == 1, "expected 1, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite); } + select_timeout.tv_sec = 1; + select_timeout.tv_usec = 250000; + /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); @@ -6372,22 +6375,33 @@ static void test_WSAPoll(void) * so make the test interactive-only. */ if (winetest_interactive) { - const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; + const struct sockaddr_in invalid_addr = + { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = 255, + }; + SOCKET client; - client = setup_connector_socket(&invalid_addr, sizeof(invalid_addr), TRUE); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + set_blocking(client, FALSE); + + ret = connect(client, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); fds[0].fd = client; fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - ok(ret == 1, "got %d\n", ret); - ok(fds[0].revents == POLLERR, "got events %#x\n", fds[0].revents); + todo_wine ok(ret == 1, "got %d\n", ret); + todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(err == WSAECONNREFUSED, "expected 10061, got %d\n", err); + todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); closesocket(client); } -- 2.30.2

2 7

[PATCH] kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 47f55b4b27d..a9dfbf09be2 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE; -- 2.20.1

1 0

Re: [PATCH 1/2] server: Only remove non-listening fd from poll
by Zebediah Figura (she/her) 05 Jul '21

05 Jul '21

On 7/4/21 3:11 PM, David Koolhoven wrote: > On Fri, Jul 02, 2021 at 02:33:09PM -0500, Zebediah Figura (she/her) wrote: >> On 7/2/21 1:06 PM, David Koolhoven wrote: >>> This makes sure we poll listening non-connection >>> file descriptors even if the event is POLLERR or POLLHUP. >>> >>> Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> >>> --- >>> server/sock.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/server/sock.c b/server/sock.c >>> index befa9117c13..ce2f390ec05 100644 >>> --- a/server/sock.c >>> +++ b/server/sock.c >>> @@ -1024,7 +1024,7 @@ static void sock_poll_event( struct fd *fd, int event ) >>> fprintf(stderr, "socket %p select event: %x\n", sock, event); >>> >>> /* we may change event later, remove from loop here */ >>> - if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 ); >>> + if (event & (POLLERR|POLLHUP) && sock->state != SOCK_LISTENING) set_fd_events( sock->fd, -1 ); >>> >>> switch (sock->state) >>> { >>> >> >> This doesn't look right. Why do we need to do this? >> > I wish I could wrap my head around a way to make it work > without this, but without the change the next patch causes > port to stop being used and network > communications meant for that fd stop. Wait, I'm confused, is this hunk necessary or not? Is Star Citizen or World of Warcraft getting an error on the listening descriptor, and, if so, why? > I know there's some sort of restructuring of these calls > that would do it, but I can't think of any "Leave things > mostly the way they are" that would accomplish wineserver > releasing back to the kernel if it's spinning in a loop in > this situation besides something even worse like a call to > sched_yield() wineserver definitely shouldn't be spinning in a loop at all, so patch 2/2 has the right idea at least in that respect. (P.S. As I gather that this patch was written by Torge Matthies from his response, it would probably be good to credit him, either as the patch author or as someone whose patch this is based on. See also [1].) [1] https://wiki.winehq.org/Submitting_Patches#Submitting_patches_written_by_so…

1 0

[PATCH] programs/winetest: Report GetLastError() when CreateProcess() fails.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sometimes httpapi_test.exe fails to run but in such a case the only information we get in the report is the run_ex() return code, -2, which does not tell us anything about what happened: https://test.winehq.org/data/patterns.html#httpapi:httpapi With this patch the done line will contain the GetLastError() value which I expect to be ERROR_FILE_NOT_FOUND (2) due to the anti-virus quarantining our test executable. So 'done (-2)' will be replaced by 'done (-2)' and that changes everything ;-). I may even get 'done (-3)' one day. Weeeee! More seriously. This value is overloaded quite a bit: * It can be the test's exit code (a failure count). * Or an exception 'exit code' (e.g. c0000005 -> -1073741819). * Or a WaitForSingleObject() return value (typically 258). * Or the CreateProcess() -GetLastError() (expecting -2 here). But that's probably still fine. --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 64a807b6c73..81c7de2a020 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -811,6 +811,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); + if (status == -2) status = -GetLastError(); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; -- 2.20.1

1 0

[PATCH 1/4] server: Don't check the user data for NULL in async_terminate().
by Zebediah Figura 05 Jul '21

05 Jul '21

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> --- server/async.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 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; + 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 ); + 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 ); -- 2.30.2

1 3

[tools] winetest: Identify and highlight tests with too much output.
by Francois Gouget 05 Jul '21

05 Jul '21

Regular failures are more important so only highlight this problem if the test has no other issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51352 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The status of old reports can be updated by following the steps below after applying today's two patches. But that's not a requirement. * Update the summary.txt files generated by dissect to use the new big and virus codes. cd winetest/data find `pwd`/ -name report -print | \ nice xargs -P8 -n 1 dissect --update * Generate each build's testresults.txt file with gather: find `pwd`/ -name total.txt -print | \ while read p; do dirname $p; done | \ nice xargs -P8 -n 1 gather --update * Generate the new pattern pages with build-patterns: build-patterns build-index The paths to the scripts should be adjusted as appropriate. Also adjust -P8 for the desired level of parallelism. Here refreshing my test.winehq.org mirror with -P8 takes under 5 minutes. Since I have the same set of reports the time should be similar on winehq.org. --- winetest/build-patterns | 1 + winetest/dissect | 9 +++++++-- winetest/gather | 12 ++++++++++-- winetest/report.css | 3 +++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index da7272e56..0b33512a7 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -934,6 +934,7 @@ my %status2html = ( "skipped" => ["-", "s", "skipped by user request", "", ""], "crash" => ["C", "C", "crash", "t", ""], "258" => ["T", "T", "timeout", "t", ""], + "big" => ["B", "B", "too much output", "t", ""], ); # Returns a tuple containing the symbol, CSS class, title, link type and diff --git a/winetest/dissect b/winetest/dissect index 33cfb0a56..3f89e1064 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -267,7 +267,7 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # - <dll> - skipped - - - - # - <dll> <unit> skipped - - - <source> # - <dll> <unit> failed (258|crash) - - <source> -# - <dll> <unit> <total> <todo> <failures> <skipped> <source> +# - <dll> <unit> <total> <todo> (<failures>|big) <skipped> <source> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; my $line = <IN> || ""; @@ -599,10 +599,12 @@ sub close_test_unit($) $todo ||= $s_todo; $skipped ||= $s_skipped; + my $toobig; if ($unitsize > $maxunitsize) { add_test_line("end", "The test prints too much data ($unitsize bytes)"); $extra_failures++; + $toobig = 1; } if (!$broken and defined $rc) { @@ -637,7 +639,10 @@ sub close_test_unit($) } $failures += $extra_failures; - $summary = "$s_total $todo $failures $skipped" if (!defined $summary); + if (!defined $summary) + { + $summary = "$s_total $todo " . (($toobig and $failures == 1) ? "big" : $failures) . " $skipped"; + } print SUM "- $dll $unit $summary $source\n"; $testbox->{pattern} = "$dll:$unit" if ($failures); if ($failures && ++$failed_units > $maxfailedtests) { diff --git a/winetest/gather b/winetest/gather index abb339598..e6d5a9a30 100755 --- a/winetest/gather +++ b/winetest/gather @@ -356,7 +356,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { skips => [ 1, 1 ] }; } else { - $report->{$testname} = { status => "run", + my $status = "run"; + if ($errors eq "big") { + $status = "big"; + $errors = 1; + } + $report->{$testname} = { status => $status, count => [ $count, $count ], errors => [ $errors, $errors ], todos => [ $todos, $todos ], @@ -409,7 +414,8 @@ sub merge_status($$) } elsif ($group_result->{status} eq "run" and $result->{status} =~ /^missing/) { ; # Nothing to do - } elsif ($group_result->{status} ne $result->{status}) { + } elsif (($group_result->{status} =~ /^(?:run|big)$/) ne + ($result->{status} =~ /^(?:run|big)$/)) { $group_result->{status} = "mixed"; } @@ -640,6 +646,7 @@ sub get_result_title($$) if ($result->{status} eq "mixed") { return "Mixed results"; } if ($result->{status} eq "crash") { return "Test crashed"; } if ($result->{status} eq "258") { return "Test timed out"; } + if ($result->{status} eq "big") { return "Too much output"; } if ($result->{status} eq "skipped") { return "Skipped by user request"; } my ($dll, $unit) = split(/:/, $testname); @@ -725,6 +732,7 @@ sub singletest($$$) { skipped => "skipped", native => "native", crash => "crashed", + big => "too big", 258 => "timeout", mixed => "mixed", ); diff --git a/winetest/report.css b/winetest/report.css index b558c6ff7..bd8b73fec 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -92,6 +92,9 @@ div.pattern :hover { color: black; text-decoration: underline; } background-color: #ff5555; } /* .patF failure(s) */ +.patB { /* too much output */ + background-color: #ffffb3; +} /* .patn not run for an unknown reason */ /* .patm missing dll */ .pate { /* missing entrypoint */ -- 2.20.1

1 0

[tools] winetest: Detect and report tests blocked by anti-virus tools.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This happened to httpapi:httpapi: https://test.winehq.org/data/patterns.html#httpapi:httpapi WineTest also sometimes fails to run this test (error -2) but does not report the GetLastError(). I suspect these are cases where the test executable was quarantined by the anti-virus. It used to be possible to disable Microsoft Defender through the registry but then that stopped working and WineTest.exe started getting blocked by the anti-virus. Since disabling Microsoft Defender is no longer possible I told it to ignore the directory where WineTest.exe is downloaded and that helped. But WineTest.exe does not extract the tests in that directory which lead to the current round of issues. So I will have to update some configuration snapshots and/or the TestBot. Again :-( --- winetest/build-patterns | 1 + winetest/dissect | 5 +++++ winetest/gather | 10 ++++++++-- winetest/report.css | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 0b33512a7..d530ad2f8 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -929,6 +929,7 @@ my %status2html = ( "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], "stub" => ["u", "u", "stub Windows dll", "version", ""], "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror225" => ["V", "V", "blocked by the anti-virus", "version", ""], "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values "skipped" => ["-", "s", "skipped by user request", "", ""], diff --git a/winetest/dissect b/winetest/dissect index 3f89e1064..55d0a7299 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -937,6 +937,11 @@ foreach my $dll (sort keys %dllinfo) $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">timed out getting the test list</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "load error 225") + { + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">test blocked by the anti-virus</td></tr>\n", + escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} =~ /^load error (\d+)$/) { # Flag unknown errors diff --git a/winetest/gather b/winetest/gather index e6d5a9a30..5aabe4e48 100755 --- a/winetest/gather +++ b/winetest/gather @@ -663,8 +663,10 @@ sub get_result_title($$) if ($result->{status} =~ /^loaderror(.*)$/) { my $code = $1; - return "Not run because getting the test list ". - ($code eq "258" ? "timed out" : "failed with error $code"); + return $code eq "225" ? + "Not run because the test was blocked by the anti-virus" : + ("Not run because getting the test list ". + ($code eq "258" ? "timed out" : "failed with error $code")); } if ($result->{status} eq "native") { return "Not run because $dll is a native Windows dll (not allowed for Wine tests)"; } if ($result->{status} eq "stub") { return "Not run because $dll is a stub Windows dll"; } @@ -716,6 +718,10 @@ sub singletest($$$) { !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; } + elsif ($status eq "loaderror225") + { + $msg = "virus"; + } elsif ($status =~ /^loaderror/) { $msg = "no list"; diff --git a/winetest/report.css b/winetest/report.css index bd8b73fec..4594c5d49 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -116,6 +116,9 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } +.patV { /* test blocked by the anti-virus */ + background-color: #99e6ff; +} .commitR { color: #cc0000; -- 2.20.1

1 0

[PATCH] ntdll/tests: Improve the RtlWaitOnAddress() timeout checks.
by Francois Gouget 05 Jul '21

05 Jul '21

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> --- We still got a couple of failures after the acceptable elapsed time range was widened in an attempt to account for GetTickCount()'s granularity: https://test.winehq.org/data/patterns.html#ntdll:om om.c:2322: Test failed: got 78 om.c:2307: Test failed: got 62 With this patch I did not get any failures in thousands of runs but it was already really hard to reproduce (<1%) so it's not a 100% guarantee that it will work now. --- 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); -- 2.20.1

1 0

[PATCH] ntdll/tests: TZinfo sometimes does not get a MUI string.
by Francois Gouget 05 Jul '21

05 Jul '21

RtlQuery*TimeZoneInformation() should return a MUI string but there are rare cases where it does not in Windows 10 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this is the case for w10pro64. But the same Windows version with just the language packs installed behaves as expected. Yet the ntdll version did not change so it should not be that RtlQuery*TimeZoneInformation() behaves differently. --- dlls/ntdll/tests/time.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 90737521a4d..ee683e9a0aa 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -234,10 +234,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryDynamicTimeZoneInformation(&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryDynamicTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -251,10 +253,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -262,10 +266,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); -- 2.20.1

1 0

[PATCH 1/5] d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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(); } -- 2.20.1

2 1

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in wined3d_render_pass_vk_init().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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)) -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in state_stencil().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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); -- 2.20.1

1 0

[PATCH 2/5] d2d1: Do not clear the device context state in d2d_device_context_draw().
by Henri Verbeet 05 Jul '21

05 Jul '21

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> --- 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); -- 2.20.1

1 0

[PATCH 8/8] gdi32: Move CreateDiscardableBitmap implementation to objects.c.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 ------------------ dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH 7/8] gdi32: Use ntgdi names for bitmap functions.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)

2 1

[PATCH 6/8] gdi32: Introduce NtGdiCreateBitmap.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/objects.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-)

2 1

[PATCH 5/8] gdi32: Implement CreateBitmapIndirect on top of CreateBitmap.
by Jacek Caban 05 Jul '21

05 Jul '21

Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 121 ++++++++++++------------------------------- dlls/gdi32/objects.c | 15 ++++++ 2 files changed, 49 insertions(+), 87 deletions(-)

2 1

[PATCH 4/8] gdi32: Introduce NtGdiCreatePen.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 9 +++++++++ dlls/gdi32/pen.c | 33 ++++++++++++++------------------- include/ntgdi.h | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-)

2 1

[PATCH 3/8] gdi32: Implement CreatePenIndirect on top of CreatePen.
by Jacek Caban 05 Jul '21

05 Jul '21

Instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/pen.c | 32 ++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-)

2 1

[PATCH 2/8] gdi32: Reimplement GetObjectA on top of GetObjectW.
by Jacek Caban 05 Jul '21

05 Jul '21

2 1

[PATCH 1/8] gdi32: Introduce NtGdiExtGetObjectW.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 10 ++++------ dlls/gdi32/objects.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-)

2 1

[PATCH] wined3d: Factor out most of the execute_command_list callback to a common function.
by Zebediah Figura 05 Jul '21

05 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 51 ++++++++++++++++------------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c5fc8fbb7a6..24f35298879 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2353,25 +2353,13 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, query->state = QUERY_SIGNALLED; } -static void wined3d_cs_execute_command_list(struct wined3d_device_context *context, +static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state) { - struct wined3d_cs_execute_command_list *op; SIZE_T i; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); - - wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) @@ -2962,6 +2950,25 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo } } +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) +{ + struct wined3d_cs_execute_command_list *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; + op->list = list; + + context->ops->acquire_command_list(context, list); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + + if (restore_state) + wined3d_device_context_set_state(context, context->state); + else + wined3d_device_context_reset_state(context); +} + static void *wined3d_cs_st_require_space(struct wined3d_device_context *context, size_t size, enum wined3d_cs_queue_id queue_id) { @@ -3042,7 +3049,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3168,7 +3175,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_issue_query, wined3d_cs_flush, wined3d_cs_acquire_resource, - wined3d_cs_execute_command_list, + wined3d_cs_acquire_command_list, }; static void poll_queries(struct wined3d_cs *cs) @@ -3561,20 +3568,10 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont wined3d_resource_incref(resource); } -static void wined3d_deferred_context_execute_command_list(struct wined3d_device_context *context, +static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - struct wined3d_cs_execute_command_list *op; - - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; - op->list = list; - - if (restore_state) - wined3d_device_context_set_state(context, context->state); - else - wined3d_device_context_reset_state(context); /* Grab a reference to the command list. Note that this implicitly prevents * any dependent command lists or resources from being freed as well. */ @@ -3596,7 +3593,7 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_issue_query, wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, - wined3d_deferred_context_execute_command_list, + wined3d_deferred_context_acquire_command_list, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55879e546f2..c550899466f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4908,7 +4908,7 @@ void CDECL wined3d_device_context_execute_command_list(struct wined3d_device_con { TRACE("context %p, list %p, restore_state %d.\n", context, list, restore_state); - context->ops->execute_command_list(context, list, restore_state); + wined3d_device_context_emit_execute_command_list(context, list, restore_state); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36e1fa4ec7a..5ba00871222 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,8 +4717,7 @@ struct wined3d_device_context_ops void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); - void (*execute_command_list)(struct wined3d_device_context *context, - struct wined3d_command_list *list, bool restore_state); + void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); }; struct wined3d_device_context @@ -4798,6 +4797,8 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_execute_command_list(struct wined3d_device_context *context, + struct wined3d_command_list *list, bool restore_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, -- 2.30.2

2 1

[PATCH 4/5] user32: Introduce a SCROLL_DrawNCScrollBar() to draw scroll bars in non-client area.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

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> --- 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 * -- 2.30.2

2 1

[PATCH] uxtheme: Avoid memory leaks.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

A THEME_FILE struct and four global ATOMs are leaked when unloading uxtheme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/main.c | 3 +++ dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxthemedll.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 5e5610a1f84..0b852b06fc7 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -39,6 +39,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); UXTHEME_InitSystem(hInstDLL); break; + case DLL_PROCESS_DETACH: + 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 -- 2.30.2

1 0

[PATCH 5/5] user32: Call SCROLL_DrawScrollBar() to draw arrows in SCROLL_HandleScrollEvent().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

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> --- 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; -- 2.30.2

1 0

[PATCH 3/5] user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

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> --- 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) { -- 2.30.2

1 0

[PATCH 2/5] user32: Remove SCROLL_DrawInterior_9x().
by Zhiyi Zhang 05 Jul '21

05 Jul '21

SCROLL_DrawInterior_9x() has the same functionality as SCROLL_DrawInterior(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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, -- 2.30.2

1 0

[PATCH 1/5] user32: Avoid unnecessary scroll bar drawing.
by Zhiyi Zhang 05 Jul '21

05 Jul '21

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> --- 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 ); -- 2.30.2

1 0

d3d10core:d3d10core fails systematically on cw-rx460
by Francois Gouget 05 Jul '21

05 Jul '21

>From bug https://bugs.winehq.org//show_bug.cgi?id=51181 test_instanced_draw() fails systematically on cw-rx460: https://test.winehq.org/data/patterns.html#d3d10core:d3d10core d3d10core.c:9275: Test failed: Got 0xfff0f010, expected 0xff80f010 at (160, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xfff0f040, expected 0xff80f040 at (240, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xffaaaacc, expected 0xffbbaacc at (480, 0), sub-resource 0. d3d10core.c:9275: Test failed: Got 0xffaaaa90, expected 0xffbbaa90 at (560, 0), sub-resource 0. It turns out that this happens when running test_il_append_aligned() and test_instanced_draw() in parallel. So would it be acceptable to run test_instanced_draw() after the other tests as in the patch below or should this be investigated some more? https://bugs.winehq.org//attachment.cgi?id=70210 -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

What to do for the d3d11:d3d11 crash on cw-gtx560?
by Francois Gouget 05 Jul '21

05 Jul '21

>From bug https://bugs.winehq.org//show_bug.cgi?id=51103 The commit adding more SwapDeviceContextState() tests (ccffc06c6df3) is causing d3d11:d3d11 to crash on the GTX 560 Nvidia card: https://test.winehq.org/data/patterns.html#d3d11:d3d11 It turns out that the crash is happening in the final ID3D11Device1_Release(device) call in test_device_context_state(). So that's probably a reference counting bug in the Nvidia driver but it still happens on the latest driver for that GeForce GTX 560 card : 391.35. So what should we do? Drop the final ID3D11Device1_Release(device) call? Drop the extra tests? Something else? -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH 1/4] winex11.drv: Only return vulkan functions if the host function is available.
by Georg Lehmann 05 Jul '21

05 Jul '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; -- 2.32.0

2 5

[WineHQ] wwn/en: Tweak the wording of the AppDB disclaimer.
by Francois Gouget 05 Jul '21

05 Jul '21

--- wwn/en/wn20071210_334.xml | 10 +++++----- wwn/en/wn20071217_335.xml | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wwn/en/wn20071210_334.xml b/wwn/en/wn20071210_334.xml index 1919feb7..2c19f405 100644 --- a/wwn/en/wn20071210_334.xml +++ b/wwn/en/wn20071210_334.xml @@ -530,12 +530,12 @@ situation left where shaders recompile all over. posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by +*Disclaimer: This list of changes is automatically generated from information entered into the AppDB. These results are subject to the opinions -of the users submitting application reviews. The WINE community does not -guarantee that even though an application may be upgraded to 'Gold' or -'Platinum' in this list that you will have the same experience and would -provide a similar rating +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> diff --git a/wwn/en/wn20071217_335.xml b/wwn/en/wn20071217_335.xml index 9a550817..0cdc1079 100644 --- a/wwn/en/wn20071217_335.xml +++ b/wwn/en/wn20071217_335.xml @@ -379,13 +379,12 @@ Alexander N. Sornes posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by -information entered into the AppDB. -These results are subject to the opinions of the users submitting application -reviews. -The WINE community does not guarantee that even though an application may be -upgraded to 'Gold' or 'Platinum' in this list that you -will have the same experience and would provide a similar rating +*Disclaimer: This list of changes is automatically generated from +information entered into the AppDB. These results are subject to the opinions +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> -- 2.20.1

1 0

[WineHQ] wwn/en: Fix some case and spelling issues, add some missing words.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- wwn/en/wn19990829_6.xml | 2 +- wwn/en/wn20010611_97.xml | 6 +++--- wwn/en/wn20010802_101.xml | 10 +++++----- wwn/en/wn20041015_244.xml | 4 ++-- wwn/en/wn20070410_328.xml | 2 +- wwn/en/wn20080106_338.xml | 4 ++-- wwn/en/wn20080922_352.xml | 2 +- wwn/en/wn20140303_364.xml | 12 ++++++------ wwn/en/wn20140314_365.xml | 8 ++++---- wwn/en/wn20140328_366.xml | 8 ++++---- wwn/en/wn20140509_369.xml | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wwn/en/wn19990829_6.xml b/wwn/en/wn19990829_6.xml index 374c6529..ed2f737b 100644 --- a/wwn/en/wn19990829_6.xml +++ b/wwn/en/wn19990829_6.xml @@ -15,7 +15,7 @@ main goal is to distribute widely what's going on around Wine (the Un*x Windows emulator). Well this week has been very quiet on wine-devel, as if most of the -developpers were on vacation at the same time. Of course, there was the +developers were on vacation at the same time. Of course, there was the O'Reilly conference in Monterey (CA) where Alexandre Julliard was giving a talk. So, I barely had enough material to put an issue together. diff --git a/wwn/en/wn20010611_97.xml b/wwn/en/wn20010611_97.xml index 8a0ddfd3..10b708e5 100644 --- a/wwn/en/wn20010611_97.xml +++ b/wwn/en/wn20010611_97.xml @@ -308,7 +308,7 @@ a 2GB virtual memory space this means you can start a maximum of about 2000 threads. If you increase this to 10MB then you can only start 200 threads (per process). - And that's why you have all the Java developpers complaining that + And that's why you have all the Java developers complaining that Java does not scale because it only support 2000 clients! Let me explain. Until JDK1.4 is out Java does not have asynchronous I/O. So all Java servers are of the 'one thread per client' type. So they all block @@ -320,9 +320,9 @@ very much this affects your application (seems more scientific computing oriented). One more word on Java and threads :-) All (overgeneralization, I now) -Java developpers (and benchmarketers) say Linux is bad because it does +Java developers (and benchmarketers) say Linux is bad because it does not scale well when you have thousands of runnable threads. And all -kernel developpers reply 'you have to be crazy to have thousands of +kernel developers reply 'you have to be crazy to have thousands of threads, your server performance will be bad anyway if you do that' (to which I can only agree). Fortunately, as I said before, JDK 1.4 will finally have asynchronous I/O, and even memory mapped files! So maybe diff --git a/wwn/en/wn20010802_101.xml b/wwn/en/wn20010802_101.xml index 18d230cd..0b22069c 100644 --- a/wwn/en/wn20010802_101.xml +++ b/wwn/en/wn20010802_101.xml @@ -408,12 +408,12 @@ environment for which we no longer have any documentation. Then when someone comes to modify some piece of code which is shared between Win16 and Win32 you have no idea if the fix you made for Win32 is not going to break Win16. If Wine had had good independent documentation of the API -from the start developpers could refer to this documentation to know +from the start developers could refer to this documentation to know whether a change is going to break Win16 or not.</li> <li>MSDN documentation is often incomplete / slightly incorrect (though people working on Wine should maybe look at it a bit more). So what you propose is that this be *the* documentation for the Win32 API. I -think Wine developpers and Winelib users deserve better. And no one +think Wine developers and Winelib users deserve better. And no one using Winelib as a development platform would want to have to go to two places to find documentation.</li> <li>The MSDN documentation is currently freely available on the Web. @@ -429,14 +429,14 @@ this is the only place where they have a remote chance of staying up to date (and also where it's most practical to have it). - Of course developpers are very well-known for hating to document + Of course developers are very well-known for hating to document stuff so it's going to be pretty hard to get proper documentation. But -we should encourage all Wine developpers to write good documentation for +we should encourage all Wine developers to write good documentation for the functions they implement/fix, not dissuade them to do so. Also I agree with you that the strict minimum is to at least document all the undocumented/weird behaviors. Especially since without some sort -of documentation the next developper may be tempted to remove what looks +of documentation the next developer may be tempted to remove what looks like unnecessarily convoluted/obviously wrong code. diff --git a/wwn/en/wn20041015_244.xml b/wwn/en/wn20041015_244.xml index 4779b42a..78ed178d 100644 --- a/wwn/en/wn20041015_244.xml +++ b/wwn/en/wn20041015_244.xml @@ -310,7 +310,7 @@ the private header</li></ul> </section> <section title="COM Inheritance" - subject="COM inheritence" + subject="COM inheritance" archive="//www.winehq.org/hypermail/wine-devel/2004/10/0236.html" posts="4" startdate="10/11/2004" @@ -357,7 +357,7 @@ IJimVtbl Jim_Vtbl = have extern prototypes defined. Basically this is because array initialization requires constant values. - However, this would seem something which is so common - i.e. inheritence is + However, this would seem something which is so common - i.e. inheritance is used all over the place. How do people handle this? I've looked through a few places in the code and can't see how this can be done. I could 'pretend' by initializing the Vtbl as I create the com object and do some LoadLibrary diff --git a/wwn/en/wn20070410_328.xml b/wwn/en/wn20070410_328.xml index d32bc717..e461b596 100644 --- a/wwn/en/wn20070410_328.xml +++ b/wwn/en/wn20070410_328.xml @@ -134,7 +134,7 @@ installers. Dan Kegel summarized what a lot of people on wine-devel think about such projects: <quote who="Dan Kegel"> -The problem that Wine developers have with recipies +The problem that Wine developers have with recipes like the one you cite is that most of the steps in the recipe are there to work around bugs in Wine. We would prefer to fix the bugs. For instance, diff --git a/wwn/en/wn20080106_338.xml b/wwn/en/wn20080106_338.xml index 654e050b..9b2db7f1 100644 --- a/wwn/en/wn20080106_338.xml +++ b/wwn/en/wn20080106_338.xml @@ -101,7 +101,7 @@ run in Wine. Tom also highlights a new bit of wine software, <a href="http://wine-review.blogspot.com/2008/01/bordeaux-wine-configuration-manager…">Bordeaux</a>. Bordeaux is a new wine-package manager (for apps running under wine). -I havn't yet had a chance to use it, however many of the wwn's readers may +I haven't yet had a chance to use it, however many of the wwn's readers may find this interesting and useful. <quote> @@ -424,7 +424,7 @@ Roderick Colenbrander writes with an alternative to MD5 <quote> The system on windows doesn't use the md5sum (I think it has one) but it -looks for the product ID which is burried into most executables first. It +looks for the product ID which is buried into most executables first. It also checks for other things but in a hackier way. As there are a lot of different versions of a program but which all need the same override. diff --git a/wwn/en/wn20080922_352.xml b/wwn/en/wn20080922_352.xml index 4e24ad97..0bcfd323 100644 --- a/wwn/en/wn20080922_352.xml +++ b/wwn/en/wn20080922_352.xml @@ -244,7 +244,7 @@ Jeremy </quote> A bit of an editorial: -So I actually went and downloaded <a href="http://www.codeweavers.com/services/ports/chromium/">CrossOver Chromium Edition</a> and played with it for a bit. I first tried GMail, no issues. I said to myself alright, that is pretty impressive. How about a real test: will flash work? I went to youtube.com and sure enough I got the error "Flash isn't installed." Aww poop. Well, lets try installing it. Clicked the "go to Adobe to get Flash" link, downloaded the executable which ran a really fast installer. I went back to youtube.com and..... no luck. At this point I had lost a bit of hope. But then an idea struck me! I closed the browser and re-opened it. Off to youtube.com and... voila! Working flash video! I watched a rather cute video of a cat smacking a printer with its paw. After about 45 seconds of this the cat hit it hard enough that the paper tray came lose and the cat went flying. Perfect. +So I actually went and downloaded <a href="http://www.codeweavers.com/services/ports/chromium/">CrossOver Chromium Edition</a> and played with it for a bit. I first tried GMail, no issues. I said to myself alright, that is pretty impressive. How about a real test: will flash work? I went to youtube.com and sure enough I got the error "Flash isn't installed." Aww poop. Well, let's try installing it. Clicked the "go to Adobe to get Flash" link, downloaded the executable which ran a really fast installer. I went back to youtube.com and..... no luck. At this point I had lost a bit of hope. But then an idea struck me! I closed the browser and re-opened it. Off to youtube.com and... voila! Working flash video! I watched a rather cute video of a cat smacking a printer with its paw. After about 45 seconds of this the cat hit it hard enough that the paper tray came lose and the cat went flying. Perfect. As a Wine user of many years there are these occasional moments in using Wine when, after getting something seemingly outrageously complex to work, you sit back and go wow: that's really a miracle. This was one of them for me, hats off to the entire Wine and CodeWeavers team. diff --git a/wwn/en/wn20140303_364.xml b/wwn/en/wn20140303_364.xml index 48852ffe..27480757 100644 --- a/wwn/en/wn20140303_364.xml +++ b/wwn/en/wn20140303_364.xml @@ -50,13 +50,13 @@ A user asked about the state of Wine64 on OS X: Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of -the available memory. Its becoming necessary to have this capability. +the available memory. It???s becoming necessary to have this capability. </quote> Stefan gave a good explanation: <quote> -OSX has a ABI incompatibility with Win64 - OSX overwrites a CPU register that Win64 applications expect to remain untouched. Apple can???t change the ABI because there are already 64 bit OSX apps that expect things to work that way. A potential workaround may be to run Wine inside a CPU emulator like qemu, but that is anything but easy. +OSX has an ABI incompatibility with Win64 - OSX overwrites a CPU register that Win64 applications expect to remain untouched. Apple can???t change the ABI because there are already 64 bit OSX apps that expect things to work that way. A potential workaround may be to run Wine inside a CPU emulator like qemu, but that is anything but easy. </quote> </section> @@ -88,7 +88,7 @@ Shortly after the last WWN, Marcus wrote: Wine is an accepted organization for GSoC 2014, would-be students should now discuss project ideas with us as in one week the Student application period opens. -See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informations and project ideas. +See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more information and project ideas. </section> @@ -121,10 +121,10 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we Major changes in 20140302 since 20130707 <ul> <li>dotnet verbs are all now fully automated in -q mode</li> -<li>comctl32ocx: add ActiveX controls</li> +<li>comctl32.ocx: add ActiveX controls</li> <li>flash: udpate to version 12</li> <li>fakechinese: add some more font aliases</li> -<li>Arbitary virtual desktop sizes are now allowed (vd=1024x768, vd=800x600, etc.)</li> +<li>Arbitrary virtual desktop sizes are now allowed (vd=1024x768, vd=800x600, etc.)</li> <li>vcrun2008: also override atl90</li> <li>mingw: new version, automated install</li> </ul> @@ -152,7 +152,7 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we </ul> -See <a href="http://winetricks.org/">winetricks.org</a> for more informations. +See <a href="http://winetricks.org/">winetricks.org</a> for more information. </section> diff --git a/wwn/en/wn20140314_365.xml b/wwn/en/wn20140314_365.xml index 3347e836..8dae88b8 100644 --- a/wwn/en/wn20140314_365.xml +++ b/wwn/en/wn20140314_365.xml @@ -45,15 +45,15 @@ See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informa > Valve has open sourced their DirectX to OpenGL translator named <a href="//github.com/ValveSoftware/ToGL">ToGL</a>. -The media and even some developers wondered if this is usefull for Wine. Stefan D??singer had a quick look at the code and gave an answer: +The media and even some developers wondered if this is useful for Wine. Stefan D??singer had a quick look at the code and gave an answer: <quote> No, it's not. It is *very* limited. It doesn't even have stateblock -interface declaration, and it's surface implementation is pretty much +interface declaration, and its surface implementation is pretty much nonexistent. It doesn't care about any of the corner cases that make d3d9 interesting. Note that this is not an exhaustive review of this code. It's just the -first two things I found in a 2 minute look. +first two things I found in a 2 minutes look. Those limitations make sense as design decisions for Valve's purposes, but they make this wrapper useless for anything other than a cheap compile-time abstraction layer between d3d and gl. Releasing this code @@ -70,7 +70,7 @@ though. > Jeremy White finally got annoyed enough by the remaining <a href="//test.winehq.org/data/">test failures</a> on Windows and pushed people to fix them. -This also had the fact that other developers were afraid to get shamed and also fix test failures :) +This also had the effect of making other developers afraid of getting shamed and so they too fixed test failures :) We already made good progress, but there are some strange behaviours of Windows, other hard to analyze failures and problems caused by <a href="https://wiki.winehq.org/WineTestBotVMs">the way</a> the WineTestBot works. diff --git a/wwn/en/wn20140328_366.xml b/wwn/en/wn20140328_366.xml index 05ee3923..b482ada5 100644 --- a/wwn/en/wn20140328_366.xml +++ b/wwn/en/wn20140328_366.xml @@ -43,8 +43,8 @@ See <a href="https://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informa posts="0" > -Finally i cleaned out the Recent News Queue page, either by posting the story or removing it for being outdated. -Also i tried hard to find potential news myself, but that is nothing i'm good at and steals my time i could spend coding for Wine. +Finally I cleaned out the Recent News Queue page, either by posting the story or removing it for being outdated. +Also I tried hard to find potential news myself, but that is nothing i'm good at and steals my time I could spend coding for Wine. So please, if you find something interesting and Wine related, post it <a href="https://wiki.winehq.org/RecentNewsQueue">there</a>. At best you also add some text, but meanwhile i'm also happy for simple suggestions. @@ -71,14 +71,14 @@ At the moment WineCE is based on the stable version 1.6.2 and with the new chang > <topic>CN102364433</topic> -Last week i was told about the chinese Patent CN102364433. It claims that <a href="https://wiki.winehq.org/ARM">Wine on ARM</a> was invented by five chinese people and that they want to protect that procedure. +Last week I was told about the chinese Patent CN102364433. It claims that <a href="https://wiki.winehq.org/ARM">Wine on ARM</a> was invented by five chinese people and that they want to protect that procedure. While from my point of view there are no facts in that potential Patent that should be patented, there is also a Problem with the timing. As you can see <a href="//source.winehq.org/git/wine.git/search/HEAD?pg=1;s=+ARM;st=commit">here</a>, the main commits <a href="https://wiki.winehq.org/AndreHentschel">from me</a> to support the ARM architecture in Wine were published 2010 <a href="//www.winehq.org/announce/1.3.4">(and ARM was supported with Wine 1.3.4)</a>. But that potential Patent seems to be from June 2011 and tries to describe the procedure of porting Wine to ARM using Wine 1.3.13 which clearly has ARM support. -Meanwhile i try to find a good way to do something about that potential Patent and stop the process of granting it to those liars. +Meanwhile I try to find a good way to do something about that potential Patent and stop the process of granting it to those liars. </section> diff --git a/wwn/en/wn20140509_369.xml b/wwn/en/wn20140509_369.xml index 5ea06d12..dd347366 100644 --- a/wwn/en/wn20140509_369.xml +++ b/wwn/en/wn20140509_369.xml @@ -43,7 +43,7 @@ i suggest to simply open a Forum thread, name it e.g. WWN369 and ask questions o Mostly Kai Tietz and I are currently (finally) working on MinGW-w64 targeting ARMv7. -You might ask why. Well, there are multible reasons, but i'll just cover the Wine related ones here. +You might ask why. Well, there are multiple reasons, but i'll just cover the Wine related ones here. At some point we really want to compile and run our test suite not only in Wine, but also on Windows RT. @@ -60,7 +60,7 @@ to recompile most applications and libraries and run it in Wine on ARM (or a jai While we develop it we use the triple armv7-w64-mingw32ce which is quite misleading, later it will be something like -armv7-w64-mingw. But at the moment i really don't recommend to try it out. Most things don't work, build system is not +armv7-w64-mingw. But at the moment I really don't recommend to try it out. Most things don't work, build system is not ready and so on. Still, with some effort it's possible to translate a very basic application and get a Windows RT compatible executable. </section> -- 2.20.1

1 0

[PATCH v2 1/6] ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Rémi Bernon 05 Jul '21

05 Jul '21

Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Adapt wine/test.h code instead of copying it and including wine/test.h 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 --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..85a6925138a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..1fe3ec2e558 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..8c41010c503 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -54,7 +54,8 @@ struct test_data int running_under_wine; int winetest_report_success; int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; + int failures; + int todo_failures; }; struct main_test_input @@ -64,13 +65,6 @@ struct main_test_input ULONG64 *modified_value; }; -static inline char *drv_strrchr( const char *str, char ch ) -{ - char *ret = NULL; - do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); - return ret; -} - static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; #define SERVER_LISTEN_PORT 9374 diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..4ebacc7cf14 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..797421904c8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -386,6 +386,7 @@ static void cat_okfile(void) SetEndOfFile(okfile); winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); } static ULONG64 modified_value; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 6a0e00428a5..f73f6f938ca 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -22,25 +22,103 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> + +#include <ddk/wdm.h> + +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static HANDLE okfile; static LONG successes; static LONG failures; static LONG skipped; static LONG todo_successes; static LONG todo_failures; -static int todo_level, todo_do_loop; +static LONG muted_traces; +static LONG muted_skipped; +static LONG muted_todo_successes; + static int running_under_wine; static int winetest_debug; static int winetest_report_success; +/* silence todos and skips above this threshold */ +static int winetest_mute_threshold = 42; + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char* current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static inline struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +static inline void winetest_set_location( const char* file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file=strrchr(file,'/'); + if (data->current_file==NULL) + data->current_file=strrchr(file,'\\'); + if (data->current_file==NULL) + data->current_file=file; + else + data->current_file++; + data->current_line=line; +} + static inline void kvprintf(const char *format, __ms_va_list ap) { - static char buffer[512]; + struct tls_data *data = get_tls_data(); IO_STATUS_BLOCK io; - int len = vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); + int len = vsnprintf(data->strings, sizeof(data->strings), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, data->strings, len, NULL, NULL); } +static inline void WINAPIV kprintf(const char *format, ...) __WINE_PRINTF_ATTR(1,2); static inline void WINAPIV kprintf(const char *format, ...) { __ms_va_list valist; @@ -50,6 +128,18 @@ static inline void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } +static inline void WINAPIV winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_printf( const char *msg, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __ms_va_start( valist, msg ); + kvprintf( msg, valist ); + __ms_va_end( valist ); +} + static inline NTSTATUS winetest_init(void) { const struct test_data *data; @@ -61,6 +151,8 @@ static inline NTSTATUS winetest_init(void) HANDLE section; NTSTATUS ret; + KeInitializeSpinLock(&tls_data_lock); + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -98,7 +190,7 @@ static inline void winetest_cleanup(void) if (winetest_debug) { kprintf("%04x:ntoskrnl: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, + (DWORD)(DWORD_PTR)PsGetCurrentProcessId(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); } @@ -114,10 +206,7 @@ static inline void winetest_cleanup(void) { data = addr; - InterlockedExchangeAdd(&data->successes, successes); InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); InterlockedExchangeAdd(&data->todo_failures, todo_failures); ZwUnmapViewOfSection(NtCurrentProcess(), addr); @@ -128,118 +217,185 @@ static inline void winetest_cleanup(void) ZwClose(okfile); } -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +static inline void winetest_print_context( const char *msgtype ) { - const char *current_file; + struct tls_data *data = get_tls_data(); + unsigned int i; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + kprintf( "%s: ", data->context[i] ); +} + +static inline LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); - if (todo_level) + return count; +} + +static inline int winetest_vok( int condition, const char *msg, __ms_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) { if (condition) { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + winetest_print_context( "Test succeeded inside todo block: " ); kvprintf(msg, args); InterlockedIncrement(&todo_failures); + return 0; } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); + return 1; } } else { if (!condition) { - kprintf("%s:%d: Test failed: ", current_file, line); + winetest_print_context( "Test failed: " ); kvprintf(msg, args); InterlockedIncrement(&failures); + return 0; } else { if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); + winetest_printf("Test succeeded\n"); InterlockedIncrement(&successes); + return 1; } } } -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); + winetest_vok(condition, msg, args); __ms_va_end(args); } -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static inline void winetest_vskip( const char *msg, __ms_va_list args ) { - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf(msg, args); + InterlockedIncrement(&skipped); + } else - current_file++; + InterlockedIncrement(&muted_skipped); +} - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; +static inline void WINAPIV winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_skip( const char *msg, ... ) +{ + __ms_va_list args; + __ms_va_start(args, msg); + winetest_vskip(msg, args); + __ms_va_end(args); } -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); if (running_under_wine) - vok_(file, line, 0, msg, args); + winetest_vskip(msg, args); else - vskip_(file, line, msg, args); + winetest_vok(0, msg, args); __ms_va_end(args); } -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) +static inline void WINAPIV winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static inline void WINAPIV winetest_trace( const char *msg, ... ) { - const char *current_file; __ms_va_list args; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __ms_va_start(args, msg); + kvprintf( msg, args ); + __ms_va_end(args); + } else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); + InterlockedIncrement(&muted_traces); } static inline void winetest_start_todo( int is_todo ) { - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop=1; } static inline int winetest_loop_todo(void) { - int do_loop=todo_do_loop; - todo_do_loop=0; + struct tls_data *data = get_tls_data(); + int do_loop=data->todo_do_loop; + data->todo_do_loop=0; return do_loop; } static inline void winetest_end_todo(void) { - todo_level >>= 1; + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; +} + +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR(1, 2); +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __ms_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __ms_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; +} + +static inline void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; } static inline int broken(int condition) @@ -247,11 +403,31 @@ static inline int broken(int condition) return !running_under_wine && condition; } -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) +#ifdef WINETEST_NO_LINE_NUMBERS +# define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process +#else +# define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_wait_child_process +#endif + +#define ok ok_(__FILE__, __LINE__) +#define skip skip_(__FILE__, __LINE__) +#define trace trace_(__FILE__, __LINE__) +#define win_skip win_skip_(__FILE__, __LINE__) + #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ winetest_end_todo()) #define todo_wine todo_if(running_under_wine) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) -- 2.32.0

2 8

[PATCH] ntoskrnl.exe/tests: Only count test driver load notify.
by Rémi Bernon 05 Jul '21

05 Jul '21

Sometimes [1] Windows loads other drivers when we don't expect it, and this causes spurious failures. [1] https://testbot.winehq.org/JobDetails.pl?Key=93614 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- 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 1fe3ec2e558..7ee48696c09 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); } -- 2.32.0

1 0

[PATCH 1/6] iphlpapi: Implement ConvertInterfaceIndexToLuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3a2227f5ebb..3db17289bf4 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi -IMPORTS = advapi32 +IMPORTS = advapi32 nsi uuid EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b6b96165027..05f3c3b9b76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -56,7 +56,9 @@ #include "netioapi.h" #include "tcpestats.h" #include "ip2string.h" +#include "netiodef.h" +#include "wine/nsi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3183,20 +3185,16 @@ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) { - MIB_IFROW row; + DWORD err; - TRACE("(%u %p)\n", index, luid); + TRACE( "(%u %p)\n", index, luid ); if (!luid) return ERROR_INVALID_PARAMETER; - memset( luid, 0, sizeof(*luid) ); - - row.dwIndex = index; - if (GetIfEntry( &row )) return ERROR_FILE_NOT_FOUND; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, luid, sizeof(*luid), 0 ); + if (err) luid->Value = 0; + return err; } /****************************************************************** -- 2.23.0

1 1

[PATCH vkd3d v2 1/2] tests: Add test for texture placement at 64kb alignment.
by Conor McCarthy 05 Jul '21

05 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ce6d6b36..82b1b45b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29766,6 +29766,106 @@ static void test_resource_allocation_info(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_64kb_texture_alignment(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_SUBRESOURCE_DATA texture_data; + D3D12_RESOURCE_DESC resource_desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *textures[2]; + D3D12_HEAP_DESC heap_desc; + ID3D12CommandQueue *queue; + uint32_t *upload_buffer; + unsigned int i, x, y; + ID3D12Device *device; + ID3D12Heap *heap; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + /* This results in an alignment of 0x20000 with RX580/RADV, but + * only with D3D12_TEXTURE_LAYOUT_UNKNOWN. Other cards/drivers may + * specify smaller alignments compatible with the 64kb D3D12 default. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 1024; + resource_desc.Height = 1024; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc); + + heap_desc.SizeInBytes = info.SizeInBytes * 2 + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + /* Padding of info.SizeInBytes is (vulkan_alignment - d3d12_alignment), so this heap_offset calculation + * always results in a Vulkan-aligned offset which won't be adjusted upwards. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + info.SizeInBytes, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[1]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + /* Some apps, e.g. WoW, ignore the alignment returned by GetResourceAllocationInfo() and use + * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT. D3D12 requires support for this alignment. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[0]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + upload_buffer = malloc(info.SizeInBytes); + ok(upload_buffer, "Failed to allocate memory.\n"); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xcafef00d; + texture_data.pData = upload_buffer; + texture_data.RowPitch = resource_desc.Width * sizeof(uint32_t); + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + upload_texture_data(textures[1], &texture_data, 1, queue, command_list); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xdeadbeef; + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + reset_command_list(command_list, context.allocator); + /* Write data to the first texture to check if the second is overwritten. + * Resource overlap may still go undetected depending on the actual layout + * used by the driver. */ + upload_texture_data(textures[0], &texture_data, 1, queue, command_list); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, textures[1], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); + for (y = 0; y < resource_desc.Height; ++y) + { + for (x = 0; x < resource_desc.Width; ++x) + { + i = get_readback_uint(&rb, x, y, 0); + ok(i == 0xcafef00d, "Expected 0xcafef00d, got %#x at %u, %u.\n", i, x, y); + } + } + release_resource_readback(&rb); + + free(upload_buffer); + ID3D12Resource_Release(textures[0]); + ID3D12Resource_Release(textures[1]); + ID3D12Heap_Release(heap); + destroy_test_context(&context); +} + static void test_suballocate_small_textures(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -33982,6 +34082,7 @@ START_TEST(d3d12) run_test(test_clip_distance); run_test(test_combined_clip_and_cull_distances); run_test(test_resource_allocation_info); + run_test(test_64kb_texture_alignment); run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); -- 2.31.1

2 6

[PATCH 6/6] maintainers: Add a Network Store Interface section.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1bc8658e02..e85151e9bd2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,9 +181,14 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -F: dlls/iphlpapi/ F: dlls/ws2_32/ +Network Store Interface +M: Huw Davies <huw(a)codeweavers.com> +F: dlls/iphlpapi/ +F: dlls/nsi/ +F: dlls/nsiproxy.sys/ + OLE Embedding M: Huw Davies <huw(a)codeweavers.com> F: dlls/ole32/clipboard.c -- 2.23.0

1 0

[PATCH 5/6] iphlpapi/tests: Run the interface conversion tests on all interfaces.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/tests/iphlpapi.c | 341 +++++++++++++++------------------ 1 file changed, 153 insertions(+), 188 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index b6e62138256..480d6ac06c5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -65,23 +65,12 @@ static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CL static DWORD (WINAPI *pCreateSortedAddressPairs)(const PSOCKADDR_IN6,ULONG,const PSOCKADDR_IN6,ULONG,ULONG, PSOCKADDR_IN6_PAIR*,ULONG*); static void (WINAPI *pFreeMibTable)(void*); -static DWORD (WINAPI *pConvertInterfaceGuidToLuid)(const GUID*,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceIndexToLuid)(NET_IFINDEX,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceLuidToGuid)(const NET_LUID*,GUID*); -static DWORD (WINAPI *pConvertInterfaceLuidToIndex)(const NET_LUID*,NET_IFINDEX*); -static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_T); -static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T); -static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); -static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK, PVOID, BOOLEAN, HANDLE *); static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); -static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); -static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); - static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -98,18 +87,8 @@ static void loadIPHlpApi(void) pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pCreateSortedAddressPairs = (void *)GetProcAddress(hLibrary, "CreateSortedAddressPairs"); pFreeMibTable = (void *)GetProcAddress(hLibrary, "FreeMibTable"); - pConvertInterfaceGuidToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceGuidToLuid"); - pConvertInterfaceIndexToLuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceIndexToLuid"); - pConvertInterfaceLuidToGuid = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToGuid"); - pConvertInterfaceLuidToIndex = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToIndex"); - pConvertInterfaceLuidToNameA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameA"); - pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); - pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); - pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); - pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); - pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange"); pCancelMibChangeNotify2 = (void *)GetProcAddress(hLibrary, "CancelMibChangeNotify2"); } @@ -1384,16 +1363,13 @@ static void test_GetAdaptersAddresses(void) aa->Ipv4Metric, aa->Ipv6Metric, wine_dbgstr_guid((GUID*) &aa->NetworkGuid), aa->ConnectionType, aa->TunnelType); - if (pConvertInterfaceLuidToGuid) - { - status = pConvertInterfaceLuidToGuid(&aa->Luid, &guid); - ok(!status, "got %u\n", status); - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); - ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); - } + status = ConvertInterfaceLuidToGuid(&aa->Luid, &guid); + ok(!status, "got %u\n", status); + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); @@ -1644,204 +1620,193 @@ static DWORD get_interface_index(void) static void test_interface_identifier_conversion(void) { - DWORD ret; + DWORD ret, i; NET_LUID luid; GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; char nameA[IF_MAX_STRING_SIZE + 1], *name; - NET_IFINDEX index, index2; + NET_IFINDEX index; + MIB_IF_TABLE2 *table; - if (!pConvertInterfaceIndexToLuid) - { - win_skip( "ConvertInterfaceIndexToLuid not available\n" ); - return; - } - if (!(index = get_interface_index())) - { - skip( "no suitable interface found\n" ); - return; - } + ret = GetIfTable2( &table ); + ok( !ret, "got %d\n", ret ); - /* ConvertInterfaceIndexToLuid */ - ret = pConvertInterfaceIndexToLuid( 0, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + for (i = 0; i < table->NumEntries; i++) + { + MIB_IF_ROW2 *row = table->Table + i; - memset( &luid, 0xff, sizeof(luid) ); - ret = pConvertInterfaceIndexToLuid( 0, &luid ); - ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); - ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceIndexToLuid( index, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - - /* ConvertInterfaceLuidToIndex */ - ret = pConvertInterfaceLuidToIndex( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + /* ConvertInterfaceIndexToLuid */ + ret = ConvertInterfaceIndexToLuid( 0, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToIndex( NULL, &index ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &luid, 0xff, sizeof(luid) ); + ret = ConvertInterfaceIndexToLuid( 0, &luid ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - ret = pConvertInterfaceLuidToIndex( &luid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceIndexToLuid( row->InterfaceIndex, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); - ret = pConvertInterfaceLuidToIndex( &luid, &index ); - ok( !ret, "got %u\n", ret ); + /* ConvertInterfaceLuidToIndex */ + ret = ConvertInterfaceLuidToIndex( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToGuid */ - ret = pConvertInterfaceLuidToGuid( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToIndex( NULL, &index ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &guid, 0xff, sizeof(guid) ); - ret = pConvertInterfaceLuidToGuid( NULL, &guid ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ok( guid.Data1 == 0xffffffff, "got %x\n", guid.Data1 ); + ret = ConvertInterfaceLuidToIndex( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToGuid( &luid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToIndex( &luid, &index ); + ok( !ret, "got %u\n", ret ); + ok( index == row->InterfaceIndex, "mismatch\n" ); - memset( &guid, 0, sizeof(guid) ); - ret = pConvertInterfaceLuidToGuid( &luid, &guid ); - ok( !ret, "got %u\n", ret ); - ok( guid.Data1, "got %x\n", guid.Data1 ); + /* ConvertInterfaceLuidToGuid */ + ret = ConvertInterfaceLuidToGuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceGuidToLuid */ - ret = pConvertInterfaceGuidToLuid( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &guid, 0xff, sizeof(guid) ); + ret = ConvertInterfaceLuidToGuid( NULL, &guid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( guid.Data1 == 0xffffffff, "got %x\n", guid.Data1 ); - luid.Info.NetLuidIndex = 1; - ret = pConvertInterfaceGuidToLuid( NULL, &luid ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ok( luid.Info.NetLuidIndex == 1, "got %u\n", luid.Info.NetLuidIndex ); + ret = ConvertInterfaceLuidToGuid( &luid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceGuidToLuid( &guid, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + memset( &guid, 0, sizeof(guid) ); + ret = ConvertInterfaceLuidToGuid( &luid, &guid ); + ok( !ret, "got %u\n", ret ); + ok( IsEqualGUID( &guid, &row->InterfaceGuid ), "mismatch\n" ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceGuidToLuid( &guid, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + /* ConvertInterfaceGuidToLuid */ + ret = ConvertInterfaceGuidToLuid( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToNameW */ - ret = pConvertInterfaceLuidToNameW( NULL, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.NetLuidIndex = 1; + ret = ConvertInterfaceGuidToLuid( NULL, &luid ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( luid.Info.NetLuidIndex == 1, "got %u\n", luid.Info.NetLuidIndex ); - ret = pConvertInterfaceLuidToNameW( &luid, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceGuidToLuid( &guid, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameW( NULL, nameW, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceGuidToLuid( &guid, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value || + broken( luid.Value != row->InterfaceLuid.Value), /* Win8 can have identical guids for two different ifaces */ + "mismatch\n" ); + if (luid.Value != row->InterfaceLuid.Value) continue; - ret = pConvertInterfaceLuidToNameW( &luid, nameW, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + /* ConvertInterfaceLuidToNameW */ + ret = ConvertInterfaceLuidToNameW( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameW[0] = 0; - len = ARRAY_SIZE(nameW); - ret = pConvertInterfaceLuidToNameW( &luid, nameW, len ); - ok( !ret, "got %u\n", ret ); - ok( nameW[0], "name not set\n" ); + ret = ConvertInterfaceLuidToNameW( &luid, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - /* ConvertInterfaceLuidToNameA */ - ret = pConvertInterfaceLuidToNameA( NULL, NULL, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameW( NULL, nameW, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameA( &luid, NULL, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameW( &luid, nameW, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - ret = pConvertInterfaceLuidToNameA( NULL, nameA, 0 ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + nameW[0] = 0; + len = ARRAY_SIZE(nameW); + ret = ConvertInterfaceLuidToNameW( &luid, nameW, len ); + ok( !ret, "got %u\n", ret ); + ok( nameW[0], "name not set\n" ); - ret = pConvertInterfaceLuidToNameA( &luid, nameA, 0 ); - ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); + /* ConvertInterfaceLuidToNameA */ + ret = ConvertInterfaceLuidToNameA( NULL, NULL, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameA[0] = 0; - len = ARRAY_SIZE(nameA); - ret = pConvertInterfaceLuidToNameA( &luid, nameA, len ); - ok( !ret, "got %u\n", ret ); - ok( nameA[0], "name not set\n" ); + ret = ConvertInterfaceLuidToNameA( &luid, NULL, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - /* ConvertInterfaceNameToLuidW */ - ret = pConvertInterfaceNameToLuidW( NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ret = ConvertInterfaceLuidToNameA( NULL, nameA, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidW( NULL, &luid ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); + ret = ConvertInterfaceLuidToNameA( &luid, nameA, 0 ); + ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret ); - ret = pConvertInterfaceNameToLuidW( nameW, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + nameA[0] = 0; + len = ARRAY_SIZE(nameA); + ret = ConvertInterfaceLuidToNameA( &luid, nameA, len ); + ok( !ret, "got %u\n", ret ); + ok( nameA[0], "name not set\n" ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidW( nameW, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - - /* ConvertInterfaceNameToLuidA */ - ret = pConvertInterfaceNameToLuidA( NULL, NULL ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidA( NULL, &luid ); - ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); - ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); - ok( luid.Info.IfType == 0xdead, "type set\n" ); - - ret = pConvertInterfaceNameToLuidA( nameA, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + /* ConvertInterfaceNameToLuidW */ + ret = ConvertInterfaceNameToLuidW( NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; - ret = pConvertInterfaceNameToLuidA( nameA, &luid ); - ok( !ret, "got %u\n", ret ); - ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); - ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidW( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - if (!pif_nametoindex || !pif_indextoname) - { - skip("if_nametoindex/if_indextoname not supported\n"); - return; - } + ret = ConvertInterfaceNameToLuidW( nameW, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidW( nameW, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); - name = pif_indextoname( 0, NULL ); - ok( name == NULL, "got %s\n", name ); + /* ConvertInterfaceNameToLuidA */ + ret = ConvertInterfaceNameToLuidA( NULL, NULL ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - name = pif_indextoname( 0, nameA ); - ok( name == NULL, "got %p\n", name ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidA( NULL, &luid ); + ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); + ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); + ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); + ok( luid.Info.IfType == 0xdead, "type set\n" ); - name = pif_indextoname( ~0u, nameA ); - ok( name == NULL, "got %p\n", name ); + ret = ConvertInterfaceNameToLuidA( nameA, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - nameA[0] = 0; - name = pif_indextoname( 1, nameA ); - if (name != NULL) - { - ok( name[0], "empty name\n" ); - ok( name == nameA, "got %p\n", name ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; + ret = ConvertInterfaceNameToLuidA( nameA, &luid ); + ok( !ret, "got %u\n", ret ); + ok( luid.Value == row->InterfaceLuid.Value, "mismatch\n" ); + + index = if_nametoindex( NULL ); + ok( !index, "Got unexpected index %u\n", index ); + index = if_nametoindex( nameA ); + ok( index == row->InterfaceIndex, "Got index %u for %s, expected %u\n", index, nameA, row->InterfaceIndex ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index = if_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index, "Got unexpected index %u\n", index ); + index = if_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index, "Got unexpected index %u for input %s\n", index, wine_dbgstr_guid( &guid ) ); + + name = if_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = if_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = if_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = if_indextoname( 1, nameA ); + if (name != NULL) + { + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); + } } + FreeMibTable( table ); } static void test_GetIfEntry2(void) -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Implement ConvertInterfaceLuidToGuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ee5718e5d26..403b51391af 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3213,20 +3213,17 @@ DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX index, NET_LUID *luid) */ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, guid); + TRACE( "(%p %p)\n", luid, guid ); if (!luid || !guid) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - memset( guid, 0, sizeof(*guid) ); - guid->Data1 = luid->Info.NetLuidIndex; - memcpy( guid->Data4+2, "NetDev", 6 ); - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, guid, sizeof(*guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + if (err) memset( guid, 0, sizeof(*guid) ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement ConvertInterfaceGuidToLuid() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d3ee86da0b..ee5718e5d26 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3164,20 +3164,31 @@ ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) */ DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID *guid, NET_LUID *luid) { - DWORD ret; - MIB_IFROW row; + struct nsi_ndis_ifinfo_static *data; + DWORD err, count, i; + NET_LUID *keys; - TRACE("(%s %p)\n", debugstr_guid(guid), luid); + TRACE( "(%s %p)\n", debugstr_guid(guid), luid ); if (!guid || !luid) return ERROR_INVALID_PARAMETER; + luid->Value = 0; - row.dwIndex = guid->Data1; - if ((ret = GetIfEntry( &row ))) return ret; + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + NULL, 0, NULL, 0, (void **)&data, sizeof(*data), &count, 0 ); + if (err) return err; - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = guid->Data1; - luid->Info.IfType = row.dwType; - return NO_ERROR; + err = ERROR_INVALID_PARAMETER; + for (i = 0; i < count; i++) + { + if (IsEqualGUID( &data[i].if_guid, guid )) + { + luid->Value = keys[i].Value; + err = ERROR_SUCCESS; + break; + } + } + NsiFreeTable( keys, NULL, NULL, data ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 2/6] iphlpapi: Implement ConvertInterfaceLuidToIndex() on top of NSI.
by Huw Davies 05 Jul '21

05 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 05f3c3b9b76..4d3ee86da0b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3223,18 +3223,17 @@ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) */ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *index) { - DWORD ret; - MIB_IFROW row; + DWORD err; - TRACE("(%p %p)\n", luid, index); + TRACE( "(%p %p)\n", luid, index ); if (!luid || !index) return ERROR_INVALID_PARAMETER; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - *index = luid->Info.NetLuidIndex; - return NO_ERROR; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid, sizeof(*luid), + NSI_PARAM_TYPE_STATIC, index, sizeof(*index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + if (err) *index = 0; + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH] nsiproxy: Include netinet/in.h before if_ether.h
by Gerald Pfeifer 05 Jul '21

05 Jul '21

Recent changes to introduce dlls/nsiproxy.sys broke the build on FreeBSD. netinet/if_ether.h uses types that explicitly require netinet/in.h to be pulled in before, unlike Linux where such includes happen implicitly. This simple fix restores the build and should not impact other platforms - we already have been using this pattern elsewhere. Huw, would it make sense for you to be listed in the MAINTAINERS file? Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ndis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..7a0e7ec6f6c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -38,6 +38,10 @@ #include <net/if_arp.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif -- 2.31.1

2 1

[PATCH 1/2] user32: Allow the backends to defer restoring minimized windows.
by Arkadiusz Hiler 04 Jul '21

04 Jul '21

When restoring a minimized window the WM_SYSCOMMAND SC_RESTORE message should arrive after WM_NCACTIVATE but before WM_ACTIVATE and WM_SETFOCUS. Some games depend on that ordering and the related window state. For example Project CARS 3 expects window to be both active and in the foreground (wrt GetActiveWindow() and GetForegroundWindow()) when receiving those messages. Without being active the window doesn't restore properly, see 82c6ec3a32f4 ("winex11.drv: Activate window when restoring from iconic state.") But if the activate messages arrive before the window is in the foreground, the game tries to re-acquire DirectInput DISCL_FOREGROUND devices too early and fails, which results in non-working keyboards and controllers. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/user32/focus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4c18238a98b..e804720c7ca 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -148,6 +148,13 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); + + if (GetPropW( hwnd, L"__WINE_RESTORE_WINDOW" )) + { + SetPropW( hwnd, L"__WINE_RESTORE_WINDOW", NULL ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + } + SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); -- 2.32.0

3 5

[PATCH] Implement CNG_RSA_PUBLIC_KEY_BLOB encoding/decoding
by Aaron Hill 04 Jul '21

04 Jul '21

Add support for the OID CNG_RSA_PUBLIC_KEY_BLOB to CryptEncodeObjectEx and CryptDecodeObjectEx. This OID decodes to / encodes from memory consisting of a BCRYPT_RSAKEY_BLOB, followed in memory by the exponent and modulus. This allows the Visual Studio 2019 web installer to progress further - it now reachs the stubbed NCryptOpenStorageProvider function. To aid in debugging similar issues, CryptEncodeObjectEx and CryptDecodeObjectEX now print a FIXME when encountering an unknown OID/struct type, instead of silently returning an error. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> --- dlls/crypt32/decode.c | 103 +++++++++++++++++++++++++++++++----- dlls/crypt32/encode.c | 50 +++++++++++++++++ dlls/crypt32/tests/encode.c | 100 ++++++++++++++++++++++++++++++++++ include/wincrypt.h | 1 + 4 files changed, 242 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a0e78d62b4d..9f1949edf15 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3870,7 +3870,31 @@ struct DECODED_RSA_PUB_KEY CRYPT_INTEGER_BLOB modulus; }; -static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, +/* Helper function to decode an ASN.1 DER encoded RSA public key, writing the decoded + * key into 'decodedKey', and the length into 'size'. The memory + * for 'decodedKey' is allocated with 'CRYPT_DECODE_ALLOC_FLAG' + */ +static BOOL CRYPT_raw_decode_rsa_pub_key(struct DECODED_RSA_PUB_KEY **decodedKey, + DWORD *size, const BYTE *pbEncoded, DWORD cbEncoded) +{ + BOOL ret; + + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, decodedKey, + size, NULL, NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { @@ -3878,20 +3902,69 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, __TRY { - struct AsnDecodeSequenceItem items[] = { - { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, modulus), - CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), - FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), - 0 }, - { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), - CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, - }; struct DECODED_RSA_PUB_KEY *decodedKey = NULL; DWORD size = 0; - ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), - pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, - &size, NULL, NULL); + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + + ret = CRYPT_raw_decode_rsa_pub_key(&decodedKey, &size, pbEncoded, cbEncoded); + if (ret) + { + /* Header, exponent, and modulus */ + DWORD bytesNeeded = sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + + decodedKey->modulus.cbData; + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BCRYPT_RSAKEY_BLOB *hdr; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->Magic = BCRYPT_RSAPUBLIC_MAGIC; + hdr->BitLength = decodedKey->modulus.cbData * 8; + hdr->cbPublicExp = sizeof(DWORD); + hdr->cbModulus = decodedKey->modulus.cbData; + hdr->cbPrime1 = 0; + hdr->cbPrime2 = 0; + memcpy((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB), + &decodedKey->pubexp, sizeof(DWORD)); + memcpy((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB) + + sizeof(DWORD), decodedKey->modulus.pbData, + decodedKey->modulus.cbData); + } + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + + +static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + + __TRY + { + struct DECODED_RSA_PUB_KEY *decodedKey = NULL; + DWORD size = 0; + ret = CRYPT_raw_decode_rsa_pub_key(&decodedKey, &size, pbEncoded, cbEncoded); if (ret) { DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + @@ -6207,7 +6280,11 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, break; case LOWORD(X509_ECC_SIGNATURE): decodeFunc = CRYPT_AsnDecodeEccSignature; + case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): + decodeFunc = CRYPT_AsnDecodeRsaPubKey_Bcrypt; break; + default: + FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6264,6 +6341,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCTL; else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) decodeFunc = CRYPT_AsnDecodeObjectIdentifier; + else + FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); return decodeFunc; } diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 02b235696ce..6d9d5737a80 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3130,6 +3130,49 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyConstraints( return ret; } +static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const BCRYPT_RSAKEY_BLOB *hdr = pvStructInfo; + + if (hdr->Magic != BCRYPT_RSAPUBLIC_MAGIC) + { + SetLastError(E_INVALIDARG); + ret = FALSE; + } else if (hdr->cbPublicExp != sizeof(DWORD)) { + ERR("Unexpected public exponent size %d\n", hdr->cbPublicExp); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + DWORD *pubexp = (DWORD*) ((BYTE*)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB)); + CRYPT_INTEGER_BLOB modulus = { hdr->cbModulus, (BYTE*)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) }; + struct AsnEncodeSequenceItem items[] = { + { &modulus, CRYPT_AsnEncodeUnsignedInteger, 0 }, + { pubexp, CRYPT_AsnEncodeInt, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; + +} + + static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -4563,6 +4606,11 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(CMS_SIGNER_INFO): encodeFunc = CRYPT_AsnEncodeCMSSignerInfo; break; + case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): + encodeFunc = CRYPT_AsnEncodeRsaPubKey_Bcrypt; + break; + default: + FIXME("Unimplemented encoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -4617,6 +4665,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) encodeFunc = CRYPT_AsnEncodeCTL; + else + FIXME("Unsupported encodoer for lpszStructType %s\n", lpszStructType); return encodeFunc; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9597f1dfec1..80e13f48867 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2572,6 +2572,104 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) } } +static void test_encodeRsaPublicKey_Bcrypt(DWORD dwEncoding) +{ + BYTE toEncode[sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + sizeof(modulus1)]; + BCRYPT_RSAKEY_BLOB *hdr = (BCRYPT_RSAKEY_BLOB *)toEncode; + BOOL ret; + BYTE *buf = NULL; + DWORD bufSize = 0, i; + DWORD pubexp = 65537; + + /* Try with a bogus magic value */ + hdr->Magic = 1; + hdr->BitLength = sizeof(modulus1) * 8; + hdr->cbPublicExp = sizeof(DWORD); + hdr->cbModulus = sizeof(modulus1); + hdr->cbPrime1 = 0; + hdr->cbPrime2 = 0; + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB), &pubexp, sizeof(DWORD)); + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), modulus1, sizeof(modulus1)); + + ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Finally, all valid */ + hdr->Magic = BCRYPT_RSAPUBLIC_MAGIC; + for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) + { + hdr->BitLength = rsaPubKeys[i].modulusLen * 8; + hdr->cbModulus = rsaPubKeys[i].modulusLen; + memcpy(toEncode + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), + rsaPubKeys[i].modulus, rsaPubKeys[i].modulusLen); + ret = pCryptEncodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + toEncode, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(bufSize == rsaPubKeys[i].encoded[1] + 2, + "Expected size %d, got %d\n", rsaPubKeys[i].encoded[1] + 2, + bufSize); + ok(!memcmp(buf, rsaPubKeys[i].encoded, bufSize), + "Unexpected value\n"); + LocalFree(buf); + } + } +} + +static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) +{ + DWORD i; + LPBYTE buf = NULL; + DWORD bufSize = 0; + BOOL ret; + + /* Try with a bad length */ + ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1], + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_MORE_INPUT /* Win9x/NT4 */), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", + GetLastError()); + /* Now try success cases */ + for (i = 0; i < ARRAY_SIZE(rsaPubKeys); i++) + { + bufSize = 0; + ret = pCryptDecodeObjectEx(dwEncoding, CNG_RSA_PUBLIC_KEY_BLOB, + rsaPubKeys[i].encoded, rsaPubKeys[i].encoded[1] + 2, + CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + BCRYPT_RSAKEY_BLOB *hdr = (BCRYPT_RSAKEY_BLOB *)buf; + DWORD *pubexp = (DWORD*)(buf + sizeof(BCRYPT_RSAKEY_BLOB)); + + ok(bufSize >= sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + + rsaPubKeys[i].decodedModulusLen, + "Wrong size %d\n", bufSize); + ok(hdr->Magic == BCRYPT_RSAPUBLIC_MAGIC, + "Expected magic BCRYPT_RSAPUBLIC_MAGIC (%d), got %d\n", BCRYPT_RSAPUBLIC_MAGIC, + hdr->Magic); + ok(hdr->BitLength == rsaPubKeys[i].decodedModulusLen * 8, + "Wrong bit len %d\n", hdr->BitLength); + ok(hdr->cbPublicExp == sizeof(DWORD), "Expected cbPublicExp %d, got %d\n", + sizeof(DWORD), hdr->cbPublicExp); + ok(hdr->cbModulus == rsaPubKeys[i].decodedModulusLen, + "Wrong modulus len %d\n", hdr->cbModulus); + ok(hdr->cbPrime1 == 0,"Wrong cbPrime1 %d\n", hdr->cbPrime1); + ok(hdr->cbPrime2 == 0,"Wrong cbPrime2 %d\n", hdr->cbPrime2); + ok(*pubexp== 65537, "Expected pubexp 65537, got %d\n", + *pubexp); + ok(!memcmp(buf + sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD), + rsaPubKeys[i].modulus, rsaPubKeys[i].decodedModulusLen), + "Unexpected modulus\n"); + LocalFree(buf); + } + } +} + static const BYTE intSequence[] = { 0x30, 0x1b, 0x02, 0x01, 0x01, 0x02, 0x01, 0x7f, 0x02, 0x02, 0x00, 0x80, 0x02, 0x02, 0x01, 0x00, 0x02, 0x01, 0x80, 0x02, 0x02, 0xff, 0x7f, 0x02, 0x04, 0xba, 0xdd, 0xf0, 0x0d }; @@ -8547,6 +8645,8 @@ START_TEST(encode) test_decodeBasicConstraints(encodings[i]); test_encodeRsaPublicKey(encodings[i]); test_decodeRsaPublicKey(encodings[i]); + test_encodeRsaPublicKey_Bcrypt(encodings[i]); + test_decodeRsaPublicKey_Bcrypt(encodings[i]); test_encodeSequenceOfAny(encodings[i]); test_decodeSequenceOfAny(encodings[i]); test_encodeExtensions(encodings[i]); diff --git a/include/wincrypt.h b/include/wincrypt.h index 28bebf8dc4b..456f2f14446 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3179,6 +3179,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) #define CMS_SIGNER_INFO ((LPCSTR)501) -- 2.32.0

2 1

[PATCH] user32/tests: Fix the wording of an ok() message.
by Francois Gouget 04 Jul '21

04 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 469c193c1a3..d237e22f1fc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5272,7 +5272,7 @@ static void test_WM_DEVICECHANGE(HWND hwnd) ret = PostMessageA(hwnd, WM_DEVICECHANGE, wparams[i], 0); if (wparams[i] & 0x8000) { - ok(ret == FALSE, "PostMessage should returned %d\n", ret); + ok(ret == FALSE, "PostMessage returned %d\n", ret); ok(GetLastError() == ERROR_MESSAGE_SYNC_ONLY, "PostMessage error %08x\n", GetLastError()); } else -- 2.20.1

2 1

[PATCH 1/3] shell32/test: Fix an ok() message.
by Francois Gouget 04 Jul '21

04 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ea6f92ce827..96bfd1d94ef 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3010,7 +3010,7 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } CloseHandle(file); -- 2.20.1

1 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel