wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Julian Rüger : German translation for release 4.14.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: e7bf50b79a3c4ff70d785f13e36fc27b15058cc4 URL: https://source.winehq.org/git/website.git/?a=commit;h=e7bf50b79a3c4ff70d785… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 11:13:40 2019 +0200 German translation for release 4.14. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019081701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019081701.xml b/news/de/2019081701.xml new file mode 100644 index 0000000..438d529 --- /dev/null +++ b/news/de/2019081701.xml @@ -0,0 +1,15 @@ +<news> +<date>17. August 2019</date> +<title>Wine 4.14 freigegeben</title> +<body> + Die Entwicklungsversion 4.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine mit Aktualisierungen des Mono-Projekts.</li> + <li>PE-DLLs sind nicht mehr auf die MinGW-Laufzeit angewiesen.</li> + <li>Korrekturen der Ausnahmebehandlung unter ARM64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation of WineConf announcement.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: 54ed92f349e18d397165aabf9c497e35758714f3 URL: https://source.winehq.org/git/website.git/?a=commit;h=54ed92f349e18d397165a… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 11:06:22 2019 +0200 German translation of WineConf announcement. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019080901.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2019080901.xml b/news/de/2019080901.xml new file mode 100644 index 0000000..d50faa9 --- /dev/null +++ b/news/de/2019080901.xml @@ -0,0 +1,14 @@ +<news> +<date>9. August 2019</date> +<title>WineConf 2019</title> +<body> +Das Wine-Projekt ist erfreut verkünden zu können, dass die diesjährige WineConf 2019 +vom 12. - 13. Oktober in Toronto, Kanada stattfinden wird. +WineConf ist die jährliche Konferenz des Wine-Projekts, bei der sich +Mitglieder der Wine-Community, der breiteren Freie-Software-Bewegung und interessierte +Anwender treffen, um sich bei Essen und Getränken auszutauschen. Traditionell finden +auch Vorträge einiger Teilnehmer statt, sowie formelle und informelle Diskussionen +zu diversen Themen über und um Wine. +Weitere Details dazu auf der <a href="https://wiki.winehq.org/WineConf2019">WineConf2019-Seite</a> +im Wine-Wiki. +</body></news>

1 0

Julian Rüger : German translation for release 4.13.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: website Branch: master Commit: 7d5119a802590adc908bd46ea8d92c3f8a91a99e URL: https://source.winehq.org/git/website.git/?a=commit;h=7d5119a802590adc908bd… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Sep 4 10:55:18 2019 +0200 German translation for release 4.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019080201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2019080201.xml b/news/de/2019080201.xml new file mode 100644 index 0000000..f1ad954 --- /dev/null +++ b/news/de/2019080201.xml @@ -0,0 +1,14 @@ +<news> +<date>2. August 2019</date> +<title>Wine 4.13 freigegeben</title> +<body> + Die Entwicklungsversion 4.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Passport-HTTP-Umleitungen.</li> + <li>Eine Menge Header-Updates.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Switch to the zstd compression algorithm in BackupVM.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 84adbe64cb3a65afda1372d5b1915edacc336762 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84adbe64cb3a65afda1372d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:38:16 2019 +0200 testbot: Switch to the zstd compression algorithm in BackupVM. This requires borgbackup >= 1.1.4 (e.g. from Debian 10). The compression drops a few percentage points compared to the previous lzma settings but this makes restoration much faster. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/BackupVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/BackupVM b/testbot/scripts/BackupVM index d7e5483..124e222 100755 --- a/testbot/scripts/BackupVM +++ b/testbot/scripts/BackupVM @@ -318,7 +318,7 @@ if [ -n "$opt_borg" ] then borg_opts="" [ -n "$opt_verbose" ] && borg_opts="$borg_opts --verbose" - dry_run $nice borg create --progress --stats -C lzma,9 \ + dry_run $nice borg create --progress --stats -C zstd,22 \ "$opt_borg::$backup" $all_paths rc_borg=$? if [ $rc_borg -ne 0 ]

1 0

