February 2021 - Wine-commits

Zebediah Figura : imagehlp/tests: Rewrite test_bind_image_ex() using a DLL resource.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 4782b08f31d967243014cff14dd41611edabcea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782b08f31d967243014cff1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 13 11:30:10 2021 -0600 imagehlp/tests: Rewrite test_bind_image_ex() using a DLL resource. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/Makefile.in | 8 +- dlls/imagehlp/tests/image.c | 163 +++++++++++++++++++++------------------ dlls/imagehlp/tests/testdll.c | 30 +++++++ dlls/imagehlp/tests/testdll.spec | 2 + 4 files changed, 127 insertions(+), 76 deletions(-) diff --git a/dlls/imagehlp/tests/Makefile.in b/dlls/imagehlp/tests/Makefile.in index 43b434f690a..1a5c393add5 100644 --- a/dlls/imagehlp/tests/Makefile.in +++ b/dlls/imagehlp/tests/Makefile.in @@ -1,6 +1,10 @@ TESTDLL = imagehlp.dll IMPORTS = imagehlp psapi -C_SRCS = \ +testdll_IMPORTS = oleaut32 comdlg32 shlwapi + +SOURCES = \ image.c \ - integrity.c + integrity.c \ + testdll.c \ + testdll.spec diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index c8d1a520c96..888744ac203 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -24,10 +24,36 @@ #include <winbase.h> #include <winver.h> #include <winnt.h> +#include <winuser.h> #include <imagehlp.h> #include "wine/test.h" +static char *load_resource(const char *name) +{ + static char path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathA(ARRAY_SIZE(path), path); + strcat(path, name); + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + debugstr_a(path), GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return path; +} + /* minimal PE file image */ #define VA_START 0x400000 #define FILE_PE_START 0x50 @@ -145,9 +171,6 @@ struct expected_update_accum BOOL todo; }; -static int status_routine_called[BindSymbolsNotUpdated+1]; - - static BOOL WINAPI accumulating_stream_output(DIGEST_HANDLE handle, BYTE *pb, DWORD cb) { @@ -270,40 +293,6 @@ static void update_checksum(void) bin.nt_headers.OptionalHeader.CheckSum = sum; } -static BOOL CALLBACK testing_status_routine(IMAGEHLP_STATUS_REASON reason, const char *ImageName, - const char *DllName, ULONG_PTR Va, ULONG_PTR Parameter) -{ - char kernel32_path[MAX_PATH]; - - if (0 <= (int)reason && reason <= BindSymbolsNotUpdated) - status_routine_called[reason]++; - else - ok(0, "expected reason between 0 and %d, got %d\n", BindSymbolsNotUpdated+1, reason); - - switch(reason) - { - case BindImportModule: - ok(!strcmp(DllName, "KERNEL32.DLL"), "expected DllName to be KERNEL32.DLL, got %s\n", - DllName); - break; - - case BindImportProcedure: - case BindForwarderNOT: - GetSystemDirectoryA(kernel32_path, MAX_PATH); - strcat(kernel32_path, "\\KERNEL32.DLL"); - ok(!lstrcmpiA(DllName, kernel32_path), "expected DllName to be %s, got %s\n", - kernel32_path, DllName); - ok(!strcmp((char *)Parameter, "ExitProcess"), - "expected Parameter to be ExitProcess, got %s\n", (char *)Parameter); - break; - - default: - ok(0, "got unexpected reason %d\n", reason); - break; - } - return TRUE; -} - static void test_get_digest_stream(void) { BOOL ret; @@ -360,52 +349,78 @@ static void test_get_digest_stream(void) DeleteFileA(temp_file); } -static void test_bind_image_ex(void) +static unsigned int got_SysAllocString, got_GetOpenFileNameA, got_SHRegGetIntW; + +static BOOL WINAPI bind_image_cb(IMAGEHLP_STATUS_REASON reason, const char *file, + const char *module, ULONG_PTR va, ULONG_PTR param) { - BOOL ret; - HANDLE file; - char temp_file[MAX_PATH]; - DWORD count; + static char last_module[MAX_PATH]; - /* call with a non-existent file */ - SetLastError(0xdeadbeef); - ret = BindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, "nonexistent.dll", 0, 0, - testing_status_routine); - todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) || - (GetLastError() == ERROR_INVALID_PARAMETER)), - "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n", - GetLastError()); + if (winetest_debug > 1) + trace("reason %u, file %s, module %s, va %#Ix, param %#Ix\n", + reason, debugstr_a(file), debugstr_a(module), va, param); - file = create_temp_file(temp_file); - if (file == INVALID_HANDLE_VALUE) + if (reason == BindImportModule) { - skip("couldn't create temp file\n"); - return; + ok(!strchr(module, '\\'), "got module name %s\n", debugstr_a(module)); + strcpy(last_module, module); + ok(!va, "got VA %#Ix\n", va); + ok(!param, "got param %#Ix\n", param); } + else if (reason == BindImportProcedure) + { + char full_path[MAX_PATH]; + BOOL ret; - WriteFile(file, &bin, sizeof(bin), &count, NULL); - CloseHandle(file); - - /* call with a proper PE file, but with StatusRoutine set to NULL */ - ret = BindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, - NULL); - ok(ret, "BindImageEx failed: %d\n", GetLastError()); - - /* call with a proper PE file and StatusRoutine */ - ret = BindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, - testing_status_routine); - ok(ret, "BindImageEx failed: %d\n", GetLastError()); + ok(!!va, "expected nonzero VA\n"); + ret = SearchPathA(NULL, last_module, ".dll", sizeof(full_path), full_path, NULL); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(module, full_path), "expected %s, got %s\n", debugstr_a(full_path), debugstr_a(module)); - todo_wine ok(status_routine_called[BindImportModule] == 1, - "StatusRoutine was called %d times\n", status_routine_called[BindImportModule]); + if (!strcmp((const char *)param, "SysAllocString")) + { + ok(!strcmp(last_module, "oleaut32.dll"), "got wrong module %s\n", debugstr_a(module)); + ++got_SysAllocString; + } + else if (!strcmp((const char *)param, "GetOpenFileNameA")) + { + ok(!strcmp(last_module, "comdlg32.dll"), "got wrong module %s\n", debugstr_a(module)); + ++got_GetOpenFileNameA; + } + else if (!strcmp((const char *)param, "Ordinal117")) + { + ok(!strcmp(last_module, "shlwapi.dll"), "got wrong module %s\n", debugstr_a(module)); + ++got_SHRegGetIntW; + } + } + else + { + ok(0, "got unexpected reason %#x\n", reason); + } + return TRUE; +} - todo_wine ok((status_routine_called[BindImportProcedure] == 1) -#if defined(_WIN64) - || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */ -#endif - , "StatusRoutine was called %d times\n", status_routine_called[BindImportProcedure]); +static void test_bind_image_ex(void) +{ + const char *filename = load_resource("testdll.dll"); + BOOL ret; - DeleteFileA(temp_file); + SetLastError(0xdeadbeef); + ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, + "nonexistent.dll", 0, 0, bind_image_cb); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, + "got error %u\n", GetLastError()); + + ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, + filename, NULL, NULL, bind_image_cb); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(got_SysAllocString == 1, "got %u imports of SysAllocString\n", got_SysAllocString); + todo_wine ok(got_GetOpenFileNameA == 1, "got %u imports of GetOpenFileNameA\n", got_GetOpenFileNameA); + todo_wine ok(got_SHRegGetIntW == 1, "got %u imports of SHRegGetIntW\n", got_SHRegGetIntW); + + ret = DeleteFileA(filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_image_load(void) diff --git a/dlls/imagehlp/tests/testdll.c b/dlls/imagehlp/tests/testdll.c new file mode 100644 index 00000000000..3c079bfffd3 --- /dev/null +++ b/dlls/imagehlp/tests/testdll.c @@ -0,0 +1,30 @@ +/* + * Copyright 2021 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <oaidl.h> +#include <commdlg.h> +#include <shlwapi.h> + +extern DWORD WINAPI StrCmpCA(const char *, const char *); + +void export(void) +{ + SysAllocString(NULL); + GetOpenFileNameA(NULL); + SHRegGetIntW(NULL, NULL, 0); +} diff --git a/dlls/imagehlp/tests/testdll.spec b/dlls/imagehlp/tests/testdll.spec new file mode 100644 index 00000000000..7d5774e346b --- /dev/null +++ b/dlls/imagehlp/tests/testdll.spec @@ -0,0 +1,2 @@ +@ cdecl export() +@ stdcall VariantInit(ptr) oleaut32.VariantInit

