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

[PATCH] atl: Implement AtlAxDialogBox().

by Zebediah Figura

From: Qian Hong <qhong(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/atl/atl_ax.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 69d42f55813..fe70d0a3229 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1404,22 +1404,52 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk) * AtlAxDialogBoxW [atl100.35] * */ -INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE instance, const WCHAR *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + HRSRC resource; + HGLOBAL global; + DLGTEMPLATE *template; + INT_PTR ret; + + TRACE("instance %p, name %s, owner %p, proc %p, param %#Ix\n", + instance, debugstr_w(name), owner, proc, param); + + if (!(resource = FindResourceW(instance, name, (const WCHAR *)RT_DIALOG))) + return 0; + + if (!(global = LoadResource(instance, resource))) + return 0; + + if (!(template = AX_ConvertDialogTemplate(LockResource(global)))) + return 0; + + ret = DialogBoxIndirectParamW(instance, template, owner, proc, param); + HeapFree(GetProcessHeap(), 0, template); + return ret; } /*********************************************************************** * AtlAxDialogBoxA [atl100.36] * */ -INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc, - LPARAM dwInitParam) +INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE instance, const char *name, + HWND owner, DLGPROC proc, LPARAM param) { - FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); - return 0; + WCHAR *nameW; + int len; + INT_PTR ret; + + if (IS_INTRESOURCE(name)) + return AtlAxDialogBoxW(instance, (const WCHAR *)name, owner, proc, param); + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = malloc(len * sizeof(WCHAR)))) + return 0; + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = AtlAxDialogBoxW(instance, nameW, owner, proc, param); + free(nameW); + return ret; } /*********************************************************************** -- 2.30.2

May 2, 2021

Re: [PATCH v2] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=89723 Your paranoid android. === debiant2 (32 bit report) === Report validation errors: ntoskrnl.exe:ntoskrnl prints too much data (34720 bytes)

May 2, 2021

Re: [PATCH] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=89722 Your paranoid android. === debiant2 (32 bit report) === ntdll: om.c:2307: Test failed: got 86

May 1, 2021

[PATCH v2] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().

by Zebediah Figura

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Fix the definition of PHCM_DISGUISE_FULL_PLACEHOLDERS. dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c9cd6fb59fd..2534d2503de 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -900,6 +900,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4272004a298..43ef617880e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1215,6 +1215,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() ntdll.RtlQueryProcessPlaceholderCompatibilityMode @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9928911f451..22657c01315 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)3) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif -- 2.30.2

May 1, 2021

[PATCH] ntdll: Stub RtlQueryProcessPlaceholderCompatibilityMode().

by Zebediah Figura

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50026 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntifs.h | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c9cd6fb59fd..2534d2503de 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -900,6 +900,7 @@ @ stdcall RtlQueryProcessDebugInformation(long long ptr) @ stub RtlQueryProcessHeapInformation @ stub RtlQueryProcessLockInformation +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..d7740a7a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -37,6 +37,7 @@ #include "ntdll_misc.h" #include "in6addr.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(debugstr); @@ -2165,3 +2166,12 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged); return STATUS_NOT_FOUND; } + +/********************************************************************* + * RtlQueryProcessPlaceholderCompatibilityMode [NTDLL.@] + */ +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) +{ + FIXME("stub\n"); + return PHCM_APPLICATION_DEFAULT; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4272004a298..43ef617880e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1215,6 +1215,7 @@ @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) +@ stdcall RtlQueryProcessPlaceholderCompatibilityMode() ntdll.RtlQueryProcessPlaceholderCompatibilityMode @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9928911f451..53d8ea7eed8 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -21,6 +21,15 @@ #include "ntddk.h" +#define PHCM_ERROR_INVALID_PARAMETER ((char)-1) +#define PHCM_ERROR_NO_TEB ((char)-2) +#define PHCM_ERROR_NO_PEB ((char)-3) +#define PHCM_APPLICATION_DEFAULT ((char)0) +#define PHCM_DISGUISE_PLACEHOLDERS ((char)1) +#define PHCM_EXPOSE_PLACEHOLDERS ((char)2) +#define PHCM_DISGUISE_FULL_PLACEHOLDERS ((char)2) +#define PHCM_MAX ((char)3) + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; typedef enum _FS_FILTER_SECTION_SYNC_TYPE @@ -140,5 +149,6 @@ BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); +char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void); #endif -- 2.30.2

May 1, 2021

Re: [PATCH v2 1/2] ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.

by Zebediah Figura (she/her)

