February 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Make the HLSL compiler reëntrant.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: vkd3d Branch: master Commit: c7d4acaf4b0d2db6b529901140dcbafaf04b312d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7d4acaf4b0d2db6b529901… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:53 2021 -0600 vkd3d-shader: Make the HLSL compiler reëntrant. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 100 +++++----- libs/vkd3d-shader/hlsl.h | 44 ++--- libs/vkd3d-shader/hlsl.l | 98 +++++----- libs/vkd3d-shader/hlsl.y | 466 ++++++++++++++++++++++++----------------------- 4 files changed, 362 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c7d4acaf4b0d2db6b52…

1 0

Francois Gouget : testbot/reporttest: Add a test for winedbg's unhandled exception lines.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: tools Branch: master Commit: 4edf020d007fc4806911983300bc3ec5baa58d1b URL: https://source.winehq.org/git/tools.git/?a=commit;h=4edf020d007fc4806911983… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:15:00 2021 +0100 testbot/reporttest: Add a test for winedbg's unhandled exception lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 9 +++++++-- testbot/src/reporttest/report.testwtbs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 14d2cf6..8ff6e14 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -314,7 +314,7 @@ advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - ----- WTBS Simple test crash ------ A test unit with a crash +----- 1/2: A test unit with a wine/test.h "unhandled exception" line ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s @@ -515,7 +515,12 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -stub comctl32:tab +comctl32:tab start dlls/comctl32/tests/tab.c - +----- WTBS Simple test crash +----- 2/2: A test unit with a winedbg "unhandled exception" line +----- Expected assessement: Crash +Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). +comctl32:tab:07b0 done (-1073741819) in 0s stub comctl32:taskdialog diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 49ef2c0..b444b69 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 40 +p tests.TestFailures 41 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -41,6 +41,7 @@ n 0 1234:rebar: unhandled exception c0000005 at 0040167C n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right!

1 0

Francois Gouget : winetest/dissect: Add support for winedbg's unhandled exception lines.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: tools Branch: master Commit: 93b9a7e085713d815c5a26b756ef1ff7e7d2201f URL: https://source.winehq.org/git/tools.git/?a=commit;h=93b9a7e085713d815c5a26b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:15:58 2021 +0100 winetest/dissect: Add support for winedbg's unhandled exception lines. They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 12a939d..c20dab6 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -685,6 +685,14 @@ while ($line = <IN>) { check_unit($l_unit, "unhandled exception"); $failures++; } + elsif ($line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $pids{0} = 1; + $s_failures++; + $failures++; + add_test_line("failed", escapeHTML($line)); + } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or $line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)

1 0

Francois Gouget : testbot/LogUtils: Add support for winedbg's unhandled exception lines.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: tools Branch: master Commit: 5e7c5603ba0227e6a6f7421ca09989f14d5bd810 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e7c5603ba0227e6a6f7421… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 02:16:01 2021 +0100 testbot/LogUtils: Add support for winedbg's unhandled exception lines. They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 69299da..9164b47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -631,6 +631,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif ($Line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /)

1 0