1 0

Francois Gouget : testbot/reporttest: Add a test for IgnoreExceptions.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: tools Branch: master Commit: 77a68ec62c6aab7d6fb8777cf6eb7be7d3f163f1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=77a68ec62c6aab7d6fb8777… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:19:36 2021 +0100 testbot/reporttest: Add a test for IgnoreExceptions. All exceptions should be ignored when IgnoreExceptions=1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 19 ++++++++++++++++++- testbot/src/reporttest/report.testwtbs | 8 +++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index da4ce50..60fa9be 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -571,7 +571,24 @@ stub comctl32:treeview stub comctl32:updown stub comdlg32:filedlg stub comdlg32:finddlg -stub comdlg32:fontdlg + +comctl32:fontdlg start dlls/comctl32/tests/fontdlg.c - +----- Check support for IgnoreExceptions +----- Expected assessement: 6 failures +01bd:fontdlg: unhandled exception c0000005 at 00001111 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). +fontdlg.c:10: unhandled exception c0000005 in child process 1111 +fontdlg.c:12: IgnoreExceptions=1 +01bd:fontdlg: unhandled exception c0000005 at 00002222 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00002222). +fontdlg.c:20: unhandled exception c0000005 in child process 2222 +fontdlg.c:22: IgnoreExceptions=0 +01bd:fontdlg: unhandled exception c0000005 at 00003333 +Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). +fontdlg.c:30: unhandled exception c0000005 in child process 3333 +01bd:fontdlg: 10 tests executed (0 marked as todo, 6 failures), 0 skipped. +comctl32:fontdlg:01bd done (6) in 0s + stub comdlg32:itemdlg stub comdlg32:printdlg stub credui:credui diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 64057bc..208c014 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 45 +p tests.TestFailures 51 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -50,6 +50,12 @@ n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog:471: unhandled exception c0000005 in child process 1234 n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! +n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 +n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). +n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111 +n 0 01bd:fontdlg: unhandled exception c0000005 at 00003333 +n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). +n 0 fontdlg.c:30: unhandled exception c0000005 in child process 3333 g 0 tests.report.xmllite n 0 writer.c:20: Test failed: A delayed failure, typically in a subprocess

