wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Ken Thomases : dinput: Fix check of wrong result value due to copy/ paste error.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 4637b607b2477f3c8b71724c3dbafe11e3decf17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4637b607b2477f3c8b71724c3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:08 2014 -0500 dinput: Fix check of wrong result value due to copy/paste error. --- dlls/dinput/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e26ee05..e5a6034 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -219,7 +219,7 @@ static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) } location_id = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDLocationIDKey)); - if(!matching){ + if(!location_id){ CFRelease(matching); WARN("IOHIDDeviceGetProperty failed, force feedback disabled\n"); return DIERR_DEVICENOTREG;

1 0

Ken Thomases : dinput: Rename identifiers to get rid of Hungarian notation and deceptive names in Mac code.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: d0535334444823db38c2eaaacf18dd5fcc8776c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0535334444823db38c2eaaac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:03 2014 -0500 dinput: Rename identifiers to get rid of Hungarian notation and deceptive names in Mac code. --- dlls/dinput/joystick_osx.c | 263 +++++++++++++++++++++----------------------- 1 file changed, 128 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0535334444823db38c2e…

1 0

Alexandre Julliard : gdi32: Pass the full DC handle to the hook in DeleteDC.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 955676bc05aa59315ffc1daf8b1b446716089d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955676bc05aa59315ffc1daf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 09:37:52 2014 +0200 gdi32: Pass the full DC handle to the hook in DeleteDC. --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9500de2..5146f5b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -807,7 +807,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) } /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) + if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); return TRUE;

1 0

Francois Gouget : testbot/TestAgent: Add getproperty and upgrade commands.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 893a3bc6b4f5358f98bba7b196ab8739b5de966a URL: http://source.winehq.org/git/tools.git/?a=commit;h=893a3bc6b4f5358f98bba7b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:59 2014 +0200 testbot/TestAgent: Add getproperty and upgrade commands. --- testbot/scripts/TestAgent | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index e238967..ac2c914 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -52,7 +52,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); +my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; @@ -206,6 +206,16 @@ while (@ARGV) { set_cmd($arg); } + elsif ($arg eq "getproperty") + { + set_cmd($arg); + $PropName = @ARGV ? check_opt_val($arg, $PropName) : '*'; + } + elsif ($arg eq "upgrade") + { + set_cmd($arg); + $LocalFilename = check_opt_val($arg, $LocalFilename); + } else { error("unknown command '$arg'\n"); @@ -309,8 +319,13 @@ if (defined $Usage) print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; print " rm Deletes the specified files on the server.\n"; - print " getversion Returns the version of the server.\n"; + print " getversion Returns the protocol version.\n"; + 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 " 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"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; @@ -395,6 +410,28 @@ elsif ($Cmd eq "settime") { $Result = $TA->SetTime(); } +elsif ($Cmd eq "getproperty") +{ + $Result = $TA->GetProperties(); + if (defined $Result) + { + if ($PropName eq '*') + { + foreach my $Name (sort keys %$Result) + { + print "$Name=$Result->{$Name}\n"; + } + } + else + { + print "$Result->{$PropName}\n" if (defined $Result->{$PropName}); + } + } +} +elsif ($Cmd eq "upgrade") +{ + $Result = $TA->Upgrade($LocalFilename); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion();

1 0

