July 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/testagentd: Add a RemoveChildProc RPC.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: 2d08b161f0244f05219dcee936491e140117ec3d URL: http://source.winehq.org/git/tools.git/?a=commit;h=2d08b161f0244f05219dcee9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 23:24:00 2014 +0200 testbot/testagentd: Add a RemoveChildProc RPC. The Wait RPC no longer causes the server to forget about the child process. That reponsibility is transferred to the RemoveChildProc RPC. This is to solve the case where the network connection breaks at just the time when the child process terminates which could cause the server to forget the child process exit status despite it not having reached the client process. --- testbot/lib/WineTestBot/TestAgent.pm | 26 ++++++++++++++++++++++++++ testbot/scripts/TestAgent | 12 ++++++++++-- testbot/src/testagentd/platform.h | 8 ++++++++ testbot/src/testagentd/platform_unix.c | 17 +++++++++++++++++ testbot/src/testagentd/platform_windows.c | 27 ++++++++++++++++++++++++--- testbot/src/testagentd/testagentd.c | 25 ++++++++++++++++++++++++- 6 files changed, 109 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 1acb0cd..2cb61ff 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -39,6 +39,7 @@ my $RPC_WAIT2 = 6; my $RPC_SETTIME = 7; my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; +my $RPC_RMCHILDPROC = 10; my %RpcNames=( $RPC_PING => 'ping', @@ -51,6 +52,7 @@ my %RpcNames=( $RPC_SETTIME => 'settime', $RPC_GETPROPERTIES => 'getproperties', $RPC_UPGRADE => 'upgrade', + $RPC_RMCHILDPROC => 'rmchildproc', ); my $Debug = 0; @@ -1381,4 +1383,28 @@ sub Upgrade($$) return $rc; } +sub RemoveChildProcess($$) +{ + my ($self, $Pid) = @_; + debug("RmChildProcess $Pid\n"); + + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + + # Up to 1.5 a seemingly successful Wait RPC automatically removes child + # processes. + return 1 if ($self->{agentversion} =~ / 1\.[0-5]$/); + + # Send the command + if (!$self->_StartRPC($RPC_RMCHILDPROC) or + !$self->_SendListSize('ArgC', 1) or + !$self->_SendUInt64('Pid', $Pid)) + { + return undef; + } + + # Get the reply + return $self->_RecvList(''); +} + 1; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ac2c914..ec4504f 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -376,14 +376,22 @@ elsif ($Cmd eq "run") if (!($RunFlags & $TestAgent::RUN_DNT)) { $Result = $TA->Wait($Pid, $Timeout, $Keepalive); - print "Child exit status: $Result\n" if (defined $Result); + if (defined $Result) + { + print "Child exit status: $Result\n"; + $TA->RemoveChildProcess($Pid); + } } } } elsif ($Cmd eq "wait") { $Result = $TA->Wait($WaitPid, $Timeout, $Keepalive); - print "Child exit status: $Result\n" if (defined $Result); + if (defined $Result) + { + print "Child exit status: $Result\n"; + $TA->RemoveChildProcess($WaitPid); + } } elsif ($Cmd eq "rm") { diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index c6c0f2e..46e4d37 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -74,11 +74,19 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects); /* If a command was started in the background, waits until either that command * terminates, the specified timeout (in seconds) expires, or the client * disconnects (typically because it got tired of waiting). + * Note that this does not cause the child process to be forgotten, even if it + * did exit. This is so that the client can retrieve the information again if + * needed (e.g. in case it did not receive it due to a network issue). * If no command was started in the background, then reports an error * immediately. */ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); +/* Causes the given child process to be forgotten, which means it will no longer + * be possible to wait for it or retrieve its exit status. + */ +int platform_rmchildproc(SOCKET client, uint64_t pid); + /* Sets the system time to the specified Unix epoch. If the system time is * already within leeway seconds of the specified time, then consider that * the system clock is already correct. diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 75afc81..b27c016 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -194,6 +194,23 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child } debug("process " U64FMT " returned status %u\n", pid, child->status); *childstatus = child->status; + return 1; +} + +int platform_rmchildproc(SOCKET client, uint64_t pid) +{ + struct child_t *child; + + LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) + { + if (child->pid == pid) + break; + } + if (!child || child->pid != pid) + { + set_status(ST_ERROR, "the " U64FMT " process does not exist or is not a child process", pid); + return 0; + } list_remove(&child->entry); free(child); return 1; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index dd8da8e..8e00f09 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -204,9 +204,9 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; } - CloseHandle(child->handle); - list_remove(&child->entry); - free(child); + /* Don't close child->handle so we can retrieve the exit status again if + * needed. + */ cleanup: /* We must reset WSAEventSelect before we can make @@ -221,6 +221,27 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return success; } +int platform_rmchildproc(SOCKET client, uint64_t pid) +{ + struct child_t *child; + + LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) + { + if (child->pid == pid) + break; + } + if (!child || child->pid != pid) + { + set_status(ST_ERROR, "the " U64FMT " process does not exist or is not a child process", pid); + return 0; + } + + CloseHandle(child->handle); + list_remove(&child->entry); + free(child); + return 1; +} + int platform_settime(uint64_t epoch, uint32_t leeway) { FILETIME filetime; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 292b1c7..dc181a6 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,8 +37,9 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. + * 1.6: Add support for the rmchildproc RPC. */ -#define PROTOCOL_VERSION "testagentd 1.5" +#define PROTOCOL_VERSION "testagentd 1.6" #define BLOCK_SIZE 65536 @@ -88,6 +89,7 @@ enum rpc_ids_t RPCID_SETTIME, RPCID_GETPROPERTIES, RPCID_UPGRADE, + RPCID_RMCHILDPROC, }; /* This is the RPC currently being processed */ @@ -108,6 +110,7 @@ static const char* rpc_name(uint32_t id) "settime", "getproperties", "upgrade", + "rmchildproc", }; if (id < sizeof(names) / sizeof(*names)) @@ -837,6 +840,23 @@ static void do_wait2(SOCKET client) send_error(client); } +static void do_rmchildproc(SOCKET client) +{ + uint64_t pid; + + if (!expect_list_size(client, 1) || + !recv_uint64(client, &pid)) + { + send_error(client); + return; + } + + if (platform_rmchildproc(client, pid)) + send_list_size(client, 0); + else + send_error(client); +} + static void do_rm(SOCKET client) { int got_errors; @@ -1090,6 +1110,9 @@ static void process_rpc(SOCKET client) case RPCID_UPGRADE: do_upgrade(client); break; + case RPCID_RMCHILDPROC: + do_rmchildproc(client); + break; default: do_unknown(client, rpcid); }