1 0

Francois Gouget : testbot/reporttest: Update the "in child process" test lines.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: tools Branch: master Commit: 7db0a116d661d637ad299d1951300fe7115cd388 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7db0a116d661d637ad299d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:18:24 2021 +0100 testbot/reporttest: Update the "in child process" test lines. They should have a filename rather than just the unit name now, and one unit name was wrong anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 4 ++-- testbot/src/reporttest/report.testwtbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 60fa9be..9b28533 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -332,7 +332,7 @@ apphelp.c:41: Test succeeded inside todo block: Success in the child process apphelp.c:42: Test marked todo: Fixme in the child process apphelp.c:43: Tests skipped: Skipped in the child process 4321:apphelp: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. -timer:44: 2 failures in child process +apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s @@ -544,7 +544,7 @@ comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - ----- "in child process" line. See also comctl32:rebar. ----- Expected assessement: 1 failure 1234:taskdialog: unhandled exception c0000005 at 0040167C -taskdialog:33: unhandled exception c0000005 in child process 1234 +taskdialog.c:33: unhandled exception c0000005 in child process 1234 07b0:taskdialog: 3 tests executed (0 marked as todo, 1 failures), 0 skipped. comctl32:taskdialog:07b0 done (1) in 0s diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 208c014..aa78c9e 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -47,7 +47,7 @@ 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 1234:taskdialog: unhandled exception c0000005 at 0040167C -n 0 taskdialog:471: unhandled exception c0000005 in child process 1234 +n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234 n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111