Francois Gouget : testbot/web: Fix the $Task->TestFailures check.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: tools Branch: master Commit: 694e6f4e9812b5df1ec9193be32b6d7fcb835db9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=694e6f4e9812b5df1ec9193… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 10 16:36:17 2021 +0100 testbot/web: Fix the $Task->TestFailures check. If it has not been set to a numeric value, $Task->TestFailures is undefined so comparing it to an empty string makes no sense. Fortunately undef ne "" is false (as well as undef eq "") so the code was doing the right thing and was not generating a warning since warnings are not turned on. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 088aea1..2486229 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -131,7 +131,7 @@ sub GenerateDataCell($$$$) foreach my $Task (@{$Step->Tasks->GetItems()}) { my $TaskFailures = $Task->TestFailures; - if ($TaskFailures ne "") + if (defined $TaskFailures) { $HasTestResult = 1; $Failures += $TaskFailures;

1 0

Paul Gofman : vcomp120: Share the source with vcomp.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 90d1fec2625af2a781c9d5484a414987c09bff19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90d1fec2625af2a781c9d548… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:13 2021 +0300 vcomp120: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp120/Makefile.in | 7 ++ dlls/vcomp120/vcomp120.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90d1fec2625af2a781c9…

1 0

Paul Gofman : vcomp140: Share the source with vcomp.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: d73df9e4e1e8ca59d7b517369f4ef608ba9a8962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d73df9e4e1e8ca59d7b51736… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 9 02:44:14 2021 +0300 vcomp140: Share the source with vcomp. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp140/Makefile.in | 7 ++ dlls/vcomp140/vcomp140.spec | 202 ++++++++++++++++++++++---------------------- 2 files changed, 108 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d73df9e4e1e8ca59d7b5…

1 0

Jactry Zeng : include: Add IFileOperation interface.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 0c19e2e487d36a89531daf4897c0b6390d82a843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c19e2e487d36a89531daf48… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 24 21:08:50 2021 +0800 include: Add IFileOperation interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 42ef264ed86..e264a3b18e4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3871,4 +3871,121 @@ library ShellObjects { interface IApplicationActivationManager; } + + [ + uuid(3ad05575-8857-4850-9277-11b85bdb8e09) + ] + coclass FileOperation + { + interface IFileOperation; + } +} + +[v1_enum] enum _OPPROGDLGF +{ + OPPROGDLG_DEFAULT = 0x00000000, + OPPROGDLG_ENABLEPAUSE = 0x00000080, + OPPROGDLG_ALLOWUNDO = 0x00000100, + OPPROGDLG_DONTDISPLAYSOURCEPATH = 0x00000200, + OPPROGDLG_DONTDISPLAYDESTPATH = 0x00000400, + OPPROGDLG_NOMULTIDAYESTIMATES = 0x00000800, + OPPROGDLG_DONTDISPLAYLOCATIONS = 0x00001000, +}; +typedef DWORD OPPROGDLGF; + +typedef [v1_enum] enum _SPACTION { + SPACTION_NONE, + SPACTION_MOVING, + SPACTION_COPYING, + SPACTION_RECYCLING, + SPACTION_APPLYINGATTRIBS, + SPACTION_DOWNLOADING, + SPACTION_SEARCHING_INTERNET, + SPACTION_CALCULATING, + SPACTION_UPLOADING, + SPACTION_SEARCHING_FILES, + SPACTION_DELETING, + SPACTION_RENAMING, + SPACTION_FORMATTING, + SPACTION_COPY_MOVING, +} SPACTION; + +[ + object, + uuid(0c9fb851-e5c9-43eb-a370-f0677b13874c), + pointer_default(unique) +] +interface IOperationsProgressDialog : IUnknown +{ + [v1_enum] enum _PDMODE + { + PDM_DEFAULT = 0x00000000, + PDM_RUN = 0x00000001, + PDM_PREFLIGHT = 0x00000002, + PDM_UNDOING = 0x00000004, + PDM_ERRORSBLOCKING = 0x00000008, + PDM_INDETERMINATE = 0x00000010, + }; + typedef DWORD PDMODE; + + typedef [v1_enum] enum PDOPSTATUS + { + PDOPS_RUNNING = 1, + PDOPS_PAUSED, + PDOPS_CANCELLED, + PDOPS_STOPPED, + PDOPS_ERRORS + } PDOPSTATUS; + + HRESULT StartProgressDialog([in, unique] HWND owner, [in] OPPROGDLGF flags); + HRESULT StopProgressDialog(); + HRESULT SetOperation([in] SPACTION action); + HRESULT SetMode([in] PDMODE mode); + HRESULT UpdateProgress([in] ULONGLONG current_points, [in] ULONGLONG total_points, + [in] ULONGLONG current_size, [in] ULONGLONG total_size, + [in] ULONGLONG current_item, [in] ULONGLONG total_item); + HRESULT UpdateLocations([in, unique] IShellItem *source, [in, unique] IShellItem *target, + [in, unique] IShellItem *item); + HRESULT ResetTimer(); + HRESULT PauseTimer(); + HRESULT ResumeTimer(); + HRESULT GetMilliseconds([out] ULONGLONG *elapsed, [out] ULONGLONG *remaining); + HRESULT GetOperationStatus([out] PDOPSTATUS *status); +} + +[ + object, + uuid(947aab5f-0a5c-4c13-b4d6-4bf7836fc9f8), + pointer_default(unique) +] +interface IFileOperation : IUnknown +{ + HRESULT Advise([in] IFileOperationProgressSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT SetOperationFlags([in] DWORD flags); + HRESULT SetProgressMessage([in, string] LPCWSTR message); + HRESULT SetProgressDialog([in] IOperationsProgressDialog *dialog); + HRESULT SetProperties([in] IPropertyChangeArray *array); + HRESULT SetOwnerWindow([in] HWND owner); + HRESULT ApplyPropertiesToItem([in] IShellItem *item); + HRESULT ApplyPropertiesToItems([in] IUnknown *items); + HRESULT RenameItem([in] IShellItem *item, [in, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT RenameItems([in] IUnknown *items, [in, string] LPCWSTR name); + HRESULT MoveItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT MoveItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT CopyItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT CopyItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT DeleteItem([in] IShellItem *item, + [in, unique] IFileOperationProgressSink *sink); + HRESULT DeleteItems([in] IUnknown *items); + HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique] IFileOperationProgressSink *sink); + HRESULT PerformOperations(); + HRESULT GetAnyOperationsAborted([out] BOOL *aborted); }

1 0

Jactry Zeng : shell32: Implement IFileOperation stub.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 4a1bd593f39b0852ca8fccbf0e54f7c00b3783ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1bd593f39b0852ca8fccbf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Jan 24 21:08:51 2021 +0800 shell32: Implement IFileOperation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48848 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shlfileop.c | 249 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfileop.c | 29 +++++ 5 files changed, 286 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a1bd593f39b0852ca8f…

1 0

Timothy Pearson : widl: Add PPC64 support.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: fe723c267368bea1745363f22ed0888a018eff7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe723c267368bea1745363f2… Author: Timothy Pearson <tpearson(a)raptorengineering.com> Date: Sun Jan 31 18:34:15 2021 +0100 widl: Add PPC64 support. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 38 +++++++++++++++++++++++--------------- tools/widl/widl.h | 2 +- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11b..99b24e86fdc 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -97,6 +97,8 @@ static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSIO enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; +#elif defined(__powerpc64__) +enum target_cpu target_cpu = CPU_POWERPC64; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) @@ -281,21 +283,23 @@ static void set_target( const char *target ) enum target_cpu cpu; } cpu_names[] = { - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "amd64", CPU_x86_64 }, - { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "arm", CPU_ARM }, - { "armv5", CPU_ARM }, - { "armv6", CPU_ARM }, - { "armv7", CPU_ARM }, - { "armv7a", CPU_ARM }, - { "arm64", CPU_ARM64 }, - { "aarch64", CPU_ARM64 }, + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, + { "x86_64", CPU_x86_64 }, + { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, + { "powerpc64le", CPU_POWERPC64 }, + { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "armv7a", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, }; unsigned int i; @@ -796,6 +800,10 @@ int main(int argc,char *argv[]) if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); pointer_size = 8; break; + case CPU_POWERPC64: + if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + pointer_size = 8; + break; default: if (pointer_size == 8) error( "Cannot build 64-bit code for this CPU\n" ); pointer_size = 4; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea3..bc6226c54fe 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -76,7 +76,7 @@ extern int char_number; enum target_cpu { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64 }; extern enum target_cpu target_cpu;

1 0