February 2021 - Wine-Commits

Zebediah Figura : imagehlp/tests: Use ImageNtHeader instead of RtlImageNtHeader.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 803730ca872be5521b51422c9bd790b0979a49c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=803730ca872be5521b51422c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 13 11:30:09 2021 -0600 imagehlp/tests: Use ImageNtHeader instead of RtlImageNtHeader. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/integrity.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 6d820fa0b1d..fbe40995f2f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -29,11 +29,8 @@ #define PSAPI_VERSION 1 #include "psapi.h" -static HMODULE hNtdll; static char test_dll_path[MAX_PATH]; -static PIMAGE_NT_HEADERS (WINAPI *pRtlImageNtHeader)(PVOID); - static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 ,0xA0,0x82,0x02,0xD2,0x30,0x82,0x02,0xCE,0x02,0x01,0x01,0x31,0x00,0x30,0x0B @@ -337,7 +334,7 @@ static void test_pe_checksum(void) todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); - nt_header = pRtlImageNtHeader( modinfo.lpBaseOfDll ); + nt_header = ImageNtHeader( modinfo.lpBaseOfDll ); checksum_correct = nt_header->OptionalHeader.CheckSum; checksum_orig = checksum_new = 0xdeadbeef; @@ -377,10 +374,6 @@ START_TEST(integrity) file_size_orig = get_file_size(); - hNtdll = LoadLibraryA("ntdll.dll"); - if (hNtdll) - pRtlImageNtHeader = (void *) GetProcAddress(hNtdll, "RtlImageNtHeader"); - first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); test_get_certificate(test_cert_data, first); test_remove_certificate(first); @@ -408,6 +401,5 @@ START_TEST(integrity) test_pe_checksum(); - if (hNtdll) FreeLibrary(hNtdll); DeleteFileA(test_dll_path); }

1 0

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

Feb. 15, 2021

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 Feb. 15, 2021

Feb. 15, 2021

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

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

Feb. 15, 2021

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 Feb. 15, 2021

Feb. 15, 2021

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

Alexandre Julliard : Wine release 6.2
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

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 : d3d11: Report D3D11_FORMAT_SUPPORT_BUFFER in CheckFormatSupport().
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

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

Tag wine-6.2 : Alexandre Julliard : Release 6.2
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: refs/tags/wine-6.2 Tag: eb36392e7b7742912d360343986d05eb4e0307ef URL: https://source.winehq.org/git/wine.git/?a=tag;h=eb36392e7b7742912d360343986… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:35:58 2021 +0100 Release 6.2

1 0

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

Feb. 12, 2021

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

Alexandre Julliard : kernel32/tests: Load GetMappedFileNameW() dynamically.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 75030285da81e154daccba5c4ad307c69c866c1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=75030285da81e154daccba5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 18:20:29 2021 +0100 kernel32/tests: Load GetMappedFileNameW() dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 118984eec75..d8eb61fceab 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -26,7 +26,6 @@ #include <windows.h> #include <winternl.h> #include <winreg.h> -#include <psapi.h> #include "wine/test.h" #include "wine/heap.h" #include "wine/rbtree.h" @@ -51,6 +50,7 @@ static NTSTATUS (WINAPI *pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCL static NTSTATUS (WINAPI *pDbgUiConnectToDbg)(void); static HANDLE (WINAPI *pDbgUiGetThreadDebugObject)(void); static void (WINAPI *pDbgUiSetThreadDebugObject)(HANDLE); +static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE,void*,WCHAR*,DWORD); static LONG child_failures; @@ -909,7 +909,7 @@ static void check_dll_event( HANDLE process, DEBUG_EVENT *ev ) case CREATE_PROCESS_DEBUG_EVENT: break; case LOAD_DLL_DEBUG_EVENT: - if (!GetMappedFileNameW( process, ev->u.LoadDll.lpBaseOfDll, module, MAX_PATH )) module[0] = 0; + if (!pGetMappedFileNameW( process, ev->u.LoadDll.lpBaseOfDll, module, MAX_PATH )) module[0] = 0; if ((p = wcsrchr( module, '\\' ))) p++; else p = module; if (!wcsicmp( p, L"ole32.dll" )) ole32_mod = ev->u.LoadDll.lpBaseOfDll; @@ -1954,7 +1954,9 @@ START_TEST(debugger) hdll=GetModuleHandleA("kernel32.dll"); pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); - + pGetMappedFileNameW = (void*)GetProcAddress(hdll, "GetMappedFileNameW"); + if (!pGetMappedFileNameW) pGetMappedFileNameW = (void*)GetProcAddress(LoadLibraryA("psapi.dll"), + "GetMappedFileNameW"); ntdll = GetModuleHandleA("ntdll.dll"); pDbgBreakPoint = (void*)GetProcAddress(ntdll, "DbgBreakPoint"); pNtSuspendProcess = (void*)GetProcAddress(ntdll, "NtSuspendProcess");

1 0