September 2019 - Wine-commits

Francois Gouget : testbot/reporttest: Add coverage for subtests.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: bc12f450f633625b58b9fd7b4c79a1acdba132ac URL: https://source.winehq.org/git/tools.git/?a=commit;h=bc12f450f633625b58b9fd7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 11:18:05 2019 +0200 testbot/reporttest: Add coverage for subtests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 2d074f9..00b6c2b 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -557,7 +557,17 @@ comctl32:tooltips start dlls/comctl32/tests/toolbar.c - ----- Expected assessement: crashed comctl32:tooltips done (3221225477) in 0s -stub comctl32:trackbar +comctl32:trackbar start dlls/comctl32/tests/trackbar.c - +----- A unit test with a subtest +trackbar.c:496: Subtest driver +driver.c:40: Test failed: Something wrong +driver.c:41: Test succeeded inside todo block: Something right! +driver.c:42: Test marked todo: Hello Wine! +driver.c:43: Tests skipped: Another time +----- Expected assessement: 2 failures, 1 todo, 1 skip +07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:trackbar:07b1 done (2) in 0s + stub comctl32:treeview stub comctl32:updown stub comdlg32:filedlg

1 0

Francois Gouget : winetest: Add support for WineTest's subtests.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: tools Branch: master Commit: 057a6d205baad9d32d041fcc6ebca736efe6e65e URL: https://source.winehq.org/git/tools.git/?a=commit;h=057a6d205baad9d32d041fc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 12 11:18:19 2019 +0200 winetest: Add support for WineTest's subtests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e5b2815..1bbd78e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,6 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard +# Copyright (C) 2017, 2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -442,8 +443,9 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); 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); @@ -455,9 +457,9 @@ sub get_source_link($$) my $source_link = defined $_unit ? "$_unit.c" : $source ne "-" ? $source : "$dll:$unit"; $source_link .= ":$_lnum" if (defined $_lnum); - if (defined $_unit and $_unit ne $unit) + if (defined $_unit and !$units{$_unit}) { - # If the line is not for the current test unit we'll let its + # If the line is not for a current test unit we'll let its # developer hash it out with the polluter ;-) $broken = 1; } @@ -481,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if ($l_unit ne $unit) + if (!$units{$l_unit}) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++; @@ -576,7 +578,8 @@ sub close_test_unit($) mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } - $dll = $unit = ""; + $dll = $unit = $units_re = ""; + %units = (); $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; @@ -599,6 +602,8 @@ while ($line = <IN>) { close_test_unit(0) if ($dll ne ""); ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + %units = ($unit => 1); + $units_re = join("|", keys %units); $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -609,40 +614,56 @@ while ($line = <IN>) { $rc = 0; } } + elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/) + { + my ($l_unit, $l_subunit) = ($1, $2); + if ($units{$l_unit}) + { + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); + } + else + { + add_test_line("end", "Misplaced $l_subunit subtest\n"); + $extra_failures++; + } + } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("failed", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "failure"); $failures++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Test marked todo: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Test marked todo: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Test marked todo: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("todo", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); + check_unit($l_unit, "todo"); $todo++; } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (Tests skipped: .*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (Tests skipped: .*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (Tests skipped: .*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("skipped", escapeHTML($pollution) . get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); # Don't complain and don't count misplaced skips - $skipped++ if ($l_unit eq $unit); + $skipped++ if ($units{$l_unit}); } elsif ($line =~ /^()([_a-z0-9]+)\.c:(\d+): (.*)$/ or ($unit ne "" and - $line =~ /^(.*?)($unit)\.c:(\d+): (.*)$/)) + $line =~ /^(.*?)($units_re)\.c:(\d+): (.*)$/)) { my ($pollution, $l_unit, $l_num, $l_text) = ($1, $2, $3, $4); add_test_line("trace", escapeHTML($pollution) . @@ -651,10 +672,10 @@ while ($line = <IN>) { } elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); - if ($l_unit eq $unit) + if ($units{$l_unit}) { # This also replaces a test summary line. $pids{$l_pid || 0} = 1; @@ -706,6 +727,9 @@ while ($line = <IN>) { # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + %units = ($unit => 1); + $units_re = join("|", keys %units); + $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++;

1 0

Alexandre Julliard : Update Józef's picture.
by Alexandre Julliard 12 Sep '19

12 Sep '19

