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

Francois Gouget : testbot/TestLauncher: Report missing side-by-side dll version errors.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: a3247a05667b03596f7dac4a57b61c82f6316f22 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a3247a05667b03596f7dac4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:55 2021 +0200 testbot/TestLauncher: Report missing side-by-side dll version errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 9f4cdf9..5f05aeb 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -241,6 +241,14 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + Skips++; + printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", + (*Subtest ? Subtest : "testlauncher")); + *Pid = 0; + return 0; + } Error("CreateProcess failed (error %lu)\n", GetLastError()); ExitProcess(1); }

1 0

Francois Gouget : testbot/TestLauncher: Detect missing manifest critical dialogs.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: a08aff7236da1aeaa5b358ca970c1b30a7e29367 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a08aff7236da1aeaa5b358c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:53 2021 +0200 testbot/TestLauncher: Detect missing manifest critical dialogs. These happen for side-by-side dlls when the test executable has no manifest and should be reported as a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 022f25c..9f4cdf9 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -139,6 +139,7 @@ static BOOL running_on_visible_desktop (void) */ const char *Subtest; +static unsigned Failures = 0; static unsigned Skips = 0; BOOL CALLBACK DumpCriticalErrorDescription(HWND hWnd, LPARAM lParam) @@ -164,6 +165,7 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) const char* TestFileName = (char*)lParam; int Count, TestFileLen; char Buffer[512]; + BOOL IsSkip = TRUE; const char* Reason; /* The window pid does not match the CreateProcess() one so it cannot be @@ -183,22 +185,31 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) Reason = NULL; if (strcmp(Buffer + TestFileLen, " - System Error") == 0) Reason = "missing dll"; + else if (strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) + { + /* Sadly Windows >= 7 reports this as "System Error" */ + Reason = "missing manifest for side-by-side dll"; + IsSkip = FALSE; + } else if (strcmp(Buffer + TestFileLen, " - Entry Point Not Found") == 0) Reason = "missing entry point"; else if (strcmp(Buffer + TestFileLen, " - Ordinal Not Found") == 0) Reason = "missing ordinal"; else if (strncmp(Buffer + TestFileLen, " - ", 3) == 0) - /* Old Windows version used to translate the dialog */ + /* Old Windows versions used to translate the dialog so treat any + * unrecognized critical error as a skip. + */ Reason = "unrecognized critical error"; if (Reason) { - Skips++; + IsSkip ? Skips++ : Failures++; /* An empty test unit name is allowed on the start, summary and done * lines, but not on individual failure / skip lines. */ - printf("%s.c:0: Tests skipped: %s (details below)\n", - (*Subtest ? Subtest : "testlauncher"), Reason); + printf("%s.c:0: %s: %s (details below)\n", + (*Subtest ? Subtest : "testlauncher"), + (IsSkip ? "Tests skipped" : "Test failed"), Reason); printf("| %s\n", Buffer); EnumChildWindows(TopWnd, DumpCriticalErrorDescription, (LPARAM)TopWnd); /* Leave the dialog open so it appears on screenshots */ @@ -249,9 +260,9 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi /* ...instead detect the critical error dialog that pops up */ EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); - if (Skips) + if (Skips || Failures) { - ExitCode = WAIT_OBJECT_0; + ExitCode = Failures ? Failures : WAIT_OBJECT_0; break; } @@ -280,7 +291,8 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi if (!TerminateProcess(ProcessInformation.hProcess, 257)) Error("TerminateProcess failed (error %lu)\n", GetLastError()); } - else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) + else if (!Skips && !Failures && + !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { Error("Could not get the child exit code (error %lu)\n", GetLastError()); ExitCode = 259; @@ -419,8 +431,8 @@ int main(int argc, char *argv[]) fflush(stdout); ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); - if (Skips) - printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", Pid, Subtest, Skips); + if (Failures || Skips) + printf("%04lx:%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Pid, Subtest, Failures, Failures, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, Pid, ExitCode, (GetTickCount() - Start) / 1000);