Francois Gouget : testbot: Centralize adding ccache to $PATH for build scripts.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 0d401a38ec6632ac4b602efff4afe6acc8c47fc4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d401a38ec6632ac4b602ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:37:17 2019 +0200 testbot: Centralize adding ccache to $PATH for build scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 -- testbot/bin/build/Reconfig.pl | 2 -- testbot/bin/build/WineReconfig.pl | 2 -- testbot/bin/build/WineTest.pl | 2 -- testbot/lib/Build/Utils.pm | 2 ++ testbot/lib/WineTestBot/Config.pm | 5 +++++ 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 894686d..f23b733 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -114,8 +114,6 @@ sub BuildTestExecutables($$$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index c43fbda..72725bf 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -110,8 +110,6 @@ sub UpdateWineBuilds($$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 4e03c31..9f0544e 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -142,8 +142,6 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index f848157..a399736 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -209,8 +209,6 @@ sub TestExe($$$) # Setup and command line processing # -$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; - my $Action = ""; my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 61b47a7..d31db82 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -40,6 +40,8 @@ use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; +WineTestBot::Config::PrependPaths("/usr/lib/ccache"); + # # Logging and error handling diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b72968c..b68c4f5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -73,6 +73,11 @@ $BinDir = "$::RootDir/bin"; delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec $ENV{PATH} = "/usr/bin:/bin"; +sub PrependPaths(@) +{ + map { $ENV{PATH} = "$_:$ENV{PATH}" if (-d $_) } reverse @_; +} + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1;

1 0

Francois Gouget : testbot: Centralize the $PATH cleanup.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: tools Branch: master Commit: 1ee59b55d259bfd260e867ffcc7e0b284caeb7ca URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ee59b55d259bfd260e867f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 4 15:36:58 2019 +0200 testbot: Centralize the $PATH cleanup. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 2 -- testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 2 -- testbot/bin/WineRunReconfig.pl | 2 -- testbot/bin/WineRunTask.pl | 2 -- testbot/bin/WineRunWineTest.pl | 2 -- testbot/bin/WineSendLog.pl | 2 -- testbot/lib/WineTestBot/Config.pm | 2 ++ testbot/lib/WineTestBot/VMs.pm | 1 - testbot/scripts/CheckWineTestBot.pl | 2 -- 11 files changed, 2 insertions(+), 18 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9ffdf96..81d3afc 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -741,7 +741,6 @@ sub main() exit 1; } - $ENV{PATH} = "/usr/bin:/bin"; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index e766285..537a0dc 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -76,8 +76,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $DryRun); while (@ARGV) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a078fcb..4000c14 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -87,8 +87,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - # Grab the command line options my ($Usage, $Action, $VMKey); while (@ARGV) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index b1349f0..fdcf770 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -72,8 +72,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 378bd94..493ab10 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -73,8 +73,6 @@ sub Error(@) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index e6112fd..6a71849 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -103,8 +103,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index a74877a..74b974a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -102,8 +102,6 @@ sub TakeScreenshot($$) # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 28644fb..721122e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -406,8 +406,6 @@ EOF # Setup and command line processing # -$ENV{PATH} = "/usr/bin:/bin"; - my $Usage; sub ValidateNumber($$) { diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index d6267de..b72968c 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -71,6 +71,8 @@ $BinDir = "$::RootDir/bin"; # Sanitize the environment for system() & co delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec +$ENV{PATH} = "/usr/bin:/bin"; + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6770547..5d738e2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -447,7 +447,6 @@ sub Run($$$$$$) WineTestBot::Log::LogMsg("Starting child: @$Args\n"); $ChildSetup->($VM, $SetupData); - $ENV{PATH} = "/usr/bin:/bin"; exec(@$Args) or WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n"); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 0af2550..3ca4fde 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -38,8 +38,6 @@ sub BEGIN use WineTestBot::Config; use WineTestBot::Engine::Notify; -$ENV{PATH} = "/usr/bin:/bin"; - my $rc = 0; if (! PingEngine()) {

1 0

Alex Henrie : ntdll: Implement RtlIpv4StringToAddress(Ex)A.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 363b8809f37b3ea5915ea4240b3d397fd2355e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=363b8809f37b3ea5915ea424… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 25 18:36:50 2019 -0600 ntdll: Implement RtlIpv4StringToAddress(Ex)A. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46149 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b8f5415..94e70e5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -760,8 +760,8 @@ @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringW(ptr ptr) -# @ stub RtlIpv4StringToAddressA -# @ stub RtlIpv4StringToAddressExA +@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) +@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) # @ stub RtlIpv6AddressToStringA diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 72ecfd9..15ff037 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1040,6 +1040,41 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const } /*********************************************************************** + * RtlIpv4StringToAddressExA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port) +{ + WCHAR wstr[32]; + + TRACE("(%s, %u, %p, %p)\n", debugstr_a(str), strict, address, port); + + if (!str || !address || !port) + return STATUS_INVALID_PARAMETER; + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + return ipv4_string_to_address(wstr, strict, NULL, address, port); +} + +/*********************************************************************** + * RtlIpv4StringToAddressA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address) +{ + WCHAR wstr[32]; + const WCHAR *wterminator; + NTSTATUS ret; + + TRACE("(%s, %u, %p, %p)\n", debugstr_a(str), strict, terminator, address); + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + ret = ipv4_string_to_address(wstr, strict, &wterminator, address, NULL); + if (terminator) *terminator = str + (wterminator - wstr); + return ret; +} + +/*********************************************************************** * RtlIpv6StringToAddressExW [NTDLL.@] */ NTSTATUS NTAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 955bd00..fca0688 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1102,8 +1102,8 @@ @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringW(ptr ptr) -@ stub RtlIpv4StringToAddressA -@ stub RtlIpv4StringToAddressExA +@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) ntdll.RtlIpv4StringToAddressA +@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) ntdll.RtlIpv4StringToAddressExA @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) @ stub RtlIpv6AddressToStringA

1 0