Module: website Branch: master Commit: 5ebb89ee8402e10664dbe60d4011c21d4ba89211 URL: https://source.winehq.org/git/website.git/?a=commit;h=5ebb89ee8402e10664dbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 12 19:05:50 2019 +0200 Update Józef's picture. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- "images/Jo\314\201zef-Kucia.png" | Bin 478739 -> 982965 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git "a/images/Jo\314\201zef-Kucia.png" "b/images/Jo\314\201zef-Kucia.png" index 749e07a7..ba402a7a 100644 Binary files "a/images/Jo\314\201zef-Kucia.png" and "b/images/Jo\314\201zef-Kucia.png" differ

1 0

Andrew Eikum : winebus.sys: Don't WARN about backends we didn't build.
by Alexandre Julliard 11 Sep '19

11 Sep '19

Module: wine Branch: master Commit: 439b80e4c43393fdab71cd5826c7c59bbe038529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=439b80e4c43393fdab71cd58… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 11 09:25:38 2019 -0500 winebus.sys: Don't WARN about backends we didn't build. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 5 ++++- dlls/winebus.sys/bus_udev.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 7933374007..cda77e3011 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -409,6 +409,7 @@ NTSTATUS iohid_driver_init(void) return STATUS_UNSUCCESSFUL; } + TRACE("Initialization successful\n"); return STATUS_SUCCESS; } @@ -429,7 +430,6 @@ void iohid_driver_unload( void ) NTSTATUS iohid_driver_init(void) { - WARN("IOHID Support not compiled into Wine.\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d24e21cff8..d3a1a19eeb 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1145,9 +1145,13 @@ NTSTATUS sdl_driver_init(void) map_controllers = check_bus_option(&controller_mode, 1); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) + { + WARN("CreateEvent failed\n"); return STATUS_UNSUCCESSFUL; + } if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) { + WARN("CreateThread failed\n"); CloseHandle(events[0]); return STATUS_UNSUCCESSFUL; } @@ -1171,7 +1175,6 @@ sym_not_found: NTSTATUS sdl_driver_init(void) { - WARN("compiled without SDL support\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d9311a9b03..20841b09ae 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1529,7 +1529,6 @@ error: NTSTATUS udev_driver_init(void) { - WARN("Wine was compiled without UDEV support\n"); return STATUS_NOT_IMPLEMENTED; }

1 0

Zhiyi Zhang : user32/tests: Fix some msg test failures.
by Alexandre Julliard 11 Sep '19

11 Sep '19

Module: wine Branch: master Commit: a3948047dde36ca6250557119e468a8b662b73e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3948047dde36ca625055711… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 11 20:54:36 2019 +0800 user32/tests: Fix some msg test failures. These test failures sometimes happen on some TestBots. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..73beb4d771 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -567,6 +567,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { { WM_GETTITLEBARINFOEX, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, + { WM_SYNCPAINT, sent|optional }, { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ @@ -837,6 +838,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* CreateWindow(WS_VISIBLE) for popup window */ @@ -3477,6 +3479,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { WM_MDIACTIVATE, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* WM_MDIMAXIMIZE for an MDI child window with invisible parent */ @@ -13613,6 +13616,8 @@ static const struct message WmCreateDialogParamSeq_3[] = { { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, { WM_ACTIVATE, sent|parent|wparam, 1 }, @@ -16541,16 +16546,16 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); - ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), - "unexpected error %d\n", GetLastError()); - if (ret == TRUE) { skip("hotkeys not supported\n"); return; } + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + test_window = CreateWindowExA(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL);

1 0

Alistair Leslie-Hughes : include: Correct DSFX_I3DL2REVERB_ROOM_MIN value.
by Alexandre Julliard 11 Sep '19

11 Sep '19

Module: wine Branch: master Commit: 332dc23f36f4b5f61f7f177a07619570af1bb0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332dc23f36f4b5f61f7f177a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 11 00:42:42 2019 +0000 include: Correct DSFX_I3DL2REVERB_ROOM_MIN value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dsound.h b/include/dsound.h index 74b4bcdb4a..b4a2509e89 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -491,7 +491,7 @@ typedef struct _DSFXI3DL2Reverb #define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f #define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f #define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) -#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MIN (-10000) #define DSFX_I3DL2REVERB_ROOM_MAX 0 #define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) #define DSFX_I3DL2REVERB_ROOMHF_MAX 0

1 0

Sven Baars : winex11.drv: Fix a memory leak (Coverity).
by Alexandre Julliard 11 Sep '19

11 Sep '19

Module: wine Branch: master Commit: 6033b3a7fbc29bc911b0173499b288ce7f226a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6033b3a7fbc29bc911b01734… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Sep 6 22:24:11 2019 +0200 winex11.drv: Fix a memory leak (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index a37530fdbf..c51954f1bf 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1849,13 +1849,12 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed) + if (!changed || !OpenClipboard( clipboard_hwnd )) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; } - if (!OpenClipboard( clipboard_hwnd )) return FALSE; TRACE( "selection changed, importing\n" ); EmptyClipboard(); is_clipboard_owner = TRUE;

1 0

Michael Stefaniuc : Remembering Józef Kucia.
by Alexandre Julliard 11 Sep '19

11 Sep '19

Module: website Branch: master Commit: 8c648483ed1e8ff8d8bc1e2adfb02b27182210c3 URL: https://source.winehq.org/git/website.git/?a=commit;h=8c648483ed1e8ff8d8bc1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 11 22:29:01 2019 +0200 Remembering Józef Kucia. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- "images/Jo\314\201zef-Kucia.png" | Bin 0 -> 478739 bytes news/en/2019091101.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git "a/images/Jo\314\201zef-Kucia.png" "b/images/Jo\314\201zef-Kucia.png" new file mode 100644 index 00000000..749e07a7 Binary files /dev/null and "b/images/Jo\314\201zef-Kucia.png" differ diff --git a/news/en/2019091101.xml b/news/en/2019091101.xml new file mode 100644 index 00000000..71861001 --- /dev/null +++ b/news/en/2019091101.xml @@ -0,0 +1,26 @@ +<news> +<date>September 11, 2019</date> +<title>Remembering Józef Kucia</title> +<body> +<a href="{$root}/images/Józef-Kucia.png"><img src="{$root}/images/Józef-Kucia.png" + style="margin: 0 20px 20px 0;"/></a> + With great sadness we are announcing the passing of our friend, Józef Kucia. + Józef was a major Wine contributor with over 2500 patches since his first +contribution in 2012. He was a highly talented programmer with a focus on Wine's +Direct3D subsystem. Józef founded and led the vkd3d project and provided insight +and guidance to the Vulkan working group. He also contributed to other open +source projects including Mesa and Debian. + Józef was a regular attendee at the yearly WineConf. A man of few +words, he was helpful and displayed a quiet kindness. His skills +attracted the interest of CodeWeavers and Józef <a +href="https://www.codeweavers.com/about/blogs/jwhite/2019/09/08/a-tragic-loss">joined +their team</a> in 2015. That allowed him to dedicate more of his time +to Wine. + Józef died last month at the young age of 28 in an accident in the Jaskinia +Wielka Śnieżna ("great snowy cave") in the Tatra Mountains in Poland. Caving was +his passion. + + Józef will be remembered with warm memories by those who worked with him. +Our thoughts and condolences go out to Józef's family, friends, loved ones, and +everyone else who grieves his passing. +</body></news>

1 0

Alexandre Julliard : winebuild: Add support for the -B option.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 6ba101b22965d9b9ef66d54c0d12c253db0f4569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba101b22965d9b9ef66d54c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 17:53:19 2019 +0200 winebuild: Add support for the -B option. Based on a patch by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 ++- tools/winebuild/utils.c | 123 ++++++++++++++++++++++----------------- tools/winebuild/winebuild.man.in | 4 ++ 4 files changed, 80 insertions(+), 55 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index bde322cef3..2b67d305e8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -369,6 +369,7 @@ extern FILE *output_file; extern const char *output_file_name; extern struct strarray lib_path; +extern struct strarray tools_path; extern struct strarray as_command; extern struct strarray cc_command; extern struct strarray ld_command; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7d54395860..f4abb55081 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -83,6 +83,7 @@ const char *output_file_name = NULL; static int fake_module; struct strarray lib_path = { 0 }; +struct strarray tools_path = { 0 }; struct strarray as_command = { 0 }; struct strarray cc_command = { 0 }; struct strarray ld_command = { 0 }; @@ -257,6 +258,7 @@ static const char usage_str[] = "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" " -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" -B PREFIX Look for build tools in the PREFIX directory\n" " --cc-cmd=CC C compiler to use for assembling (default: fall back to --as-cmd)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" @@ -316,7 +318,7 @@ enum long_options_values LONG_OPT_VERSION }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; +static const char short_options[] = "B:C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -389,6 +391,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { switch(optc) { + case 'B': + strarray_add( &tools_path, xstrdup( optarg ), NULL ); + break; case 'D': /* ignored */ break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index fe82ad75e9..a73f520ccc 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -281,11 +281,72 @@ int output( const char *format, ... ) return ret; } +static struct strarray get_tools_path(void) +{ + static int done; + static struct strarray dirs; + + if (!done) + { + dirs = strarray_copy( tools_path ); + + /* then append the PATH directories */ + if (getenv( "PATH" )) + { + char *p = xstrdup( getenv( "PATH" )); + while (*p) + { + strarray_add_one( &dirs, p ); + while (*p && *p != PATH_SEPARATOR) p++; + if (!*p) break; + *p++ = 0; + } + } + done = 1; + } + return dirs; +} + +/* find a binary in the path */ +static const char *find_binary( const char *prefix, const char *name ) +{ + struct strarray dirs = get_tools_path(); + unsigned int i, maxlen = 0; + struct stat st; + char *p, *file; + + if (strchr( name, '/' )) return name; + if (!prefix) prefix = ""; + for (i = 0; i < dirs.count; i++) maxlen = max( maxlen, strlen(dirs.str[i]) + 2 ); + file = xmalloc( maxlen + strlen(prefix) + strlen(name) + sizeof(EXEEXT) + 1 ); + + for (i = 0; i < dirs.count; i++) + { + strcpy( file, dirs.str[i] ); + p = file + strlen(file); + if (p == file) *p++ = '.'; + if (p[-1] != '/') *p++ = '/'; + if (*prefix) + { + strcpy( p, prefix ); + p += strlen(p); + *p++ = '-'; + } + strcpy( p, name ); + strcat( p, EXEEXT ); + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + } + free( file ); + return NULL; +} + void spawn( struct strarray args ) { unsigned int i; int status; + const char *argv0 = find_binary( NULL, args.str[0] ); + if (argv0) args.str[0] = argv0; strarray_add_one( &args, NULL ); if (verbose) for (i = 0; args.str[i]; i++) @@ -302,35 +363,8 @@ void spawn( struct strarray args ) /* find a build tool in the path, trying the various names */ struct strarray find_tool( const char *name, const char * const *names ) { - static char **dirs; - static unsigned int count, maxlen; - - char *p, *file; + const char *file; const char *alt_names[2]; - unsigned int i, len; - struct stat st; - - if (!dirs) - { - char *path; - - /* split the path in directories */ - - if (!getenv( "PATH" )) fatal_error( "PATH not set, cannot find required tools\n" ); - path = xstrdup( getenv( "PATH" )); - for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; - dirs = xmalloc( count * sizeof(*dirs) ); - count = 0; - dirs[count++] = p = path; - while (*p) - { - while (*p && *p != PATH_SEPARATOR) p++; - if (!*p) break; - *p++ = 0; - dirs[count++] = p; - } - for (i = 0; i < count; i++) maxlen = max( maxlen, strlen(dirs[i])+2 ); - } if (!names) { @@ -341,34 +375,12 @@ struct strarray find_tool( const char *name, const char * const *names ) while (*names) { - len = strlen(*names) + sizeof(EXEEXT) + 1; - if (target_alias) - len += strlen(target_alias) + 1; - file = xmalloc( maxlen + len ); - - for (i = 0; i < count; i++) + if ((file = find_binary( target_alias, *names ))) { - strcpy( file, dirs[i] ); - p = file + strlen(file); - if (p == file) *p++ = '.'; - if (p[-1] != '/') *p++ = '/'; - if (target_alias) - { - strcpy( p, target_alias ); - p += strlen(p); - *p++ = '-'; - } - strcpy( p, *names ); - strcat( p, EXEEXT ); - - if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) - { - struct strarray ret = empty_strarray; - strarray_add_one( &ret, file ); - return ret; - } + struct strarray ret = empty_strarray; + strarray_add_one( &ret, file ); + return ret; } - free( file ); names++; } fatal_error( "cannot find the '%s' tool\n", name ); @@ -377,6 +389,7 @@ struct strarray find_tool( const char *name, const char * const *names ) struct strarray get_as_command(void) { struct strarray args; + unsigned int i; if (cc_command.count) { @@ -387,6 +400,8 @@ struct strarray get_as_command(void) if (cpu_option) strarray_add_one( &args, strmake("-mcpu=%s", cpu_option) ); if (fpu_option) strarray_add_one( &args, strmake("-mfpu=%s", fpu_option) ); if (arch_option) strarray_add_one( &args, strmake("-march=%s", arch_option) ); + for (i = 0; i < tools_path.count; i++) + strarray_add_one( &args, strmake("-B%s", tools_path.str[i] )); return args; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 1b9b1b088b..12bafd72d3 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -68,6 +68,10 @@ Specify the target CPU and platform on which the generated code will be built. The target specification is in the standard autoconf format as returned by config.sub. .TP +.BI \-B\ directory +Add the directory to the search path for the various binutils tools +like \fBas\fR, \fBnm\fR and \fBld\fR. +.TP .BI \--cc-cmd= cc-command Specify the C compiler to use to compile assembly files; the default is to instead use the assembler specified with \fB--as-cmd\fR.

1 0

Alexandre Julliard : winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree.
by Alexandre Julliard 10 Sep '19

10 Sep '19

Module: wine Branch: master Commit: 0c2cc9bb05815b88286422e714825929d40ec2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2cc9bb05815b88286422e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 10 12:07:01 2019 +0200 winegcc: Fix handling of the --sysroot flag when not building inside the Wine tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a7476dd19d..db46cf6d5d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -213,6 +213,8 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* sysroot; + const char* isysroot; const char* lib_suffix; const char* subsystem; const char* prelink; @@ -567,6 +569,7 @@ static char *get_lib_dir( struct options *opts ) static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; + const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; size_t build_len, target_len; @@ -579,8 +582,10 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); - strcpy( buffer, stdlibpath[i] ); + char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -598,7 +603,8 @@ static char *get_lib_dir( struct options *opts ) strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; - strcpy( buffer, stdlibpath[i] ); + strcpy( buffer, root ); + strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); @@ -646,7 +652,7 @@ static char *get_lib_dir( struct options *opts ) buffer[strlen(buffer) - strlen(libwine)] = 0; return buffer; } - return xstrdup( LIBDIR ); + return strmake( "%s%s", root, LIBDIR ); } static void compile(struct options* opts, const char* lang) @@ -798,13 +804,16 @@ no_compat_defines: /* standard includes come last in the include search path */ if (!opts->wine_objdir && !opts->nostdinc) { + const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, "-I" INCLUDEDIR ); - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); + strarray_add(comp_args, strmake( "-I%s%s", root, INCLUDEDIR )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", + gcc_defs ? "-isystem" : "-I", root, INCLUDEDIR )); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) ); @@ -1418,8 +1427,9 @@ int main(int argc, char **argv) next_is_arg = 1; break; case '-': - if (strcmp("--param", argv[i]) == 0) - next_is_arg = 1; + next_is_arg = (strcmp("--param", argv[i]) == 0 || + strcmp("--sysroot", argv[i]) == 0 || + strcmp("--lib-suffix", argv[i]) == 0); break; } if (next_is_arg) @@ -1496,6 +1506,9 @@ int main(int argc, char **argv) else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) opts.pic = 0; break; + case 'i': + if (!strcmp( "-isysroot", argv[i] )) opts.isysroot = argv[i + 1]; + break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); break; @@ -1637,16 +1650,16 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", argv[i]+1) == 0) linking = -1; - else if (!strncmp("--sysroot", argv[i], 9) && opts.wine_objdir) + else if (!strncmp("--sysroot", argv[i], 9)) { - if (argv[i][9] == '=') opts.wine_objdir = argv[i] + 10; - else opts.wine_objdir = argv[++i]; - raw_compiler_arg = raw_linker_arg = 0; + if (argv[i][9] == '=') opts.sysroot = argv[i] + 10; + else opts.sysroot = argv[i + 1]; + if (opts.wine_objdir) raw_compiler_arg = raw_linker_arg = 0; } else if (!strncmp("--lib-suffix", argv[i], 12) && opts.wine_objdir) { if (argv[i][12] == '=') opts.lib_suffix = argv[i] + 13; - else opts.lib_suffix = argv[++i]; + else opts.lib_suffix = argv[i + 1]; raw_compiler_arg = raw_linker_arg = 0; } break; @@ -1675,6 +1688,7 @@ int main(int argc, char **argv) } } + if (opts.wine_objdir && opts.sysroot) opts.wine_objdir = opts.sysroot; if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n");

1 0