1 0

Francois Gouget : testbot/WineTest: Always return the mission base name in SetupTest().
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: 9713b3645eeccce1701231fe092e5bdc2fbee9a7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9713b3645eeccce1701231f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 12:36:41 2021 +0200 testbot/WineTest: Always return the mission base name in SetupTest(). WineTest runs the tests even if the wineprefix creation failed so developers have as much information as possible. So it needs to know the mission base name either way. The tests will be considered to be failed anyway since the wineprefix creation failure could be caused by the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 498b8af..3e13637 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -71,7 +71,6 @@ sub SetupTest($$) if (defined $ErrMessage) { LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; } }

1 0

Francois Gouget : testbot/reporttest: Add tests for the 'dll versions' block.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: ad7db22ca097738324201b2631de57a2aa18130e URL: https://source.winehq.org/git/tools.git/?a=commit;h=ad7db22ca097738324201b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:13:55 2021 +0200 testbot/reporttest: Add tests for the 'dll versions' block. Exercise handling of the messages dealing with missing dlls, dll loading errors, and dll version detection errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 20 ++++++++++---------- testbot/src/reporttest/report.testwtbs | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9624c90..f1dbfd6 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -198,16 +198,16 @@ Dll info: wldap32=5.1.2600.5512 wmiutils=5.1.2600.5512 wmp=11.0.5721.5280 - wpc=dll is missing - ws2_32=5.1.2600.5512 - wscript.exe=5.7.0.18066 - wshom.ocx=5.7.0.18066 - wsnmp32=5.1.2600.5512 - wtsapi32=5.1.2600.5512 - xaudio2_7=dll is missing - xcopy.exe=5.1.2600.5512 - xinput1_3=dll is missing - xmllite=1.0.1018.0 + wpc=dll is native + ws2_32=dll is a stub + wscript.exe=dll is missing + wshom.ocx=dll is missing an ordinal (1.0) + wsnmp32=dll is missing an entrypoint (version not found) + wtsapi32=dll is missing the requested side-by-side version + xaudio2_7=load error 5 + xcopy.exe=version not found + xinput1_3=version error 5 + xmllite=version not present 2 Test output: stub advapi32:cred ----- WTBS Simple test patch diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 104c8ea..7b56e13 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,12 +13,16 @@ with: ----- TestWTBS ----- -p tests.TestFailures 68 +p tests.TestFailures 70 p build.HasTask 0 a wine.log.GrepV ^Applying patch a wine.log.GrepV ^Rebuilding the +g 0 tests.report. +n 0 wpc=dll is native +n 0 xaudio2_7=load error 5 + g 0 tests.report.advapi32 n 0 crypt.c:1: Test failed: Something wrong n 0 crypt_lmhash.c:10: Test failed: Something wrong

1 0

