February 2013 - Wine-commits

Francois Gouget : testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 6475b701e628de35c632cecbf30f74e80aa91700 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6475b701e628de35c632cecb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:34:18 2013 +0100 testbot/testagentd: Add a wait() RPC that takes a timeout as a parameter. This is a new RPC which preserves compatibility with old clients. --- testbot/src/testagentd/platform.h | 6 ++-- testbot/src/testagentd/platform_unix.c | 25 ++++++++++++++++-- testbot/src/testagentd/platform_windows.c | 7 ++++- testbot/src/testagentd/testagentd.c | 38 +++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 10 deletions(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 3c25271..d2a3934 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -68,12 +68,12 @@ enum run_flags_t { 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 or the client disconnects (typically because it got tired of - * waiting). + * terminates, the specified timeout (in seconds) expires, or the client + * disconnects (typically because it got tired of waiting). * If no command was started in the background, then reports an error * immediately. */ -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus); +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); /* Returns a string describing the last socket-related error */ int sockeintr(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index cd08c58..6552e05 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <sys/wait.h> #include <signal.h> +#include <time.h> #include "platform.h" #include "list.h" @@ -125,9 +126,10 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pid; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t* child; + time_t deadline; LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) { @@ -140,10 +142,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) return 0; } + if (timeout) + deadline = time(NULL) + timeout; while (!child->reaped) { fd_set rfds; char buffer; + struct timeval tv; + int ready; /* select() blocks until either the client disconnects or until, or * the SIGCHLD signal indicates the child has exited. The recv() call @@ -152,8 +158,21 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (select(client+1, &rfds, NULL, NULL, NULL) == 1 && - FD_ISSET(client, &rfds) && + if (timeout) + { + tv.tv_sec = deadline - time(NULL); + if (tv.tv_sec < 0) + tv.tv_sec = 0; + tv.tv_usec = 0; + } + ready = select(client+1, &rfds, NULL, NULL, timeout ? &tv : NULL); + if (ready == 0) + { + /* This is the timeout */ + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; + } + if (ready == 1 && FD_ISSET(client, &rfds) && recv(client, &buffer, 1, MSG_PEEK | MSG_DONTWAIT) <= 0) { set_status(ST_FATAL, "connection closed"); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index ab4bf7b..55ed51d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -136,7 +136,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) return pi.dwProcessId; } -int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) +int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus) { struct child_t *child; HANDLE handles[2]; @@ -160,7 +160,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); success = 0; switch (r) @@ -179,6 +179,9 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t *childstatus) else debug("GetExitCodeProcess() failed (%lu). Giving up!\n", GetLastError()); break; + case WAIT_TIMEOUT: + set_status(ST_ERROR, "timed out waiting for the child process"); + return 0; default: debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 837ff02..8a8f2bb 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -29,7 +29,13 @@ #include "platform.h" -#define PROTOCOL_VERSION "testagentd 1.0" +/* Increase the major version number when making backward-incompatible changes. + * Otherwise increase the minor version number: + * 1.0: Initial release. + * 1.1: Added the wait2 RPC. + */ +#define PROTOCOL_VERSION "testagentd 1.1" + #define BLOCK_SIZE 4096 const char *name0; @@ -73,6 +79,7 @@ enum rpc_ids_t RPCID_RUN, RPCID_WAIT, RPCID_RM, + RPCID_WAIT2, }; /* This is the RPC currently being processed */ @@ -89,6 +96,7 @@ static const char* rpc_name(uint32_t id) "run", "wait", "rm", + "wait2", }; if (id < sizeof(names) / sizeof(*names)) @@ -761,7 +769,30 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, &childstatus)) + if (platform_wait(client, pid, 0, &childstatus)) + { + send_list_size(client, 1); + send_uint32(client, childstatus); + } + else + send_error(client); +} + +static void do_wait2(SOCKET client) +{ + uint64_t pid; + uint32_t timeout; + uint32_t childstatus; + + if (!expect_list_size(client, 2) || + !recv_uint64(client, &pid) || + !recv_uint32(client, &timeout)) + { + send_error(client); + return; + } + + if (platform_wait(client, pid, timeout, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus); @@ -906,6 +937,9 @@ static void process_rpc(SOCKET client) case RPCID_WAIT: do_wait(client); break; + case RPCID_WAIT2: + do_wait2(client); + break; case RPCID_RM: do_rm(client); break;

1 0

Francois Gouget : testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 66b8798d53fb28266290a6b731a8f2007b220326 URL: http://source.winehq.org/git/tools.git/?a=commit;h=66b8798d53fb28266290a6b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 20:29:26 2013 +0100 testbot/TestAgent: Use the new wait() RPC with the timeout parameter if available. This lets us distinguish cases where the child process runs for too long from network issues. Note that when connected to an old testagentd server the old RPC will be used to preserve compatibility. --- testbot/bin/WineRunBuild.pl | 4 +-- testbot/bin/WineRunReconfig.pl | 4 +-- testbot/bin/WineRunTask.pl | 4 +-- testbot/lib/WineTestBot/TestAgent.pm | 35 ++++++++++++++++++++++++++------- testbot/scripts/TestAgent | 2 +- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d335214..20a43da 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -256,12 +256,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0618a48..18d8c69 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -209,12 +209,10 @@ if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) $FullErrFileName, $Job, $Step, $Task; } my $Pid = $TA->Run(["./task"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9751d3b..73d60ba 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -300,12 +300,10 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) } my $Pid = $TA->Run(["./script.bat"], 0); -my $OldTimeout = $TA->SetTimeout($Task->Timeout); -if (!$Pid or !defined $TA->Wait($Pid)) +if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); } -$TA->SetTimeout($OldTimeout); my $LogErrMessage; if (!$TA->GetFile($RptFileName, $FullLogFileName)) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cda83a8..c3326d6 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -35,6 +35,7 @@ my $RPC_SENDFILE = 2; my $RPC_RUN = 3; my $RPC_WAIT = 4; my $RPC_RM = 5; +my $RPC_WAIT2 = 6; my %RpcNames=( $RPC_PING => 'ping', @@ -43,6 +44,7 @@ my %RpcNames=( $RPC_RUN => 'run', $RPC_WAIT => 'wait', $RPC_RM => 'rm', + $RPC_WAIT2 => 'wait2', ); my $Debug = 0; @@ -1053,21 +1055,38 @@ sub Run($$$;$$$) return $self->_RecvList('Q'); } -sub Wait($$) +sub Wait($$$) { - my ($self, $Pid) = @_; - debug("Wait $Pid\n"); + my ($self, $Pid, $Timeout) = @_; + debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", "\n"); + # Add 1 second for the reply to come back + my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); # Send the command - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize(1) or - !$self->_SendUInt64($Pid)) + if ($self->{agentversion} =~ / 1\.0$/) { - return undef; + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize(1) or + !$self->_SendUInt64($Pid)) + { + return undef; + } + } + else + { + if (!$self->_StartRPC($RPC_WAIT2) or + !$self->_SendListSize(2) or + !$self->_SendUInt64($Pid) or + !$self->_SendUInt32($Timeout)) + { + return undef; + } } # Get the reply - return $self->_RecvList('I'); + my $Result = $self->_RecvList('I'); + $self->SetTimeout($OldTimeout) if ($Timeout); + return $Result; } sub Rm($@) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index d25a3d6..1424998 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -303,7 +303,7 @@ elsif ($Cmd eq "run") print "Started process $Pid\n"; if (!($RunFlags & $TestAgent::RUN_DNT)) { - $Result = $TA->Wait($Pid); + $Result = $TA->Wait($Pid, $Timeout); print "Child exit status: $Result\n" if (defined $Result); } }

1 0

Francois Gouget : testbot/testagentd: Allow reading, writing and deleting the run command redirect files.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 2b6cf2889054a8fdf5117795480d515ae8915330 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2b6cf2889054a8fdf5117795… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:35:16 2013 +0100 testbot/testagentd: Allow reading, writing and deleting the run command redirect files. In particular if we send stdout or stderr to a log, it's important that we can read it even if the command gets stuck. --- testbot/src/testagentd/platform_windows.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 55ed51d..9e5bf78 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -88,7 +88,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), 0, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError());

1 0

Francois Gouget : testbot/TestAgent: Extend and fix the run RPC' s redirection options.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 3fca08b59407b3e7c215e5d9298ccd267cce3831 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3fca08b59407b3e7c215e5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:40:42 2013 +0100 testbot/TestAgent: Extend and fix the run RPC's redirection options. Always set up the stdout and stderr redirections for append so they don't overwrite each other. Add options to prevent the truncation of the files stdout and stderr are redirected to. This makes it possible to run multiple commands in a row and to collect all their output in a single file. --- testbot/lib/WineTestBot/TestAgent.pm | 5 ++++- testbot/scripts/TestAgent | 10 ++++++++++ testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 16 ++++++++++++++-- testbot/src/testagentd/platform_windows.c | 19 ++++++++++++++++++- testbot/src/testagentd/testagentd.c | 11 ++++++----- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c3326d6..074e4f0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -21,7 +21,7 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT); +use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); require Exporter; @ISA = qw(Exporter); @@ -1031,6 +1031,9 @@ sub GetFileToString($$) } $RUN_DNT = 1; +$RUN_DNTRUNC_OUT = 2; +$RUN_DNTRUNC_ERR = 4; +$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 1424998..521e741 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -120,6 +120,14 @@ while (@ARGV) { $RunErr = check_opt_val($arg, $RunErr); } + elsif ($arg eq "--run-dntrunc-out") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_OUT; + } + elsif ($arg eq "--run-dntrunc-err") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_ERR; + } elsif (!defined $Hostname) { $Hostname = $arg; @@ -252,8 +260,10 @@ if (defined $Usage) print " specified server file.\n"; print " --run-out <serverpath> Redirect the stdout or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-out Do not truncate the file stdout is redirected to.\n"; print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index d2a3934..621ce98 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -60,6 +60,8 @@ int platform_init(void); enum run_flags_t { RUN_DNT = 1, + RUN_DNTRUNC_OUT = 2, + RUN_DNTRUNC_ERR = 4, }; /* Starts the specified command in the background and reports the status to diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 6552e05..48eef73 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -69,13 +69,25 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) { pid_t pid; int fds[3] = {-1, -1, -1}; - int i; + int ofl, i; for (i = 0; i < 3; i++) { if (redirects[i][0] == '\0') continue; - fds[i] = open(redirects[i], (i ? O_WRONLY : O_RDONLY) | O_CREAT | O_TRUNC); + switch (i) + { + case 0: + ofl = O_RDONLY; + break; + case 1: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_OUT ? 0 : O_TRUNC); + break; + case 2: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_ERR ? 0 : O_TRUNC); + break; + } + fds[i] = open(redirects[i], ofl, 0666); if (fds[i] < 0) { set_status(ST_ERROR, "unable to open '%s' for %s: %s", redirects[i], i ? "writing" : "reading", strerror(errno)); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9e5bf78..10ea55a 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -82,13 +82,30 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) has_redirects = 0; for (i = 0; i < 3; i++) { + DWORD access, creation; if (redirects[i][0] == '\0') { fhs[i] = GetStdHandle(stdhandles[i]); continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + switch (i) + { + case 0: + access = GENERIC_READ; + creation = OPEN_EXISTING; + break; + case 1: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_OUT ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + case 2: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_ERR ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + } + fhs[i] = CreateFile(redirects[i], access, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); + debug(" %d redirected -> %p\n", i, fhs[i]); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 8a8f2bb..c06af72 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -33,8 +33,9 @@ * Otherwise increase the minor version number: * 1.0: Initial release. * 1.1: Added the wait2 RPC. + * 1.2: Add more redirection options to the run RPC. */ -#define PROTOCOL_VERSION "testagentd 1.1" +#define PROTOCOL_VERSION "testagentd 1.2" #define BLOCK_SIZE 4096 @@ -730,10 +731,10 @@ static void do_run(SOCKET client) debug(" run '%s", argv[0]); for (i = 1; i < argc; i++) debug("' '%s", argv[i]); - debug("' %s%s%s%s%s%s\n", - redirects[0][0] ? " <" : "", redirects[0], - redirects[1][0] ? " >" : "", redirects[1], - redirects[2][0] ? " 2>" : "", redirects[2]); + debug("'%s%s%s%s%s%s\n", + !redirects[0][0] ? "" : " <", redirects[0], + !redirects[1][0] ? "" : (flags & RUN_DNTRUNC_OUT) ? " >>" : " >", redirects[1], + !redirects[2][0] ? "" : (flags & RUN_DNTRUNC_ERR) ? " 2>>" : " 2>", redirects[2]); pid = platform_run(argv, flags, redirects); if (!pid)

1 0

Daniel Jelinski : comctl32/listview: Implement overlay image support.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: b9fe178f3657b1955d27e9676ef5c2c4a7aed432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fe178f3657b1955d27e9676… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Feb 21 21:51:36 2013 +0100 comctl32/listview: Implement overlay image support. --- dlls/comctl32/listview.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 83bdf56..2dc0a95 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -75,7 +75,6 @@ * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) * -- LVIS_DROPHILITED - * -- LVIS_OVERLAYMASK * * Styles * -- LVS_NOLABELWRAP @@ -4586,7 +4585,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; lvItem.iItem = nItem; lvItem.iSubItem = nSubItem; lvItem.state = 0; @@ -4707,7 +4706,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style); + style | (lvItem.state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */

1 0

Andrew Talbot : oleaut32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: eedf2f6fab3756eebd575c42aea45d8251f569fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedf2f6fab3756eebd575c42a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:17 2013 +0000 oleaut32: Avoid signed-unsigned integer comparisons. --- dlls/oleaut32/olepicture.c | 4 ++-- dlls/oleaut32/olepropframe.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++------ dlls/oleaut32/typelib2.c | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3fdb1c7..4b3e9dd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1420,8 +1420,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } while (!headerisdata); if (statfailed) { /* we don't know the size ... read all we get */ - int sizeinc = 4096; - int origsize = sizeinc; + unsigned int sizeinc = 4096; + unsigned int origsize = sizeinc; ULONG nread = 42; TRACE("Reading all data from stream.\n"); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index e566266..9a563f1 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -168,7 +168,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) IPropertyPage **property_page; PropertyPageSite *property_page_site; HRESULT res; - int i; + ULONG i; HMODULE hcomctl; HRSRC property_sheet_dialog_find = NULL; HGLOBAL property_sheet_dialog_load = NULL; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0f3ca6b..6d37bd4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4388,7 +4388,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( ITypeInfo **ppTInfo) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT i; + int i; TRACE("%p %s %p\n", This, debugstr_guid(guid), ppTInfo); @@ -4553,7 +4553,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( BOOL *pfName) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), tic, fdc, vrc, pc; + int tic; + UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc; TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal, pfName); @@ -4564,6 +4565,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( if(!memcmp(szNameBuf,pTInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *pFInfo = &pTInfo->funcdescs[fdc]; + int pc; + if(!memcmp(szNameBuf,pFInfo->Name, nNameBufLen)) goto ITypeLib2_fnIsName_exit; for(pc=0; pc < pFInfo->funcdesc.cParams; pc++) if(!memcmp(szNameBuf,pFInfo->pParamDesc[pc].Name, nNameBufLen)) @@ -4599,7 +4602,8 @@ static HRESULT WINAPI ITypeLib2_fnFindName( UINT16 *found) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - UINT tic, count = 0; + int tic; + UINT count = 0; UINT len; TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); @@ -4616,7 +4620,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( if(!memcmp(name, pTInfo->Name, len)) goto ITypeLib2_fnFindName_exit; for(fdc = 0; fdc < pTInfo->TypeAttr.cFuncs; ++fdc) { TLBFuncDesc *func = &pTInfo->funcdescs[fdc]; - UINT pc; + int pc; if(!memcmp(name, func->Name, len)) goto ITypeLib2_fnFindName_exit; for(pc = 0; pc < func->funcdesc.cParams; pc++) { @@ -4995,7 +4999,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - UINT i; + int i; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); @@ -5097,7 +5101,7 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { - UINT i, j; + UINT i; TRACE("destroying ITypeInfo(%p)\n",This); @@ -5112,6 +5116,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->TypeAttr.cFuncs; ++i) { + int j; TLBFuncDesc *pFInfo = &This->funcdescs[i]; for(j = 0; j < pFInfo->funcdesc.cParams; j++) { diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 689d9af..354ec8a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2050,8 +2050,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( if(This->dual) This->dual->typedata = This->typedata; } else { + unsigned int j; + iter = This->typedata->next; - for(i=0; i<index; i++) + for (j = 0; j < index; j++) iter = iter->next; insert->next = iter->next;

1 0

Andrew Talbot : ole32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: faaeeea9376b16a71f0bdf647aa6200ce2b173d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaeeea9376b16a71f0bdf647… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 21 22:30:15 2013 +0000 ole32: Avoid signed-unsigned integer comparisons. --- dlls/ole32/compositemoniker.c | 12 ++++++------ dlls/ole32/storage32.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a6cfd62..ed154f2 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1638,10 +1638,10 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = ******************************************************************************/ static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, - ULONG currentPos, BOOL leftToRigth, IEnumMoniker ** ppmk) + ULONG currentPos, BOOL leftToRight, IEnumMoniker ** ppmk) { EnumMonikerImpl* newEnumMoniker; - int i; + ULONG i; if (currentPos > tabSize) return E_INVALIDARG; @@ -1665,17 +1665,17 @@ EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, return E_OUTOFMEMORY; } - if (leftToRigth) + if (leftToRight) for (i=0;i<tabSize;i++){ newEnumMoniker->tabMoniker[i]=tabMoniker[i]; IMoniker_AddRef(tabMoniker[i]); } else - for (i=tabSize-1;i>=0;i--){ + for (i = tabSize; i > 0; i--){ - newEnumMoniker->tabMoniker[tabSize-i-1]=tabMoniker[i]; - IMoniker_AddRef(tabMoniker[i]); + newEnumMoniker->tabMoniker[tabSize-i]=tabMoniker[i - 1]; + IMoniker_AddRef(tabMoniker[i - 1]); } *ppmk=&newEnumMoniker->IEnumMoniker_iface; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f259d24..1d64ab0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1767,7 +1767,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( StorageBaseImpl *This = impl_from_IStorage(iface); BOOL skip_storage = FALSE, skip_stream = FALSE; - int i; + DWORD i; TRACE("(%p, %d, %p, %p, %p)\n", iface, ciidExclude, rgiidExclude, @@ -2822,7 +2822,7 @@ static HRESULT StorageImpl_Construct( { ULONG current_block = This->extBigBlockDepotStart; ULONG cache_size = This->extBigBlockDepotCount * 2; - int i; + ULONG i; This->extBigBlockDepotLocations = HeapAlloc(GetProcessHeap(), 0, sizeof(ULONG) * cache_size); if (!This->extBigBlockDepotLocations)

1 0

Dmitry Timoshkov : gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: c5e129a7e40775ca156c94f01a5aa5260451c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e129a7e40775ca156c94f01… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 22 19:18:23 2013 +0800 gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel. --- dlls/gdiplus/image.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 59ea41c..ff27334 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -297,7 +297,6 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, BYTE r, g, b, a; BYTE index; BYTE *row; - TRACE("%p %d %d %p\n", bitmap, x, y, color); if(!bitmap || !color || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) @@ -503,7 +502,6 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, { BYTE a, r, g, b; BYTE *row; - TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); if(!bitmap || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) return InvalidParameter;

1 0

Jörg Höhle : winmm: WAVE_OPEN_QUERY causes no WIM /WOM_OPEN notification.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 4f0743bffabe49db064248881ade24813cbb63ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0743bffabe49db064248881… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 20 22:53:33 2013 +0100 winmm: WAVE_OPEN_QUERY causes no WIM/WOM_OPEN notification. --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9e59e2f..992cca7 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -854,6 +854,16 @@ static void wave_out_test_deviceOut(int device, double duration, rc=WaitForSingleObject(hevent,1500); ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + wout = (HWAVEOUT)0xdeadf00d; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags|WAVE_FORMAT_QUERY); + ok(rc==MMSYSERR_NOERROR, "WAVE_FORMAT_QUERY(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + ok(wout==(HWAVEOUT)0xdeadf00d, "WAVE_FORMAT_QUERY handle %p\n", wout); + + rc=WaitForSingleObject(hevent,20); + ok(rc==WAIT_TIMEOUT, "Notification from %s rc=%x\n", + wave_open_flags(flags|WAVE_FORMAT_QUERY),rc); + HeapFree(GetProcessHeap(), 0, buffer); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a5ffbc0..1dceb26 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2726,7 +2726,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WODM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveOut) @@ -3356,7 +3356,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WIDM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveIn)

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 985814599076e591f72c2e019ab8dbb2141826d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985814599076e591f72c2e019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 12:30:07 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 80 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 10 +++++ dlls/vbscript/vbdisp.c | 2 +- 3 files changed, 21 insertions(+), 71 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1a3dae7..a576f08 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,66 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBinaryCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTextCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDatabaseCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGeneralDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbObjectError(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1826,16 +1766,16 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, - {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, - {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, - {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, - {DISPID_GLOBAL_VBDATABASECOMPARE, Global_vbDatabaseCompare, BP_GET}, - {DISPID_GLOBAL_VBGENERALDATE, Global_vbGeneralDate, BP_GET}, - {DISPID_GLOBAL_VBLONGDATE, Global_vbLongDate, BP_GET}, - {DISPID_GLOBAL_VBSHORTDATE, Global_vbShortDate, BP_GET}, - {DISPID_GLOBAL_VBLONGTIME, Global_vbLongTime, BP_GET}, - {DISPID_GLOBAL_VBSHORTTIME, Global_vbShortTime, BP_GET}, - {DISPID_GLOBAL_VBOBJECTERROR, Global_vbObjectError, BP_GET}, + {DISPID_GLOBAL_VBUSEDEFAULT, NULL, BP_GET, -2}, + {DISPID_GLOBAL_VBBINARYCOMPARE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBTEXTCOMPARE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBDATABASECOMPARE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBGENERALDATE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBLONGDATE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBSHORTDATE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, 3}, + {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, 4}, + {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, 0x80040000}, {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6472b95..ee68e9e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -85,6 +85,16 @@ TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 +TestConstant "vbUseDefault", vbUseDefault, -2 +TestConstant "vbBinaryCompare", vbBinaryCompare, 0 +TestConstant "vbTextCompare", vbTextCompare, 1 +TestConstant "vbDatabaseCompare", vbDatabaseCompare, 2 +TestConstant "vbGeneralDate", vbGeneralDate, 0 +TestConstant "vbLongDate", vbLongDate, 1 +TestConstant "vbShortDate", vbShortDate, 2 +TestConstant "vbLongTime", vbLongTime, 3 +TestConstant "vbShortTime", vbShortTime, 4 +TestConstantI4 "vbObjectError", vbObjectError, &h80040000& Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 843d5c8..5a23c71 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -151,7 +151,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { int val = prop->min_args; - if(val < 0x4000) { + if(val < 0x4000 && (INT16)val == val) { V_VT(res) = VT_I2; V_I2(res) = val; }else {

1 0