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

Francois Gouget : testbot/WineTest: Always return the mission base name in SetupTest().
by Alexandre Julliard 31 Mar '21

31 Mar '21

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/PatchUtils: There is no need to migrate the make_* flags.
by Alexandre Julliard 31 Mar '21

31 Mar '21

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

Francois Gouget : testbot/reporttest: Add tests for the 'dll versions' block.
by Alexandre Julliard 31 Mar '21

31 Mar '21

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 31 Mar '21

31 Mar '21

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/TestLauncher: Detect missing manifest critical dialogs.
by Alexandre Julliard 31 Mar '21

31 Mar '21

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/TestLauncher: Report missing side-by-side dll version errors.
by Alexandre Julliard 31 Mar '21

31 Mar '21

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

Huw Davies : riched20: Send EN_UPDATE from TxDraw().
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 62f96b039794685a97fcf8055312e0afdb0b2add URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f96b039794685a97fcf805… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 30 12:36:50 2021 +0100 riched20: Send EN_UPDATE from TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 3 --- dlls/riched20/tests/txtsrv.c | 12 ++++++++++++ dlls/riched20/txtsrv.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f991b2bebcf..6ab7e4de76b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -140,9 +140,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ITextHost_TxNotify( editor->texthost, EN_UPDATE, NULL ); - ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 45e48a734fa..6834e38b7f5 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -399,6 +399,7 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR } static int en_vscroll_sent; +static int en_update_sent; static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, void *data ) { ITextHostTestImpl *This = impl_from_ITextHost(iface); @@ -409,6 +410,10 @@ static HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost *iface, DWORD code, en_vscroll_sent++; ok( !data, "got %p\n", data ); break; + case EN_UPDATE: + en_update_sent++; + ok( !data, "got %p\n", data ); + break; } return S_OK; } @@ -1152,6 +1157,13 @@ static void test_notifications( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( en_vscroll_sent == 2, "got %d\n", en_vscroll_sent ); + /* EN_UPDATE is sent by TxDraw() */ + en_update_sent = 0; + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( en_update_sent == 1, "got %d\n", en_update_sent ); + DestroyWindow( host_impl->window ); ITextServices_Release( txtserv ); ITextHost_Release( host ); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7a979971a0a..80e4682880f 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -193,6 +193,10 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD editor_mark_rewrap_all( services->editor ); wrap_marked_paras_dc( services->editor, dc, FALSE ); } + + if (!services->editor->bEmulateVersion10 || services->editor->nEventMask & ENM_UPDATE) + ITextHost_TxNotify( services->editor->texthost, EN_UPDATE, NULL ); + editor_draw( services->editor, dc, update ); if (!draw) ITextHost_TxReleaseDC( services->editor->texthost, dc );

1 0

Hugh McMaster : reg: Parse 'reg delete' command-line arguments in delete.c.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 434c345e41222ae6eebe734e655a32bfd51871ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=434c345e41222ae6eebe734e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:12 2021 +1100 reg: Parse 'reg delete' command-line arguments in delete.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.c | 22 ++++++------------- programs/reg/reg.h | 3 +-- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index c102fb4ad53..1f3755b3365 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,8 +18,8 @@ #include "reg.h" -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force) +static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) { HKEY key; @@ -105,3 +105,60 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_SUCCESS); return 0; } + +int reg_delete(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"va")) + { + if (value_all) goto invalid; + value_all = TRUE; + continue; + } + else if (!lstrcmpiW(str, L"ve")) + { + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; + } + } + } + + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + goto invalid; + + return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 88889205ca7..9f2b4b53a04 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -333,11 +333,10 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { - int i, op, op_help, ret; - static const WCHAR switchVAW[] = {'v','a',0}; + int i, op, op_help; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; + BOOL value_empty = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -374,6 +373,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_DELETE) + return reg_delete(argc, argvW); + if (op == REG_EXPORT) return reg_export(argc, argvW); @@ -397,11 +399,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(ptr, switchVAW)) - { - value_all = TRUE; - continue; - } else if (!ptr[0] || ptr[1]) { output_message(STRING_INVALID_CMDLINE); @@ -450,16 +447,11 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } } - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); return 1; } - if (op == REG_ADD) - ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - - return ret; + return reg_add(root, path, value_name, value_empty, type, separator, data, force); } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e1e4804d19d..e4ee13eca6e 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -47,8 +47,7 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force); /* delete.c */ -int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL value_all, BOOL force); +int reg_delete(int argc, WCHAR *argvW[]); /* export.c */ int reg_export(int argc, WCHAR *argvW[]);

1 0

Hugh McMaster : reg: Parse 'reg add' command-line arguments in add.c.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 9138f5893c2eb7cafabdd8ed49b99a633eeda462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9138f5893c2eb7cafabdd8ed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 30 23:00:13 2021 +1100 reg: Parse 'reg add' command-line arguments in add.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 67 ++++++++++++++++++++++++++++++++++++++++++-- programs/reg/reg.c | 82 ++++-------------------------------------------------- programs/reg/reg.h | 3 +- 3 files changed, 71 insertions(+), 81 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 3d0a509b4f0..672ec19ef98 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -149,8 +149,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW return out_data; } -int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, - WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) +static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, + WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY key; @@ -208,3 +208,66 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 0; } + +int reg_add(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; + BOOL value_empty = FALSE, force = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 't': + if (type || !(type = argvW[++i])) + goto invalid; + break; + case 'd': + if (data || !(data = argvW[++i])) + goto invalid; + break; + case 's': + str = argvW[++i]; + if (!str || lstrlenW(str) != 1) + goto invalid; + separator = str[0]; + break; + case 'f': + force = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_add(root, path, value_name, value_empty, type, separator, data, force); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9f2b4b53a04..e419799676f 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -333,11 +333,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) int __cdecl wmain(int argc, WCHAR *argvW[]) { - int i, op, op_help; - static const WCHAR switchVEW[] = {'v','e',0}; - WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, force = FALSE; - HKEY root; + int op, op_help; if (argc == 1) { @@ -373,6 +369,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 0; } + if (op == REG_ADD) + return reg_add(argc, argvW); + if (op == REG_DELETE) return reg_delete(argc, argvW); @@ -382,76 +381,5 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); - if (op == REG_QUERY) - return reg_query(argc, argvW); - - if (!parse_registry_key(argvW[2], &root, &path, &key_name)) - return 1; - - for (i = 3; i < argc; i++) - { - if (argvW[i][0] == '/' || argvW[i][0] == '-') - { - WCHAR *ptr = &argvW[i][1]; - - if (!lstrcmpiW(ptr, switchVEW)) - { - value_empty = TRUE; - continue; - } - else if (!ptr[0] || ptr[1]) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - switch(towlower(argvW[i][1])) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 't': - if (type || !(type = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 'd': - if (data || !(data = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - break; - case 's': - ptr = argvW[++i]; - if (!ptr || lstrlenW(ptr) != 1) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - separator = ptr[0]; - break; - case 'f': - force = TRUE; - break; - default: - output_message(STRING_INVALID_CMDLINE); - return 1; - } - } - } - - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - - return reg_add(root, path, value_name, value_empty, type, separator, data, force); + return reg_query(argc, argvW); } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index e4ee13eca6e..3525bed75b8 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -43,8 +43,7 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long BOOL is_switch(const WCHAR *s, const WCHAR c); /* add.c */ -int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, - WCHAR *type, WCHAR separator, WCHAR *data, BOOL force); +int reg_add(int arc, WCHAR *argvW[]); /* delete.c */ int reg_delete(int argc, WCHAR *argvW[]);

1 0

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

30 Mar '21

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