Francois Gouget : testbot/TestLauncher: Add a RunTest() function.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: 6e92cb8730243ed55a27bf595d36cb631d6c45cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e92cb8730243ed55a27bf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:47 2021 +0200 testbot/TestLauncher: Add a RunTest() function. This moves running and waiting for the test executable out of main(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 162 +++++++++++++++++--------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index b024714..022f25c 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -208,6 +208,86 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) return TRUE; } +DWORD Start; + +DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pid) +{ + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD ExitCode, WaitTimeOut; + + StartupInfo.cb = sizeof(STARTUPINFOA); + GetStartupInfoA(&StartupInfo); + StartupInfo.dwFlags |= STARTF_USESTDHANDLES; + StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + /* Unlike WineTest we do not have the luxury of first running the test with + * a --list argument. This means we cannot use SetErrorMode() to check + * whether there are missing dependencies as it could modify the test + * results... + */ + if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) + { + Error("CreateProcess failed (error %lu)\n", GetLastError()); + ExitProcess(1); + } + CloseHandle(ProcessInformation.hThread); + *Pid = ProcessInformation.dwProcessId; + + WaitTimeOut = 100; + ExitCode = WAIT_TIMEOUT; + while (ExitCode == WAIT_TIMEOUT) + { + DWORD Elapsed, Remaining; + + ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); + Elapsed = GetTickCount() - Start; + if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) + break; + + /* ...instead detect the critical error dialog that pops up */ + EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); + if (Skips) + { + ExitCode = WAIT_OBJECT_0; + break; + } + + Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; + WaitTimeOut = (Elapsed > 3000) ? Remaining : + (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : + Remaining; + } + + if (ExitCode != WAIT_OBJECT_0) + { + switch (ExitCode) + { + case WAIT_FAILED: + Error("Wait for child failed (error %lu)\n", GetLastError()); + break; + + case WAIT_TIMEOUT: + /* The 'exit code' on the done line identifies timeouts */ + break; + + default: + Error("Unexpected return value %lu from wait for child\n", ExitCode); + break; + } + if (!TerminateProcess(ProcessInformation.hProcess, 257)) + Error("TerminateProcess failed (error %lu)\n", GetLastError()); + } + else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) + { + Error("Could not get the child exit code (error %lu)\n", GetLastError()); + ExitCode = 259; + } + CloseHandle(ProcessInformation.hProcess); + return ExitCode; +} /* * Command line parsing and test running. @@ -216,7 +296,7 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) int main(int argc, char *argv[]) { int Arg; - DWORD Start, TimeOut, WaitTimeOut; + DWORD TimeOut; BOOL UsageError; char TestExeFullName[MAX_PATH]; char *TestExeFileName; @@ -225,9 +305,7 @@ int main(int argc, char *argv[]) int TestArg; char *CommandLine, *p; int CommandLen; - STARTUPINFOA StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD ExitCode; + DWORD Pid, ExitCode; Name0 = p = argv[0]; while (*p != '\0') @@ -340,82 +418,12 @@ int main(int argc, char *argv[]) printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); - StartupInfo.cb = sizeof(STARTUPINFOA); - GetStartupInfoA(&StartupInfo); - StartupInfo.dwFlags |= STARTF_USESTDHANDLES; - StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); - StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); - StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); - - /* Unlike WineTest we do not have the luxury of first running the test with - * a --list argument. This means we cannot use SetErrorMode() to check - * whether there are missing dependencies as it could modify the test - * results... - */ - if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) - { - Error("CreateProcess failed (error %lu)\n", GetLastError()); - return 1; - } - CloseHandle(ProcessInformation.hThread); - - WaitTimeOut = 100; - ExitCode = WAIT_TIMEOUT; - while (ExitCode == WAIT_TIMEOUT) - { - DWORD Elapsed, Remaining; - - ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); - Elapsed = GetTickCount() - Start; - if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) - break; - - /* ...instead detect the critical error dialog that pops up */ - EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); - if (Skips) - { - ExitCode = WAIT_OBJECT_0; - break; - } - - Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; - WaitTimeOut = (Elapsed > 3000) ? Remaining : - (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : - Remaining; - } - - if (ExitCode != WAIT_OBJECT_0) - { - switch (ExitCode) - { - case WAIT_FAILED: - Error("Wait for child failed (error %lu)\n", GetLastError()); - break; - - case WAIT_TIMEOUT: - /* The 'exit code' on the done line identifies timeouts */ - break; - - default: - Error("Unexpected return value %lu from wait for child\n", ExitCode); - break; - } - if (!TerminateProcess(ProcessInformation.hProcess, 257)) - Error("TerminateProcess failed (error %lu)\n", GetLastError()); - } - else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) - { - Error("Could not get the child exit code (error %lu)\n", GetLastError()); - ExitCode = 259; - } - CloseHandle(ProcessInformation.hProcess); - + ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); if (Skips) - printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", ProcessInformation.dwProcessId, Subtest, Skips); + printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", Pid, Subtest, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, - ProcessInformation.dwProcessId, ExitCode, - (GetTickCount() - Start) / 1000); + Pid, ExitCode, (GetTickCount() - Start) / 1000); return 0; }