1 0

Francois Gouget : testbot/testagentd: Add a GetCwd RPC.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: 2beaab04a36679838fe429c16106d92cdb87fa39 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2beaab04a36679838fe429c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 23:24:14 2014 +0200 testbot/testagentd: Add a GetCwd RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 18 ++++++++++++++++++ testbot/scripts/TestAgent | 12 +++++++++++- testbot/src/testagentd/testagentd.c | 18 +++++++++++++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2cb61ff..5d03a18 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -40,6 +40,7 @@ my $RPC_SETTIME = 7; my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; my $RPC_RMCHILDPROC = 10; +my $RPC_GETCWD = 11; my %RpcNames=( $RPC_PING => 'ping', @@ -53,6 +54,7 @@ my %RpcNames=( $RPC_GETPROPERTIES => 'getproperties', $RPC_UPGRADE => 'upgrade', $RPC_RMCHILDPROC => 'rmchildproc', + $RPC_GETCWD => 'getcwd', ); my $Debug = 0; @@ -1407,4 +1409,20 @@ sub RemoveChildProcess($$) return $self->_RecvList(''); } +sub GetCwd($) +{ + my ($self) = @_; + debug("GetCwd\n"); + + # Send the command + if (!$self->_StartRPC($RPC_GETCWD) or + !$self->_SendListSize('ArgC', 0)) + { + return undef; + } + + # Get the reply + return $self->_RecvList('s'); +} + 1; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ec4504f..ced1165 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -198,6 +198,10 @@ while (@ARGV) @Rm = @ARGV; last; } + elsif ($arg eq "getcwd") + { + $Cmd = $arg; + } elsif ($arg eq "getversion") { set_cmd($arg); @@ -296,7 +300,7 @@ if (defined $Usage) print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> [ping|version]\n"; + print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -323,6 +327,7 @@ if (defined $Usage) print " getproperty <name> Retrieves and prints the specified server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; + print " getcwd Returns the server's current working directory.\n"; print " ping Makes sure the server is still alive.\n"; print " upgrade Replaces the server executable with the specified file and\n"; print " restarts it.\n"; @@ -440,6 +445,11 @@ elsif ($Cmd eq "upgrade") { $Result = $TA->Upgrade($LocalFilename); } +elsif ($Cmd eq "getcwd") +{ + $Result = $TA->GetCwd(); + print "Current directory: $Result\n" if (defined $Result); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion(); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index dc181a6..e776cc7 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,7 +37,7 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. - * 1.6: Add support for the rmchildproc RPC. + * 1.6: Add support for the rmchildproc and getcwd RPC. */ #define PROTOCOL_VERSION "testagentd 1.6" @@ -90,6 +90,7 @@ enum rpc_ids_t RPCID_GETPROPERTIES, RPCID_UPGRADE, RPCID_RMCHILDPROC, + RPCID_GETCWD, }; /* This is the RPC currently being processed */ @@ -111,6 +112,7 @@ static const char* rpc_name(uint32_t id) "getproperties", "upgrade", "rmchildproc", + "getcwd", }; if (id < sizeof(names) / sizeof(*names)) @@ -1037,7 +1039,19 @@ static void do_upgrade(SOCKET client) } else send_error(client); +} + +static void do_getcwd(SOCKET client) +{ + char curdir[261]; + if (expect_list_size(client, 0)) + { + send_list_size(client, 1); + send_string(client, getcwd(curdir, sizeof(curdir))); + } + else + send_error(client); } static void do_unknown(SOCKET client, uint32_t id) @@ -1109,6 +1123,8 @@ static void process_rpc(SOCKET client) break; case RPCID_UPGRADE: do_upgrade(client); + case RPCID_GETCWD: + do_getcwd(client); break; case RPCID_RMCHILDPROC: do_rmchildproc(client);

1 0

Francois Gouget : winetest: Prefer 'use warnings' to 'perl -w'.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: 346c06bbac8321b06b0a1dc9a9cdc1a0bbd90136 URL: http://source.winehq.org/git/tools.git/?a=commit;h=346c06bbac8321b06b0a1dc9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:07:29 2014 +0200 winetest: Prefer 'use warnings' to 'perl -w'. --- winetest/build-index | 3 ++- winetest/dissect | 4 +++- winetest/gather | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 186a2de..900b144 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> # @@ -20,6 +20,7 @@ # WineTest result data. use strict; +use warnings; use open ':utf8'; use CGI qw(:standard); diff --git a/winetest/dissect b/winetest/dissect index a243a23..bbd156b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard @@ -32,6 +32,8 @@ # 3 - fatal error, something went utterly wrong use strict; +use warnings; + use open ':utf8'; use CGI qw(:standard); charset("utf-8"); diff --git a/winetest/gather b/winetest/gather index 5023ac6..f469fb1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner # @@ -31,6 +31,7 @@ # 3 - fatal error, something went utterly wrong use strict; +use warnings; use CGI qw(:standard); charset("utf-8");

1 0

Francois Gouget : winetest: Consistently use strict and warnings in the main CGI scripts.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: 18bebff012a0df99e8c555bfe733731c16d45c07 URL: http://source.winehq.org/git/tools.git/?a=commit;h=18bebff012a0df99e8c555bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:08:10 2014 +0200 winetest: Consistently use strict and warnings in the main CGI scripts. --- winetest/site | 3 +++ winetest/winetest.cgi | 1 + 2 files changed, 4 insertions(+) diff --git a/winetest/site b/winetest/site index f7996a6..a942491 100755 --- a/winetest/site +++ b/winetest/site @@ -5,6 +5,9 @@ # by Jeremy Newman <jnewman(a)codeweavers.com> # +use strict; +use warnings; + # load CGI object use CGI qw(:standard); my $q = new CGI; diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 8c72e02..2cc1190 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -17,6 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; +use warnings; use vars qw/$queuedir $maxfilesize/; BEGIN {

1 0

Francois Gouget : winetest: 'my' variable lists must be enclosed in parentheses.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: 0aa228a583b38a7ff435e55c6c2d31686f766b49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0aa228a583b38a7ff435e55c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:09:07 2014 +0200 winetest: 'my' variable lists must be enclosed in parentheses. --- winetest/service.cgi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index 9f34633..de0b8e8 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -49,7 +49,7 @@ $lynx="/usr/bin/lynx"; &main; sub main { - my $build, $urls, $cookies; + my ($build, $urls, $cookies); print "Content-type: text/plain\n\n"; @@ -121,12 +121,12 @@ sub releases_purge { # where the two maps are keyed by the full file name of the release sub releases_read { my ($project) = @_; - my %urls, %cookies, $thisrelease; + my (%urls, %cookies, $thisrelease); @files = split(/\n/, `ls $data_root/*/$project/*.url`); foreach $file (@files) { if (open(GENERIC_FH, $file)) { - my $cookiefile, $key, $url, $this_line; + my ($cookiefile, $key, $url, $this_line); $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -135,7 +135,7 @@ sub releases_read { $key = $2; $url = $this_line; if (open(GENERIC_FH, $cookiefile)) { - my $program, $release, @other; + my ($program, $release, @other); $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -156,9 +156,9 @@ sub releases_read { # try to add a new release to our portfolio sub releases_make { my ($url) = @_; - my $name, $program, $build, $publisher; - my $urls, $cookies, $current_build, @other; - my $build_path, $cookie, $program_ok; + my ($name, $program, $build, $publisher); + my ($urls, $cookies, $current_build, @other); + my ($build_path, $cookie, $program_ok); # parse out this release's information $url =~ /.*\/(.*)/; @@ -224,8 +224,8 @@ sub releases_make { sub send_upgrade { my ($urls, $history) = @_; - my @names, $name, $url, $program; - my $build, $publisher, $id, @other; + my (@names, $name, $url, $program); + my ($build, $publisher, $id, @other); # pick a release to send, the first will do @names = keys %$urls;

1 0

Francois Gouget : winetest: Fix write_file() in service.cgi to close the right file handle.
by Alexandre Julliard 23 Jul '14

23 Jul '14

Module: tools Branch: master Commit: bb1a1abb352aa65ee54637e4581437a9faa73b67 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb1a1abb352aa65ee54637e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:09:26 2014 +0200 winetest: Fix write_file() in service.cgi to close the right file handle. --- winetest/service.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index de0b8e8..1ec83b6 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -290,7 +290,7 @@ sub write_file { open(GENERIC_FH, $filename) or ( &debug("Can't open $filename for writing.") && die ); print GENERIC_FH $content; - close(URL_FH); + close(GENERIC_FH); } # read the content of a file

1 0

André Hentschel : Add WWN 372
by Jeremy Newman 23 Jul '14

23 Jul '14

Module: website Branch: master Commit: 8e9bea1832c28a994b49ed552cca4d54422ff249 URL: http://source.winehq.org/git/website.git/?a=commit;h=8e9bea1832c28a994b49ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 19:57:11 2014 +0200 Add WWN 372 --- wwn/en/wn20140723_372.xml | 1098 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1098 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8e9bea1832c28a994b…

1 0

André Hentschel : Fix German news for 1.7.22
by Jeremy Newman 23 Jul '14

23 Jul '14

Module: website Branch: master Commit: 2358895df30e78105c62664205eba539aa272256 URL: http://source.winehq.org/git/website.git/?a=commit;h=2358895df30e78105c6266… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 19:57:59 2014 +0200 Fix German news for 1.7.22 --- news/de/2014071101.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/news/de/2014071101.xml b/news/de/2014071101.xml index 8f5d33b..bc6b89f 100644 --- a/news/de/2014071101.xml +++ b/news/de/2014071101.xml @@ -11,6 +11,6 @@ <li>Anfängliche Unterstützung von Geografischen Informationen.</li> <li>Diverse Fehlerkorrekturen.</li> </ul> - <p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. -15 Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. </p></body></news>

1 0

Marcus Meissner : dmime: Remove useless NULL check (Coverity).
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: b20365ee29e67ea0f993eee927a1746836f4cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20365ee29e67ea0f993eee92… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:08:33 2014 +0200 dmime: Remove useless NULL check (Coverity). --- dlls/dmime/performance.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 92e72fe..25e86f9 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -388,9 +388,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SendPMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { return DMUS_E_ALREADY_SENT; } @@ -512,9 +509,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { /** prevent for freeing PMsg in queue (ie to be processed) */ return DMUS_E_CANNOT_FREE;

1 0

Bruno Jesus : crypt32: Fix conversion of multiple fields in CertStrToName.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 4a28977f38a33a99de9791e88366555dc1ff8ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a28977f38a33a99de9791e88… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 03:43:35 2014 -0300 crypt32: Fix conversion of multiple fields in CertStrToName. --- dlls/crypt32/str.c | 10 ++++++++-- dlls/crypt32/tests/cert.c | 12 ++---------- dlls/crypt32/tests/str.c | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index cf29c6f..7b52731 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -840,13 +840,14 @@ static BOOL CRYPT_GetNextKeyW(LPCWSTR str, struct X500TokenW *token, /* Assumes separators are characters in the 0-255 range */ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, - struct X500TokenW *token, LPCWSTR *ppszError) + WCHAR *separator_used, struct X500TokenW *token, LPCWSTR *ppszError) { BOOL ret = TRUE; TRACE("(%s, %s, %p, %p)\n", debugstr_w(str), debugstr_w(separators), token, ppszError); + *separator_used = 0; while (*str && isspaceW(*str)) str++; if (*str) @@ -886,6 +887,7 @@ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, while (*str && (*str >= 0xff || !map[*str])) str++; token->end = str; + if (map[*str]) *separator_used = *str; } } else @@ -1077,6 +1079,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 }; static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 }; LPCWSTR sep; + WCHAR sep_used; str++; if (dwStrType & CERT_NAME_STR_COMMA_FLAG) @@ -1089,11 +1092,14 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, sep = allSepsWithoutPlus; else sep = allSeps; - ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token, + ret = CRYPT_GetNextValueW(str, dwStrType, sep, &sep_used, &token, ppszError); if (ret) { str = token.end; + /* if token.end points to the separator, skip it */ + if (str && sep_used && *str == sep_used) str++; + ret = CRYPT_ValueToRDN(dwCertEncodingType, &info, keyOID, &token, dwStrType, ppszError); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e16ca5d..a19ef1e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1711,23 +1711,14 @@ static void testGetIssuerCert(void) /* Self-sign a certificate, add to the store and test getting the issuer */ size = 0; -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), "CertStrToName should have worked\n"); certencoded = HeapAlloc(GetProcessHeap(), 0, size); -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), "CertStrToName should have worked\n"); certsubject.pbData = certencoded; certsubject.cbData = size; cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); - /* wine fails to create the certificate, this makes it crash later. - * Remove IF when wine is fixed, all windows versions must work */ - if(cert3 == NULL) - { - todo_wine ok(0, "Must work on windows\n"); - goto skiptest; - } ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); @@ -1737,10 +1728,11 @@ todo_wine SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); +todo_wine ok(!parent, "Expected NULL\n"); +todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); -skiptest: CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index dd61888..cf7c2ef 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -450,6 +450,15 @@ static BYTE encodedSemiCN[] = { static BYTE encodedNewlineCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03,0x55,0x04,0x03,0x1e,0x06,0x00,0x61, 0x00,0x0a,0x00,0x62 }; +static BYTE encodedDummyCN[] = { +0x30,0x1F,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x64,0x75, +0x6D,0x6D,0x79,0x31,0x0D,0x30,0x0B,0x06,0x03,0x55,0x04,0x0C,0x13,0x04,0x74, +0x65,0x73,0x74 }; +static BYTE encodedFields[] = { +0x30,0x2F,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x57,0x69, +0x6E,0x65,0x20,0x54,0x65,0x73,0x74,0x31,0x0C,0x30,0x0A,0x06,0x03,0x55,0x04, +0x0C,0x13,0x03,0x31,0x32,0x33,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06, +0x13,0x02,0x42,0x52 }; static void test_CertNameToStrA(void) { @@ -756,6 +765,8 @@ static const struct StrToNameA namesA[] = { { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { "CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { " CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameA(void) @@ -849,6 +860,10 @@ static const WCHAR badlyQuotedCN_W[] = { 'C','N','=','"','"','1','"','"',0 }; static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; +static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; +static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', + 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', + ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; @@ -867,6 +882,8 @@ static const struct StrToNameW namesW[] = { { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, + { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, + { encodedFields_W, sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) @@ -922,7 +939,7 @@ static void test_CertStrToNameW(void) size); if (ret) ok(!memcmp(buf, namesW[i].encoded, size), - "Index %d: unexpected value\n", i); + "Index %d: unexpected value for string %s\n", i, wine_dbgstr_w(namesW[i].x500)); } }

1 0