December 2017 - Wine-commits

Alex Henrie : appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 70366fcd9001ba05a058de193e750bb977c32cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70366fcd9001ba05a058de193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 12 19:55:37 2017 -0700 appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5ec49cf..76f00a0 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -80,6 +80,9 @@ typedef struct { LPCWSTR dialog_template; } addon_info_t; +/* Download addon files over HTTP because Wine depends on an external library + * for TLS, so we can't be sure that HTTPS will work. The integrity of each file + * is checked with a hardcoded cryptographically secure hash. */ static const addon_info_t addons_info[] = { { GECKO_VERSION,

1 0

Hans Leidekker : dplayx/tests: Remove the firewall exception after running the tests.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: ca9ca79d12e6e5031067d20d0afb30f34fc54759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ca79d12e6e5031067d20d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 13 13:59:37 2017 +0100 dplayx/tests: Remove the firewall exception after running the tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0786d16..f4e7301 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6951,7 +6951,7 @@ START_TEST(dplayx) if (!winetest_interactive) { skip("Run in interactive mode to run all dplayx tests.\n"); - return; + goto done; } trace("Running in interactive mode, tests will take a while\n"); @@ -6991,6 +6991,8 @@ START_TEST(dplayx) test_remote_data_replication(); test_host_migration(); +done: FreeLibrary(module); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Martin Storsjo : msvcrt: Fix copy/paste typos in arm64 setjmp/longjmp.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 49c3351fd76f684a614e95f71413cac487fa2540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c3351fd76f684a614e95f71… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 13 11:02:22 2017 +0200 msvcrt: Fix copy/paste typos in arm64 setjmp/longjmp. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index b024d49..904d006 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -150,7 +150,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ @@ -182,7 +182,7 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */

1 0

Francois Gouget : testbot: Assorted wording fixes.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 7aa19f46807d2db27a2203c62e6b1e7e8f65f62a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7aa19f46807d2db27a2203c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 8 04:27:47 2017 +0100 testbot: Assorted wording fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2e23976..62024d9 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -394,7 +394,7 @@ EOF { # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine - # so all any failure it reported not caused by this patch. + # so any failure it reported is not caused by this patch. $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", $BaseName, $StepTask->CmdLineArg); } diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 6c1bd1d..d441860 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -521,7 +521,7 @@ sub KeyChanged($$$) if (defined($self->{Items}{$NewKey})) { - die "Cant change key, new key $NewKey already exists"; + die "Could not change key, new key $NewKey already exists"; } $FullKey = $self->GetFullKey($NewKey); $ScopeItems->{$FullKey} = $Item if (defined $FullKey); diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2139b6d..7b18df9 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -190,7 +190,7 @@ From: $RobotEMail To: $Recipient Subject: winetestbot account request -password reset request for your account $UserName was received via the website. +A password reset request for your account $UserName was received via the website. You can pick a new password by going to: $URL EOF

1 0

Francois Gouget : testbot: Document Collection::DeleteItem().
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 942bf9d4885ccd0ba940aec95f3e26a0b905642b URL: http://source.winehq.org/git/tools.git/?a=commit;h=942bf9d4885ccd0ba940aec9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:20:24 2017 +0100 testbot: Document Collection::DeleteItem(). In particular note that it cascades to other tables that have foreign keys to the row being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1b29ec1..6c1bd1d 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -550,6 +550,20 @@ sub GetMasterCols($) return ($self->{MasterColNames}, $self->{MasterColValues}); } +=pod +=over 12 + +=item C<DeleteItem()> + +Deletes the specified Item from the Collection and the database backing it. + +Note that if there are other tables with a foreign key referencing this item +the corresponding rows will be deleted too. So for instance deleting a Job +will also delete the Steps and Tasks it is composed of. + +=back +=cut + sub DeleteItem($$) { my ($self, $Item) = @_;

1 0

Francois Gouget : testbot/testagentd: Detach from the console if given the --detach option.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: f1d368722b65c253720e2aa73fc1fb6be8f46b25 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f1d368722b65c253720e2aa7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:29:25 2017 +0100 testbot/testagentd: Detach from the console if given the --detach option. This makes it possible to close the console without killing testagentd, and to start the tests from a non-minimized window. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform.h | 3 +++ testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ testbot/src/testagentd/platform_windows.c | 5 +++++ testbot/src/testagentd/testagentd.c | 11 ++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index ea807fb..84ab491 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -58,6 +58,9 @@ typedef int SOCKET; int platform_init(void); +/* Detach from the console so closing it won't kill testagentd. */ +void platform_detach_console(void); + enum run_flags_t { RUN_DNT = 1, RUN_DNTRUNC_OUT = 2, diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index b27c016..dcd4d69 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -328,6 +328,21 @@ void ta_freeaddrinfo(struct addrinfo *addresses) return freeaddrinfo(addresses); } +void platform_detach_console(void) +{ + pid_t pid; + + pid = fork(); + if (pid != 0) + exit(0); + + /* Daemonize */ + signal(SIGHUP, SIG_IGN); + pid = fork(); + if (pid != 0) + exit(0); +} + int platform_init(void) { struct sigaction sa, osa; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 70272a6..1efac1c 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -450,6 +450,11 @@ void ta_freeaddrinfo(struct addrinfo *addresses) } } +void platform_detach_console(void) +{ + FreeConsole(); +} + int platform_init(void) { HMODULE hdll; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fce28b2..5f0f54c 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1218,6 +1218,7 @@ int main(int argc, char** argv) { const char* p; char** arg; + int opt_detach = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1242,6 +1243,10 @@ int main(int argc, char** argv) { opt_debug = 1; } + else if (strcmp(*arg, "--detach") == 0) + { + opt_detach = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1313,7 +1318,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); @@ -1321,9 +1326,13 @@ int main(int argc, char** argv) printf(" PORT The port to listen on for connections.\n"); printf(" SRCHOST If specified, only connections from this host will be accepted.\n"); printf(" --debug Prints detailed information about what happens.\n"); + printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); + printf(" combine this with start: start %s --detach ...\n", name0); printf(" --help Shows this usage message.\n"); exit(0); } + if (opt_detach) + platform_detach_console(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC

1 0

Francois Gouget : testbot: Minor cosmetic tweaks to the installation guide.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 34adab8664660164d7dbf197bbd2204695373cde URL: http://source.winehq.org/git/tools.git/?a=commit;h=34adab8664660164d7dbf197… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:29:39 2017 +0100 testbot: Minor cosmetic tweaks to the installation guide. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 9947150..15b2b91 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -42,7 +42,7 @@ General setup for the web site: cd var touch log mkdir jobs latest patches socket staging - sudo chown WWWRUN:winehq staging + sudo chown wwwrun:winehq staging chmod g+w * - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. @@ -120,7 +120,7 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to - have 64bit VMs then make sure MinGW can generate 64bit PE executables. + have 64 bit VMs then make sure MinGW can generate 64 bit PE executables. - You may also want to install ccache. - You will also need genisoimage. - Create a new user, 'testbot' for instance, and log in as that user.

1 0

Zebediah Figura : testbot: Run make_makefiles when a file is added or removed.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 6ab34c18e8b916323ec08fdfd1d1a24491ba3368 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6ab34c18e8b916323ec08fdf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 6 20:45:19 2017 -0600 testbot: Run make_makefiles when a file is added or removed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n";

1 0

Zebediah Figura : testbot: Rebuild the tools when they are modified.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 60e0adff6f0bfe497541859ec2c04556865b97c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=60e0adff6f0bfe497541859e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 13 17:43:26 2017 +0100 testbot: Rebuild the tools when they are modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 82cd66a..96cf741 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedBuildNative = !1; my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; @@ -85,8 +86,8 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || - ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) + (! $NeedBuildNative || ! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || + ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) { @@ -117,6 +118,14 @@ sub ApplyPatch($$$) { $NeedMakeMakefiles = $NeedConfigure = 1; } + elsif ($Line =~ m=^diff.*tools/makedep.c=) + { + $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; + } + elsif ($Line =~ m=^diff.*tools/(?:winebuild|wrc)=) + { + $NeedBuildNative = 1; + } } close FH; } @@ -132,6 +141,15 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedBuildNative) + { + InfoMsg "Building tools\n"; + if (!BuildNative()) + { + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedMakeMakefiles) { InfoMsg "Running make_makefiles\n"; @@ -190,6 +208,25 @@ sub CountCPUs() $ncpus ||= 1; } +sub BuildNative() +{ + mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + system("( cd $DataDir/build-native && set -x && " . + " rm -rf * && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus __tooldeps__ " . + ") >>$LogDir/Build.log 2>&1"); + + if ($? != 0) + { + LogMsg "Build native failed\n"; + return !1; + } + + return 1; +} + sub BuildTestExecutable($$$$$$$$) { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile,

1 0

Alexandre Julliard : explorer: Fix parsing command line that contains spaces.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: ff53db7e6396337692ed2966ef3bf49a4737e3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff53db7e6396337692ed2966e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 09:33:32 2017 +0100 explorer: Fix parsing command line that contains spaces. Reported by Alistair Leslie-Hughes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index afb565f..ac5bebb 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -658,7 +658,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) return folder; } -static int copy_path_string(LPWSTR target, LPWSTR source) +static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -667,10 +667,9 @@ static int copy_path_string(LPWSTR target, LPWSTR source) if (*source == '\"') { source ++; - while (*source != '\"') target[i++] = *source++; + while (*source && *source != '\"') target[i++] = *source++; target[i] = 0; - source ++; - i+=2; + if (*source) source++; } else { @@ -678,7 +677,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return source; } @@ -741,12 +740,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) { p += sizeof(arg_root)/sizeof(WCHAR); - p+=copy_path_string(parameters->root,p); + p = copy_path_string(parameters->root,p); } else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) { p += sizeof(arg_select)/sizeof(WCHAR); - p+=copy_path_string(parameters->selection,p); + p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection);

1 0