June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Nikolay Sivov (＠nsivov)

On Fri Jun 24 12:47:38 2022 +0000, Hugh McMaster wrote: > I think we all prefer `WCHAR *` for new code. You can also just use > `QWORD` for `UINT64`, although the latter is probably more readable at a glance. QWORD is not universally available afaict, it's used for some multimedia API, and some other headers redefine it as well. I pushed update addressing your comments, thank you. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306#note_2653

June 24, 2022

[PATCH v2 1/1] reg: Add REG_QWORD support to 'add'.

by Nikolay Sivov

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/reg/add.c | 16 +++++++ programs/reg/reg.c | 1 + programs/reg/reg.h | 2 +- programs/reg/reg.rc | 2 +- programs/reg/tests/add.c | 95 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 2 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 269fa30e5e1..e0cd0373339 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -84,6 +84,22 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, *(DWORD *)*data_bytes = val; break; } + case REG_QWORD: + { + WCHAR *rest; + UINT64 val; + + val = _wcstoui64(data, &rest, (towlower(data[1]) == 'x') ? 16 : 10); + if (*rest || (val == ~0ull && errno == ERANGE)) + { + output_message(STRING_MISSING_NUMBER); + return FALSE; + } + *size_bytes = sizeof(val); + *data_bytes = malloc(*size_bytes); + *(UINT64 *)*data_bytes = val; + break; + } case REG_BINARY: { BYTE hex0, hex1, *ptr; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4fd374579e9..5753b99bdf4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -46,6 +46,7 @@ const struct reg_type_rels type_rels[] = {REG_DWORD, L"REG_DWORD"}, {REG_DWORD_LITTLE_ENDIAN, L"REG_DWORD_LITTLE_ENDIAN"}, {REG_DWORD_BIG_ENDIAN, L"REG_DWORD_BIG_ENDIAN"}, + {REG_QWORD, L"REG_QWORD"}, {REG_MULTI_SZ, L"REG_MULTI_SZ"}, }; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 67b49b7797f..4ac54dcecaf 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -31,7 +31,7 @@ struct reg_type_rels { const WCHAR *name; }; -extern const struct reg_type_rels type_rels[8]; +extern const struct reg_type_rels type_rels[9]; void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index a3c53cf41b4..45acb993add 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -55,7 +55,7 @@ STRINGTABLE \ The type of data to add to the registry. If [/t] is specified,\n\ \ <type> must be one of the following:\n\n\ \ REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n\ -\ REG_DWORD | REG_BINARY | REG_NONE\n\n\ +\ REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n\n\ \ If [/t] is not specified, the default data type is REG_SZ.\n\n\ \ /s <separator>\n\ \ The character used to separate strings in REG_MULTI_SZ data.\n\ diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 0d213414443..ae9c79b07ec 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -764,6 +764,100 @@ static void test_reg_dword_big_endian(void) delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void test_reg_qword(void) +{ + UINT64 qword; + HKEY hkey; + DWORD r; + + add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /f /d 0x123456789abcdef", &r); + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); + qword = 0x123456789abcdef; + verify_reg(hkey, "", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_QWORD /f", &r); + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); + qword = 0; + verify_reg(hkey, "", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword0 /t REG_QWORD /f /d", &r); + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword1 /t REG_QWORD /f", &r); + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); + qword = 0; + verify_reg(hkey, "qword1", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword2 /t REG_QWORD /d zzz /f", &r); + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword3 /t REG_QWORD /d deadbeef /f", &r); + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword4 /t REG_QWORD /d 123xyz /f", &r); + ok(r == REG_EXIT_FAILURE, "Unexpected exit code %lu.\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword5 /t reg_qword /d 12345678 /f", &r); + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); + qword = 12345678; + verify_reg(hkey, "qword5", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword6 /t REG_QWORD /D 0123 /f", &r); + ok(r == REG_EXIT_SUCCESS, "Unexpected exit code %ld.\n", r); + qword = 123; + verify_reg(hkey, "qword6", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword7 /t reg_qword /d 0xabcdefg /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %ld, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword8 /t REG_qword /d 0xdeadbeef /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = 0xdeadbeef; + verify_reg(hkey, "qword8", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /v qword9 /f /d -1", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = ~0ull; + verify_reg(hkey, "qword9", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_QWORD /v qword10 /f /d -0x1", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %lu, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword11 /t REG_qword /d 0x01ffffffffffffffff /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %ld, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword12 /t REG_QWORD /d 0xffffffffffffffff /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = ~0ull; + verify_reg(hkey, "qword12", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword13 /t REG_QWORD /d 00x123 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %ld, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword14 /t REG_QWORD /d 0X123 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = 0x123; + verify_reg(hkey, "qword14", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword15 /t REG_QWORD /d 18446744073709551616 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %lu, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword16 /t REG_QWORD /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = 456; + verify_reg(hkey, "qword16", REG_QWORD, &qword, sizeof(qword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v qword17 /t REG_QWORD /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %ld, expected 0\n", r); + qword = 0x456; + verify_reg(hkey, "qword17", REG_QWORD, &qword, sizeof(qword), 0); + + close_key(hkey); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); +} + static void test_reg_multi_sz(void) { HKEY hkey; @@ -988,6 +1082,7 @@ START_TEST(add) test_reg_binary(); test_reg_dword(); test_reg_dword_big_endian(); + test_reg_qword(); test_reg_multi_sz(); /* Check if reg.exe is running with elevated privileges */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/306

June 24, 2022

[PATCH v2 0/1] MR306: reg: Add REG_QWORD support to 'add'.

by Nikolay Sivov (＠nsivov)

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v2: reg: Add REG_QWORD support to 'add'. https://gitlab.winehq.org/wine/wine/-/merge_requests/306

June 24, 2022

Re: [PATCH v3] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString

by Francois Gouget

On Fri, 24 Jun 2022, Kacper rączy wrote: > This doesn’t seem right, my changes didn’t touch anything file or > threadpool related. This patch introduced completely new API. Only the errors listed in this email are attributed to your patch. So you can ignore the file failures. [...] > > === w1064v1507 (32 bit report) === > > > > ntdll: > > threadpool.c:273: Test failed: expected info.userdata = 0x10000, got 0 > > threadpool.c:278: Test failed: RtlDeregisterWait failed with status 103 I have no record of these two failures ever happening in the WineTest runs but it makes sense that they are related to bug 53130. Also I managed to reproduce them with and without your patch so it's as if they are more likely to happen outside of WineTest (maybe exclusively on Windows 10 1507?): https://testbot.winehq.org/JobDetails.pl?Key=117566#k201 https://testbot.winehq.org/JobDetails.pl?Key=117569#k201 Anyway you're in the clear. And I added them to the list of known failures since they are so rare and thus likely to cause false positives. > > === w10pro64 (testbot log) === > > > > WineRunTask.pl:error: The previous 1 run(s) terminated abnormally The full log is actually: | TestBot process got stuck or died unexpectedly | WineRunTask.pl:error: The previous 1 run(s) terminated abnormally The first line indicates that the server-side process running the task got stuck. So that's not caused by your patch. Maybe this should be handled differently (downgraded to a warning?) but there is stuff that I need to figure out first: * Did the server-side process get stuck or did it die? Or neither? A better trace would be nice. * It may instead be an inconsistency between the Task status and the VM status. That may suggest there is a race condition somewhere. * This task has no start timestamp which is wrong (it has happened before but is rare). Again this may indicate a race condition of some sort. -- Francois Gouget <fgouget(a)codeweavers.com>

June 24, 2022

Re: [PATCH 0/3] MR311: win32u: menu conversion - approved

by Huw Davies (＠huw)

This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/311

June 24, 2022

Re: [PATCH 0/1] MR304: mshtml: Enable CSS grid layout. - approved

by Jacek Caban (＠jacek)

This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/304

June 24, 2022

[PATCH] maintainers: Remove myself as maintainer.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- I'm moving on to another job opportunity. I'm happy to discuss the audio modules. MAINTAINERS | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c60a383b3b9..c5f560b2617 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -36,7 +36,7 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/dsound/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ @@ -104,7 +104,6 @@ F: dlls/dpwsockx/ DirectShow M: Zebediah Figura <z.figura12(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ F: dlls/mciqtz32/ @@ -188,7 +187,6 @@ F: dlls/jscript/ Joystick input M: Rémi Bernon <rbernon(a)codeweavers.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/ @@ -196,7 +194,7 @@ F: dlls/winexinput.sys/ F: dlls/xinput*/ Media format conversion -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/*.acm/ F: dlls/msacm32/ @@ -252,7 +250,6 @@ F: dlls/ole32/storage32.h F: dlls/ole32/tests/storage32.c OLE Typelibs -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -388,7 +385,6 @@ F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> P: Esme Povirk <esme(a)codeweavers.com> -- 2.36.1

June 24, 2022

Re: [PATCH v2 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.

by Huw Davies (＠huw)

Huw Davies (@huw) commented about dlls/nsiproxy.sys/ip.c: > + unsigned int i, j; > > TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, > dynamic_data, dynamic_size, static_data, static_size, count ); > > + iface_count = 0; > + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, > + NULL, 0, NULL, 0, &iface_count ))) > + return status; > + > + if (!(iface_static = malloc( iface_count * sizeof(*iface_static) ))) > + return STATUS_NO_MEMORY; > + > + if ((status = nsi_enumerate_all( 1, 0, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, NULL, 0, > + NULL, 0, iface_static, sizeof(*iface_static), &iface_count )) > + && status != STATUS_BUFFER_OVERFLOW) The keys for this table are the interfaces' `NET_LUID`s, so if you retrieved those too, you wouldn't need to do the index->luid conversion later on. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296#note_2647

June 24, 2022

Re: [PATCH 3/3] user32: Use NtUserThunkedMenuItemInfo for GetSubMenu implementation.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117584 Your paranoid android. === debian11 (64 bit WoW report) === user32: win.c:10982: Test failed: Expected foreground window 00000000001A0124, got 0000000001430052 win.c:10985: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. win.c:10992: Test failed: Expected foreground window 00000000001A0124, got 0000000000000000

June 24, 2022

Re: [PATCH v2 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().

by Jacek Caban (＠jacek)

Jacek Caban (@jacek) commented about dlls/win32u/sysparams.c: > > + is_cloned = FALSE; > + LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) > + { > + if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) > + { > + is_cloned = TRUE; > + break; > + } > + } > + > + if (is_cloned) > + { > + free( monitor ); > + continue; > + } We will eventually want to move QueryDisplayConfig to win32u as well and it will need to be aware of mirrored monitors, so I think it's better to have them in the list. Note that most places should already handle that fine. I think it would be better to have a flag in monitor struct and skip mirrored monitors during monitor enumeration when appropriate. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/303#note_2645

June 24, 2022