Francois Gouget : testbot/TestAgent: Verify that only one command is specified on the command line.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 0730c9b0632456cd5c6a36a75044c04529ba8de3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0730c9b0632456cd5c6a36a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:54 2014 +0200 testbot/TestAgent: Verify that only one command is specified on the command line. --- testbot/scripts/TestAgent | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 4fa8f4f..e238967 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -59,6 +59,17 @@ my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); my $Usage; +sub set_cmd($) +{ + my ($Value) = @_; + if (defined $Cmd) + { + error("the '$Cmd' and '$Value' commands are mutually exclusive\n"); + $Usage = 2; + } + $Cmd = $Value; +} + sub check_opt_val($$) { my ($option, $val) = @_; @@ -138,7 +149,7 @@ while (@ARGV) } elsif ($arg eq "sendfile") { - $Cmd = $arg; + set_cmd($arg); $LocalFilename = check_opt_val($arg, $LocalFilename); if (!$Usage) { @@ -155,7 +166,7 @@ while (@ARGV) } elsif ($arg eq "getfile") { - $Cmd = $arg; + set_cmd($arg); $ServerFilename = check_opt_val($arg, $ServerFilename); if (!$Usage) { @@ -172,28 +183,28 @@ while (@ARGV) } elsif ($arg eq "run") { + set_cmd($arg); @Run = @ARGV; - $Cmd = $arg; last; } elsif ($arg eq "wait") { - $Cmd = $arg; + set_cmd($arg); $WaitPid = check_opt_val($arg, $WaitPid); } elsif ($arg eq "rm") { - $Cmd = $arg; + set_cmd($arg); @Rm = @ARGV; last; } elsif ($arg eq "getversion") { - $Cmd = $arg; + set_cmd($arg); } elsif ($arg eq "ping" or $arg eq "settime") { - $Cmd = $arg; + set_cmd($arg); } else {

1 0

Francois Gouget : testbot/testagentd: Add support for upgrading the TestAgent server.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 891882fd982ed745d5fb6fb3eaaf610b661a6a27 URL: http://source.winehq.org/git/tools.git/?a=commit;h=891882fd982ed745d5fb6fb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:45 2014 +0200 testbot/testagentd: Add support for upgrading the TestAgent server. --- testbot/lib/WineTestBot/TestAgent.pm | 100 ++++++++++++++++++++++++++ testbot/src/testagentd/platform.h | 7 ++ testbot/src/testagentd/platform_unix.c | 31 ++++++++ testbot/src/testagentd/platform_windows.c | 33 +++++++++ testbot/src/testagentd/testagentd.c | 112 ++++++++++++++++++++++++++++- 5 files changed, 281 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=891882fd982ed745d5fb…

1 0

Francois Gouget : testbot/testagentd: Add a function to simplify formatting a message.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 5179c8ff848da8da501c773a38bd8d9c9d0818ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=5179c8ff848da8da501c773a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:36 2014 +0200 testbot/testagentd: Add a function to simplify formatting a message. --- testbot/src/testagentd/testagentd.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 230683a..d5d8dfc 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -129,31 +129,38 @@ const char* status_names[] = {"ok:", "error:", "fatal:"}; /* If true, then the current connection is in a broken state */ static int broken = 0; -/* This is a message which indicates the reason for the status */ -static char* status_msg = NULL; -static unsigned status_size = 0; -static void vset_status_msg(const char* format, va_list valist) + +static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list valist) { - int len; + unsigned len; va_list args; len = 1; do { - if (len >= status_size) + if (len >= *size) { /* len does not count the trailing '\0'. So add 1 and round up * to the next 16 bytes multiple. */ - status_size = (len + 1 + 0xf) & ~0xf; - status_msg = realloc(status_msg, status_size); + *size = (len + 1 + 0xf) & ~0xf; + *buf = realloc(*buf, *size); } va_copy(args, valist); - len = vsnprintf(status_msg, status_size, format, args); + len = vsnprintf(*buf, *size, format, args); va_end(args); if (len < 0) - len = status_size * 1.1; + len = *size * 1.1; } - while (len >= status_size); + while (len >= *size); + return *buf; +} + +/* This is a message which indicates the reason for the status */ +static char* status_msg = NULL; +static unsigned status_size = 0; +static void vset_status_msg(const char* format, va_list valist) +{ + vformat_msg(&status_msg, &status_size, format, valist); if (opt_debug || status != ST_OK) fprintf(stderr, "%s%s: %s\n", status_names[status], rpc_name(rpcid), status_msg); }

1 0

Francois Gouget : testbot/testagentd: Child processes should not inherit the server's sockets ( and other file descriptors).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 1ed804c36b35bf4fd51876b4d02e92f64afb0fb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ed804c36b35bf4fd51876b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:24 2014 +0200 testbot/testagentd: Child processes should not inherit the server's sockets (and other file descriptors). --- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9dda56a..89e435d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -126,7 +126,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) si.hStdInput = fhs[0]; si.hStdOutput = fhs[1]; si.hStdError = fhs[2]; - if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, + if (!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) { set_status(ST_ERROR, "could not run '%s': %lu", cmdline, GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b8f9c57..230683a 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1067,7 +1067,7 @@ int main(int argc, char** argv) char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; - int rc, addrlen; + int rc, sockflags, addrlen; int opt_usage = 0; SOCKET master; int on = 1; @@ -1171,6 +1171,11 @@ int main(int argc, char** argv) } /* Bind to the host in a protocol neutral way */ +#ifdef SOCK_CLOEXEC + sockflags = SOCK_CLOEXEC; +#else + sockflags = 0; +#endif rc = ta_getaddrinfo(NULL, opt_port, &addresses); if (rc) { @@ -1182,7 +1187,8 @@ int main(int argc, char** argv) debug("trying family=%d\n", addrp->ai_family); if (addrp->ai_family != PF_INET) continue; - master = socket(addrp->ai_family, addrp->ai_socktype, addrp->ai_protocol); + master = socket(addrp->ai_family, addrp->ai_socktype | sockflags, + addrp->ai_protocol); if (master < 0) continue; setsockopt(master, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)); @@ -1212,6 +1218,9 @@ int main(int argc, char** argv) SOCKET client; debug("Waiting in accept()\n"); client = accept(master, NULL, NULL); +#ifdef O_CLOEXEC + fcntl(client, F_SETFL, fcntl(client, F_GETFL, 0) | O_CLOEXEC); +#endif if (client >= 0) { if (is_host_allowed(client, opt_srchost, addrlen))

1 0

Francois Gouget : testbot/testagent: Always strip the trailing '\0' from strings, even for error messages.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: fa4327a3d2e74df70924c2e7a7c7b93069a30b6b URL: http://source.winehq.org/git/tools.git/?a=commit;h=fa4327a3d2e74df70924c2e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:10 2014 +0200 testbot/testagent: Always strip the trailing '\0' from strings, even for error messages. --- testbot/lib/WineTestBot/TestAgent.pm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c9895ba..178cf51 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -323,6 +323,20 @@ sub _SkipRawData($$) return $Success; } +sub _RecvRawString($$$) +{ + my ($self, $Name, $Size) = @_; + + my $Str = $self->_RecvRawData($Name, $Size); + if (defined $Str) + { + # Remove the trailing '\0' + chop $Str; + debug(" RecvRawString('$Name') -> '$Str'\n"); + } + return $Str; +} + sub _RecvRawUInt32($$) { my ($self, $Name) = @_; @@ -379,7 +393,7 @@ sub _ExpectEntryHeader($$$;$) if ($HType eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("$Name.e", $HSize); + my $Message = $self->_RecvRawString("$Name.e", $HSize); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -502,7 +516,7 @@ sub _SkipEntries($$) if ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Skip$i.e", $Size); + my $Message = $self->_RecvRawString("Skip$i.e", $Size); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -599,7 +613,7 @@ sub _RecvErrorList($) } elsif ($Type eq 's') { - my $Status = $self->_RecvRawData("Err$i.s", $Size); + my $Status = $self->_RecvRawString("Err$i.s", $Size); return $self->GetLastError() if (!defined $Status); debug(" RecvStatus() -> '$Status'\n"); push @$Errors, $Status; @@ -607,7 +621,7 @@ sub _RecvErrorList($) elsif ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Err$i.e", $Size); + my $Message = $self->_RecvRawString("Err$i.e", $Size); if (defined $Message) { debug(" RecvError() -> '$Message'\n");

1 0

Francois Gouget : testbot/testagentd: Avoid crashing when the server cannot create its master socket.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 410bea9e02ee9cbae4445b2788be92b0dccacf8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=410bea9e02ee9cbae4445b27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:48:35 2014 +0200 testbot/testagentd: Avoid crashing when the server cannot create its master socket. --- testbot/src/testagentd/testagentd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 35b42f3..b8f9c57 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1192,7 +1192,8 @@ int main(int argc, char** argv) break; closesocket(master); }; - addrlen = addrp->ai_addrlen; + if (addrp) + addrlen = addrp->ai_addrlen; ta_freeaddrinfo(addresses); if (addrp == NULL) {

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
50
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 April 2014