1 0

Francois Gouget : testbot/PatchUtils: There is no need to migrate the make_* flags.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: tools Branch: master Commit: 049e1656923eb8685b890b0132af72cabfaab56e URL: https://source.winehq.org/git/tools.git/?a=commit;h=049e1656923eb8685b890b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 12:37:06 2021 +0200 testbot/PatchUtils: There is no need to migrate the make_* flags. They impact the build, and only the build, no matter which patchset part they appear in. This is confirmed by the old code which moved them from $Impacts to $PastImpacts and then back to $Impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 796457a..87e4508 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -423,10 +423,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan", - "PatchedRoot", "PatchedModules", "PatchedTests") + foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -518,12 +515,6 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan") - { - $Impacts->{$Field} ||= $PastImpacts->{$Field}; - } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

1 0

Hugh McMaster : reg: Use wide-char string literals in import.c.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 1fadcf240997f77b4bf31f708893051c94e299b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fadcf240997f77b4bf31f70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:17 2021 +1100 reg: Use wide-char string literals in import.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 93d6d46aef9..3ce8fce7394 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -245,18 +245,13 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) { struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; - static const WCHAR quote[] = {'"'}; - static const WCHAR hex[] = {'h','e','x',':'}; - static const WCHAR dword[] = {'d','w','o','r','d',':'}; - static const WCHAR hexp[] = {'h','e','x','('}; - static const struct data_type data_types[] = { - /* tag len type parse type */ - { quote, 1, REG_SZ, REG_SZ }, - { hex, 4, REG_BINARY, REG_BINARY }, - { dword, 6, REG_DWORD, REG_DWORD }, - { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ - { NULL, 0, 0, 0 } + /* tag len type parse type */ + { L"\"", 1, REG_SZ, REG_SZ }, + { L"hex:", 4, REG_BINARY, REG_BINARY }, + { L"dword:", 6, REG_DWORD, REG_DWORD }, + { L"hex(", 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } }; const struct data_type *ptr; @@ -443,21 +438,17 @@ enum reg_versions { static enum reg_versions parse_file_header(const WCHAR *s) { - static const WCHAR header_31[] = {'R','E','G','E','D','I','T',0}; - static const WCHAR header_40[] = {'R','E','G','E','D','I','T','4',0}; - static const WCHAR header_50[] = {'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; + static const WCHAR *header_31 = L"REGEDIT"; while (*s == ' ' || *s == '\t') s++; if (!lstrcmpW(s, header_31)) return REG_VERSION_31; - if (!lstrcmpW(s, header_40)) + if (!lstrcmpW(s, L"REGEDIT4")) return REG_VERSION_40; - if (!lstrcmpW(s, header_50)) + if (!lstrcmpW(s, L"Windows Registry Editor Version 5.00")) return REG_VERSION_50; /* The Windows version accepts registry file headers beginning with "REGEDIT" and ending @@ -511,13 +502,12 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) { WCHAR *line, *value; - static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T'}; unsigned int key_end = 0; if (!(line = get_line(parser->file))) return NULL; - if (wcsncmp(line, hkcr, ARRAY_SIZE(hkcr))) + if (wcsncmp(line, L"HKEY_CLASSES_ROOT", 17)) /* "HKEY_CLASSES_ROOT" without NUL */ return line; /* get key name */ @@ -948,8 +938,7 @@ static WCHAR *get_lineW(FILE *fp) while (next) { - static const WCHAR line_endings[] = {'\r','\n',0}; - WCHAR *p = wcspbrk(line, line_endings); + WCHAR *p = wcspbrk(line, L"\r\n"); if (!p) { size_t len, count; @@ -986,7 +975,6 @@ int reg_import(int argc, WCHAR *argvW[]) { WCHAR *filename, *pos; FILE *fp; - static const WCHAR rb_mode[] = {'r','b',0}; BYTE s[2]; struct parser parser; @@ -999,7 +987,7 @@ int reg_import(int argc, WCHAR *argvW[]) filename = argvW[2]; - fp = _wfopen(filename, rb_mode); + fp = _wfopen(filename, L"rb"); if (!fp) { output_message(STRING_FILE_NOT_FOUND, filename);

1 0

Austin English : tdh: Add TdhLoadManifestFromBinary stub.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: a9bab3601ed741982e661a04951241478442bebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bab3601ed741982e661a04… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 4 01:07:38 2021 -0600 tdh: Add TdhLoadManifestFromBinary stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50725 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tdh/tdh.spec | 2 +- dlls/tdh/tdh_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec index 0e7c5a5995a..cde397c3899 100644 --- a/dlls/tdh/tdh.spec +++ b/dlls/tdh/tdh.spec @@ -22,7 +22,7 @@ @ stub TdhGetWppMessage @ stub TdhGetWppProperty @ stdcall TdhLoadManifest(wstr) -@ stub TdhLoadManifestFromBinary +@ stdcall TdhLoadManifestFromBinary(wstr) @ stub TdhOpenDecodingHandle @ stub TdhQueryProviderFieldInformation @ stub TdhQueryRemoteWBEMProviderFieldInformation diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c index 2e6a9e69a38..60f32976b98 100644 --- a/dlls/tdh/tdh_main.c +++ b/dlls/tdh/tdh_main.c @@ -32,3 +32,9 @@ ULONG WINAPI TdhLoadManifest(LPWSTR manifest) FIXME("(%s): stub\n", debugstr_w(manifest)); return STATUS_SUCCESS; } + +ULONG WINAPI TdhLoadManifestFromBinary(LPWSTR binary) +{ + FIXME("(%s): stub\n", debugstr_w(binary)); + return STATUS_SUCCESS; +}

1 0

Hugh McMaster : reg: Use RegCreateKeyExW() instead of RegCreateKeyW().
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: aaf503e1de3f476639113b7ab7988c8628529e03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf503e1de3f476639113b7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:15 2021 +1100 reg: Use RegCreateKeyExW() instead of RegCreateKeyW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 29ac0e88af5..e1fd2223716 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -154,7 +154,8 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, { HKEY key; - if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) + if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, &key, NULL)) { output_message(STRING_INVALID_KEY); return 1;

1 0

Hugh McMaster : reg: Fail if duplicate command-line switches are passed to 'reg add'.
by Alexandre Julliard March 30, 2021

March 30, 2021

Module: wine Branch: master Commit: 08976b3ee0db827bc5add829de1f148da89a6362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08976b3ee0db827bc5add829… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:14 2021 +1100 reg: Fail if duplicate command-line switches are passed to 'reg add'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 4 +++- programs/reg/tests/add.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 672ec19ef98..29ac0e88af5 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -227,6 +227,7 @@ int reg_add(int argc, WCHAR *argvW[]) if (!lstrcmpiW(str, L"ve")) { + if (value_empty) goto invalid; value_empty = TRUE; continue; } @@ -249,11 +250,12 @@ int reg_add(int argc, WCHAR *argvW[]) break; case 's': str = argvW[++i]; - if (!str || lstrlenW(str) != 1) + if (separator || !str || lstrlenW(str) != 1) goto invalid; separator = str[0]; break; case 'f': + if (force) goto invalid; force = TRUE; break; default: diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index f5d473e8887..e1e7a478502 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -234,7 +234,7 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /f /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -295,7 +295,7 @@ static void test_add(void) verify_reg(hkey, NULL, REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f /ve", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0