1 0

Francois Gouget : winetest/dissect: Link child exception lines to the source.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: tools Branch: master Commit: 87fc19727444032b7607d0263b3ebdc02f733cb2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=87fc19727444032b7607d02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:22:43 2021 +0100 winetest/dissect: Link child exception lines to the source. Move the trace handling because it also matches the child exception lines now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c1590ba..d2ef10d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -661,15 +661,6 @@ while ($line = <IN>) { # Don't complain and don't count misplaced skips $skipped++ if ($units{$l_unit}); } - elsif (($unit ne "" and - $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or - $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) - { - my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); - add_test_line("trace", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". - escapeHTML($l_text)); - } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) @@ -694,20 +685,31 @@ while ($line = <IN>) { add_test_line("failed", escapeHTML($line)); } elsif (($unit ne "" and - $line =~ /($units_re):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $line =~ /^(.*?)($units_re)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or + $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) { - my ($l_unit, $l_pid) = ($1, $2); + my ($pollution, $l_unit, $l_num, $l_text, $l_pid) = ($1, $2, $3, $4, $5); if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; $s_failures++; } - add_test_line("failed", escapeHTML($line)); + add_test_line("failed", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); check_unit($l_unit, "child exception"); $failures++; } + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/) + { + my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + } 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 : winetest/dissect: Add support for IgnoreExceptions.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: tools Branch: master Commit: caa31aa29bb563bb054a6ef9f3fa972a32628e40 URL: https://source.winehq.org/git/tools.git/?a=commit;h=caa31aa29bb563bb054a6ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:22:51 2021 +0100 winetest/dissect: Add support for IgnoreExceptions. Any exception occurring while IgnoreExceptions=1 is expected and should be ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 71 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 23 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d2ef10d..4341999 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -448,7 +448,7 @@ my $unitsize = 0; my %units; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); -my (%pids, $rc, $summary, $broken); +my (%pids, $rc, $summary, $broken, $ignore_exceptions); my ($extra_failures, $failed_units) = (0, 0); sub get_source_link($$) @@ -583,7 +583,7 @@ sub close_test_unit($) $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; - $extra_failures = $broken = 0; + $extra_failures = $broken = $ignore_exceptions = 0; $rc = $summary = undef; %pids = (); } @@ -661,45 +661,70 @@ while ($line = <IN>) { # Don't complain and don't count misplaced skips $skipped++ if ($units{$l_unit}); } + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (IgnoreExceptions=([01]).*)$/) or + $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (IgnoreExceptions=([01]).*)$/) + { + my ($pollution, $l_unit, $l_num, $l_text, $l_ignore) = ($1, $2, $3, $4, $5); + add_test_line("", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + $ignore_exceptions = $l_ignore; + } elsif (($unit ne "" and $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /) or $line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at /) { my ($l_pid, $l_unit) = ($1, $2); - if ($units{$l_unit}) + my $class = ""; + if (!$ignore_exceptions) { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; + $class = "failed"; + if ($units{$l_unit}) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + check_unit($l_unit, "unhandled exception"); + $failures++; } - add_test_line("failed", escapeHTML($line)); - check_unit($l_unit, "unhandled exception"); - $failures++; + add_test_line($class, escapeHTML($line)); } 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)); + my $class = ""; + if (!$ignore_exceptions) + { + $class = "failed"; + # This also replaces a test summary line. + $pids{0} = 1; # the pid is unknown so use 0 + $s_failures++; + $failures++; + } + add_test_line($class, escapeHTML($line)); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) or $line =~ /^()([_.a-z0-9]+)\.c:(\d+): (unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+).*)$/) { my ($pollution, $l_unit, $l_num, $l_text, $l_pid) = ($1, $2, $3, $4, $5); - if ($units{$l_unit}) + my $class = ""; + if (!$ignore_exceptions) { - # This also replaces a test summary line. - $pids{$l_pid || 0} = 1; - $s_failures++; + $class = "failed"; + if ($units{$l_unit}) + { + # This also replaces a test summary line. + $pids{$l_pid || 0} = 1; + $s_failures++; + } + check_unit($l_unit, "child exception"); + $failures++; } - add_test_line("failed", escapeHTML($pollution) . - get_source_link($l_unit, $l_num) .": ". - escapeHTML($l_text)); - check_unit($l_unit, "child exception"); - $failures++; + add_test_line($class, escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/) or

1 0

Alexandre Julliard : Wine release 6.2
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: website Branch: master Commit: bce7778626b3aadd5e6acabc1f83662948e4dc98 URL: https://source.winehq.org/git/website.git/?a=commit;h=bce7778626b3aadd5e6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:37:50 2021 +0100 Wine release 6.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021021201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021021201.xml b/news/en/2021021201.xml new file mode 100644 index 00000000..159bbf05 --- /dev/null +++ b/news/en/2021021201.xml @@ -0,0 +1,17 @@ +<news> +<date>February 12, 2021</date> +<title>Wine 6.2 Released</title> +<body> + The Wine development release 6.2 is now available. + <a href="{$root}/announce/6.2">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 6.0.0, with DirectX support.</li> + <li>Support for NTDLL debugger APIs.</li> + <li>More WinRT support in WIDL.</li> + <li>Xbox One controller fixes on Mac.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Zebediah Figura : winegstreamer: Move wg_parser_destroy() to the Unix library.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 9147fefbb2e3192d2679e7d0b984a621949ccd1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9147fefbb2e3192d2679e7d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:58 2021 -0600 winegstreamer: Move wg_parser_destroy() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 18 +----------------- dlls/winegstreamer/wg_parser.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7aaf25e395e..15a20749786 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -210,6 +210,7 @@ struct unix_funcs struct wg_parser *(CDECL *wg_avi_parser_create)(void); struct wg_parser *(CDECL *wg_mpeg_audio_parser_create)(void); struct wg_parser *(CDECL *wg_wave_parser_create)(void); + void (CDECL *wg_parser_destroy)(struct wg_parser *parser); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b4f95df67da..db1825e34a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1225,22 +1225,6 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } -static void wg_parser_destroy(struct wg_parser *parser) -{ - if (parser->bus) - { - gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); - gst_object_unref(parser->bus); - } - - pthread_mutex_destroy(&parser->mutex); - pthread_cond_destroy(&parser->init_cond); - pthread_cond_destroy(&parser->read_cond); - pthread_cond_destroy(&parser->read_done_cond); - - free(parser); -} - static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1259,7 +1243,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - wg_parser_destroy(filter->wg_parser); + unix_funcs->wg_parser_destroy(filter->wg_parser); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 3a67a195dff..071694f77cc 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1011,12 +1011,29 @@ static struct wg_parser * CDECL wg_wave_parser_create(void) return parser; } +static void CDECL wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + pthread_mutex_destroy(&parser->mutex); + pthread_cond_destroy(&parser->init_cond); + pthread_cond_destroy(&parser->read_cond); + pthread_cond_destroy(&parser->read_done_cond); + + free(parser); +} + static const struct unix_funcs funcs = { wg_decodebin_parser_create, wg_avi_parser_create, wg_mpeg_audio_parser_create, wg_wave_parser_create, + wg_parser_destroy, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: da9726a16c9a785b86be6a847156192c7c622ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9726a16c9a785b86be6a84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 20:33:29 2021 -0600 wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c0998ba54c..c673f61e429 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1781,6 +1781,19 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_BUFFER: + if (wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_RTYPE_BUFFER, but format %s is typeless.\n", debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + + allowed_usage = WINED3DUSAGE_DYNAMIC; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; + break; + default: FIXME("Unhandled resource type %s.\n", debug_d3dresourcetype(resource_type)); return WINED3DERR_NOTAVAILABLE;

1 0

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_BUFFER in CheckFormatSupport().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 062644361b72729923e2d1be4ad58208c6538ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=062644361b72729923e2d1be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 20:33:30 2021 -0600 d3d11: Report D3D11_FORMAT_SUPPORT_BUFFER in CheckFormatSupport(). Note that native also reports support for DXGI_FORMAT_UNKNOWN; this patch does not implement that behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a7e1999c07a..8e5beb8893b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3541,6 +3541,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } flag_mapping[] = { + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, @@ -3587,6 +3588,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } wined3d_mutex_unlock(); + if (feature_level < D3D_FEATURE_LEVEL_10_0) + *format_support &= ~D3D11_FORMAT_SUPPORT_BUFFER; + if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index fddb7bfd218..044c1ce5a17 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19950,6 +19950,9 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON), "Unexpected SHADER_SAMPLE_COMPARISON for format %#x, feature level %#x.\n", format, feature_level); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_BUFFER), + "Unexpected BUFFER for format %#x, feature level %#x.\n", + format, feature_level); } if (feature_level < D3D_FEATURE_LEVEL_10_1) {

1 0

Jacek Caban : winebuild: Don't use llvm-lib to build static libs containing importlibs.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 6d9b33118455027bebb6a453b7e1477864080fe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d9b33118455027bebb6a453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 12 15:35:21 2021 +0100 winebuild: Don't use llvm-lib to build static libs containing importlibs. It's not supported by LLVM 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50653 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3c2547c5584..bc2d8497a47 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1838,20 +1838,19 @@ static void assemble_files( const char *prefix ) } /* build a library from the current asm files and any additional object files in argv */ -static void build_library( const char *output_name, char **argv, const char *importlib ) +static void build_library( const char *output_name, char **argv, int create ) { - int create = !importlib || importlib != output_name; struct strarray args; - if (target_platform != PLATFORM_WINDOWS) + if (!create || target_platform != PLATFORM_WINDOWS) { args = find_tool( "ar", NULL ); - strarray_add( &args, create ? "rc" : "r", output_name, importlib, NULL ); + strarray_add( &args, create ? "rc" : "r", output_name, NULL ); } else { args = find_link_tool(); - strarray_add( &args, "/lib", strmake( "-out:%s", output_name ), importlib, NULL ); + strarray_add( &args, "/lib", strmake( "-out:%s", output_name ), NULL ); } strarray_addall( &args, as_files ); strarray_addv( &args, argv ); @@ -1974,19 +1973,12 @@ void output_static_lib( DLLSPEC *spec, char **argv ) { if (is_pe()) { - const char *importlib = NULL; - if (spec) - { - importlib = (argv[0] && target_platform == PLATFORM_WINDOWS) - ? get_temp_file_name( output_file_name, ".a" ) - : output_file_name; - build_windows_import_lib( importlib, spec ); - } - if (argv[0] || !spec) build_library( output_file_name, argv, importlib ); + if (spec) build_windows_import_lib( output_file_name, spec ); + if (argv[0] || !spec) build_library( output_file_name, argv, !spec ); } else { if (spec) build_unix_import_lib( spec ); - build_library( output_file_name, argv, NULL ); + build_library( output_file_name, argv, 1 ); } }

1 0