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

[PATCH 3/5] user32: Modify SCROLL_MovingThumb outside of SCROLL_DrawMovingThumb().
by Zhiyi Zhang July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

>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 July 5, 2021

July 5, 2021

>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 July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

--- 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 July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

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 July 5, 2021

July 5, 2021

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