Alex Henrie : ntdll: Implement RtlIpv4StringToAddress(Ex)W.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: e9ee0df5d285e71d2d5564ef0846e4f456053b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ee0df5d285e71d2d5564ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 25 18:36:49 2019 -0600 ntdll: Implement RtlIpv4StringToAddress(Ex)W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46149 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e0d8551..72ecfd9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -884,13 +884,150 @@ void WINAPI RtlCopyLuidAndAttributesArray( for (i = 0; i < Count; i++) Dest[i] = Src[i]; } +static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) +{ + static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ + }; + int base = 10, d; + WCHAR c; + ULONG cur_value, prev_value = 0; + BOOL success = FALSE; + + if (**str == '.') + { + *str += 1; + return FALSE; + } + + if ((*str)[0] == '0') + { + if ((*str)[1] == 'x' || (*str)[1] == 'X') + { + *str += 2; + if (strict) return FALSE; + base = 16; + } + else if ((*str)[1] >= '0' && (*str)[1] <= '9') + { + *str += 1; + if (strict) return FALSE; + base = 8; + } + } + + for (cur_value = 0; **str; *str += 1) + { + c = **str; + if (c >= ARRAY_SIZE(hex_table)) break; + d = hex_table[c]; + if (d == -1 || d >= base) break; + cur_value = cur_value * base + d; + success = TRUE; + if (cur_value < prev_value) return FALSE; /* overflow */ + prev_value = cur_value; + } + + if (success) *value = cur_value; + return success; +} + +static NTSTATUS ipv4_string_to_address(const WCHAR *str, BOOL strict, + const WCHAR **terminator, IN_ADDR *address, USHORT *port) +{ + ULONG fields[4]; + int n = 0; + + for (;;) + { + if (!parse_ipv4_component(&str, strict, &fields[n])) + goto error; + n++; + if (*str != '.') + break; + if (n == 4) + goto error; + str++; + } + + if (strict && n < 4) + goto error; + + switch (n) + { + case 4: + if (fields[0] > 0xFF || fields[1] > 0xFF || fields[2] > 0xFF || fields[3] > 0xFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = fields[1]; + address->S_un.S_un_b.s_b3 = fields[2]; + address->S_un.S_un_b.s_b4 = fields[3]; + break; + case 3: + if (fields[0] > 0xFF || fields[1] > 0xFF || fields[2] > 0xFFFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = fields[1]; + address->S_un.S_un_b.s_b3 = (fields[2] & 0xFF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[2] & 0x00FF); + break; + case 2: + if (fields[0] > 0xFF || fields[1] > 0xFFFFFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = (fields[1] & 0xFF0000) >> 16; + address->S_un.S_un_b.s_b3 = (fields[1] & 0x00FF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[1] & 0x0000FF); + break; + case 1: + address->S_un.S_un_b.s_b1 = (fields[0] & 0xFF000000) >> 24; + address->S_un.S_un_b.s_b2 = (fields[0] & 0x00FF0000) >> 16; + address->S_un.S_un_b.s_b3 = (fields[0] & 0x0000FF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[0] & 0x000000FF); + break; + default: + goto error; + } + + if (terminator) *terminator = str; + + if (*str == ':') + { + str++; + if (!parse_ipv4_component(&str, FALSE, &fields[0])) + goto error; + if (!fields[0] || fields[0] > 0xFFFF || *str) + goto error; + if (port) + { + *port = htons(fields[0]); + if (terminator) *terminator = str; + } + } + + if (!terminator && *str) + return STATUS_INVALID_PARAMETER; + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + /*********************************************************************** * RtlIpv4StringToAddressExW [NTDLL.@] */ NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port) { - FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, address, port); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %u, %p, %p)\n", debugstr_w(str), strict, address, port); + if (!str || !address || !port) return STATUS_INVALID_PARAMETER; + return ipv4_string_to_address(str, strict, NULL, address, port); } /*********************************************************************** @@ -898,8 +1035,8 @@ NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_A */ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address) { - FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, terminator, address); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %u, %p, %p)\n", debugstr_w(str), strict, terminator, address); + return ipv4_string_to_address(str, strict, terminator, address, NULL); } /***********************************************************************

1 0

Francois Gouget : ntoskrnl/tests: Declare the driver subtest.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: c9f222e775a4b9a2c032a3977b31932db2c5b3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f222e775a4b9a2c032a397… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 04:14:40 2019 +0200 ntoskrnl/tests: Declare the driver subtest. It may print test failures and as such should be declared by its parent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 86dce75..eb58878 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,7 @@ START_TEST(ntoskrnl) pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); + subtest("driver"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; if (!start_driver(service))

1 0

Francois Gouget : msi/tests: Declare the custom subtest.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 208ff02005e183a9f9b153644e06ace3e865df5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=208ff02005e183a9f9b15364… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 04:14:34 2019 +0200 msi/tests: Declare the custom subtest. It may print test failures and as such should be declared by its parent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 1 + dlls/msi/tests/install.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index c0d67c3..6be56f7 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6519,6 +6519,7 @@ START_TEST(action) BOOL ret = FALSE; init_functionpointers(); + subtest("custom"); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1747a44..8a9e98c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6235,6 +6235,7 @@ START_TEST(install) BOOL ret = FALSE; init_functionpointers(); + subtest("custom"); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

← Newer
1
...
56
57
58
59
60
61
62
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019