On 5/1/21 5:05 PM, Zebediah Figura (she/her) wrote: > On 4/29/21 3:37 AM, Francois Gouget wrote: >> Hi, >> >> On Sun, 28 Mar 2021, Marvin wrote: >> [...] >>> === debiant2 (64 bit WoW report) === >>> >>> Report validation errors: >>> ntdll:exception has no test summary line (early exit of the main process?) >>> ntdll:exception has unaccounted for todo messages >> >> As noticed by the TestBot this patch did introduce a new test failure: >> >> https://test.winehq.org/data/patterns-tb-wine.html#ntdll:exception >> >> >> It only impacts the wow64 builds. That the test does not print a summary >> line means it must be crashing hard somewhere (or that stdout gets >> summarily closed somehow?). >> >> Could you have a look? >> > > Sorry for missing this the first time; I think WoW64 was broken at about > this time and I misread this as being part of that. > > Anyway, I can't reproduce this locally, but the tests I was able to run > on the testbot suggest that segv_handler() isn't even called. My guess > is that it's a qemu/virtualization bug. > Further information: if I don't clear fs or gs, the test works as expected, but if I clear either one, it breaks. I can't reproduce this locally with a Debian 10 VM, with Linux 4.19.

May 1, 2021

Re: WineTest failure patterns preview

by Zebediah Figura (she/her)

On 4/23/21 7:54 AM, Francois Gouget wrote: > > I did not get to send this patch set yet so here's a preview: > > * Windows test patterns > http://fgouget.free.fr/tmp/winepatterns/patterns-tb-win.html > > * Wine test patterns > http://fgouget.free.fr/tmp/winepatterns/patterns-tb-wine.html > > So for each test unit that had failures you have: > * one line per test configuration (report tag) > * one row per WineTest build (daily commit) > > Each cell has a one character description of the test result (with more > details in the tooltip) and is color coded to help identify patterns. > Each 'failure' cell also links to the corresponding report page. > > > The main goal of these pages for me is to simplify detecting new > failures in the WineTest results... and not just in cases where there > was no failure before since there are so many cases with preexisting > failures already. In the patterns an increase in the number of failures > shows up as a color change which makes them easy to spot. > > A secondary goal is to allow comparing the before/after results when a > test configuration (VM or otherwise) is modified. > > A side effect is that these can also help identify the different failure > modes. For instance comctl32:monthcal fails on wednesdays, except in > Korean where it's all the time: > http://fgouget.free.fr/tmp/winepatterns/patterns-tb-win.html#comctl32:month… > > > To help with these tasks the page also sorts the test units to show > those that look like they have new failures first. So starting the > review from the top is most likely to point to the new issues. > > Looks like a more sophisticated version of <https://www.winehq.org/~jwhite/2deb8c2825af.html>, which is definitely a nice resource when I'm trying to put effort into fixing test failures. I guess the tests are color-coded by number of failures, modulo some constant? I like the idea. I will note though that some of those colours seem hard to tell apart, e.g. the shades of green in wine d3d9:device. Also I guess they aren't consistent across tests for some reason?

May 1, 2021

Re: [PATCH] ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=89720 Your paranoid android. === w864 (64 bit report) === ntoskrnl.exe: 09cc:ntoskrnl: unhandled exception c0000005 at 00007FF9FBF63DAA

May 1, 2021

Re: [PATCH v2 4/4] ntoskrnl/tests: Add some tests for HID devices.

by Zebediah Figura (she/her)

Thanks for the heads-up; I've submitted a patch which seems to fix this. On 4/29/21 3:17 AM, Francois Gouget wrote: > Hi, > > This patch introduced a new test failure on w1064-tsign (It was not a > base VM which is why the TestBot did not pick it up. I promoted it.) > > https://test.winehq.org/data/patterns-tb-win.html#ntoskrnl.exe:ntoskrnl > > ntoskrnl.c:1541: Test failed: got error 32 > > >> +static void test_hid_device(void) >> +{ > [...] >> + SetupDiDestroyDeviceInfoList(set); >> + >> + todo_wine ok(found, "didn't find device\n"); >> + >> + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); >> + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); > >

May 1, 2021

[PATCH] ntoskrnl/tests: Open the HID device with FILE_SHARE_READ | FILE_SHARE_WRITE.

by Zebediah Figura

Fixes a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 68dbbc60806..59d9dcfb3bf 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1726,7 +1726,8 @@ static void test_hid_device(void) todo_wine ok(found, "didn't find device\n"); - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); CloseHandle(file); -- 2.30.2

May 1, 2021