March 2013 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/VMs: Fix counting the powered on non-base VMs.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 2efbe36d11c083b9c7fd66b33d4d937b18064547 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2efbe36d11c083b9c7fd66b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:08 2013 +0100 testbot/VMs: Fix counting the powered on non-base VMs. VMs with a 'disabling' role must be ignored. Make a clear distinction between the 'enabled' VMs which we could use but may currently be powered off (e.g. dirty VMs), and the 'powered on' ones that use resources right now. Also make it clear that these methods are based on the Status and Role fields, not on what the VM hypervisor thinks. --- testbot/lib/WineTestBot/VMs.pm | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 360958e..b519f33 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -442,6 +442,25 @@ sub Status return $NewStatus; } +sub HasPoweredOnStatus($) +{ + my ($self) = @_; + my $Status = $self->Status; + return $Status eq "reverting" or + $Status eq "sleeping" or + $Status eq "idle" or + $Status eq "running"; +} + +sub HasEnabledRole($) +{ + my ($self) = @_; + my $Role = $self->Role; + return $Role eq "extra" or + $Role eq "base" or + $Role eq "winetest"; +} + sub Validate { my $self = shift; @@ -588,12 +607,8 @@ sub CountPoweredOnNonBaseVMs my $PoweredOnVMs = 0; foreach my $VM (@{$self->GetItems()}) { - my $VMStatus = $VM->Status; - if ($VM->Role ne "base" && - ($VMStatus eq "reverting" || - $VMStatus eq "sleeping" || - $VMStatus eq "idle" || - $VMStatus eq "running")) + if ($VM->Role ne "base" and $VM->HasEnabledRole() and + $VM->HasPoweredOnStatus()) { $PoweredOnVMs++; }

1 0

Francois Gouget : testbot: When restarting a task, reset all the fields related to its previous run.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 0160d815ceca3746d5464741eefbd164543bb7fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=0160d815ceca3746d5464741… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:55:12 2013 +0100 testbot: When restarting a task, reset all the fields related to its previous run. Some fields like the start and stop time would still be displayed and could be confusing. The 'TestFailures' field could even not get reset if the task then is canceled or fails to run and thus report incorrect results. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index cd6c427..c73dea1 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -231,6 +231,10 @@ sub Restart system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); } $Task->Status("queued"); + $Task->ChildPid(undef); + $Task->Started(undef); + $Task->Ended(undef); + $Task->TestFailures(undef); } # Subsequent steps only contain files generated by the previous steps system("rm", "-rf", "$JobDir/" . $Step->No) if (!$FirstStep);

1 0

Francois Gouget : testbot/Engine: Add --shutdown, --kill-tasks and --kill-vms options.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 9641db82e569662e9cb53188f241678aa77719e3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9641db82e569662e9cb53188… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 16:20:57 2013 +0100 testbot/Engine: Add --shutdown, --kill-tasks and --kill-vms options. This makes it possible to cleanly stop the Engine and all its related tasks and VMs. --- testbot/bin/Engine.pl | 102 ++++++++++++++++++++++++++++-- testbot/lib/WineTestBot/Engine/Notify.pm | 23 ++++++- 2 files changed, 118 insertions(+), 7 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f5b0661..fec0c67 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -43,6 +43,7 @@ use Socket; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Engine::Events; +use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -50,6 +51,8 @@ use WineTestBot::PendingPatchSets; use WineTestBot::Utils; use WineTestBot::VMs; +my $RunEngine = 1; + sub FatalError { LogMsg @_; @@ -65,7 +68,8 @@ sub FatalError =item C<Cleanup()> The Cleanup() function gets the tasks and VMs in a consistent state on the -Engine startup. It has to contend with two main scenarios: +Engine startup or cleanly stops the tasks and VMs on shutdown. +It has to contend with three main scenarios: - The Engine being restarted. Any task started just before that is still running should still have its process and powered on VM and should be left alone so it can complete normally. If a task died unexpectedly while the @@ -75,6 +79,8 @@ Engine startup. It has to contend with two main scenarios: it is quite possible that they will still be running. Hopefully any running process matching a task's ChildPid will belong to another user so we don't mistake that case for the previous one. +- A shutdown of the Engine and its tasks / VMs. In this case it's used to + kill the running tasks and requeue them, and/or shut down the VMs. In all cases we only trust that a VM status field is still valid: - It is 'running' and used by a task that is still running. @@ -86,8 +92,10 @@ In all other cases the VM will be powered off and marked as dirty. =back =cut -sub Cleanup() +sub Cleanup(;$$) { + my ($KillTasks, $KillVMs) = @_; + # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. my %BusyVMs; @@ -115,6 +123,14 @@ sub Cleanup() # Kill the task process if it's still there. kill("TERM", $Task->ChildPid); } + elsif ($KillTasks) + { + # Kill the task and requeue. Note that since the VM is still running + # we're not in the computer reboot case so ChildPid is probably + # still valid. + kill("TERM", $Task->ChildPid); + $Requeue = 1; + } elsif (!kill(0, $Task->ChildPid)) { # The event that caused the WineTestBot server to restart probably @@ -165,8 +181,12 @@ sub Cleanup() if ($VM->IsPoweredOn()) { next if ($VM->Status eq "idle"); - if (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and - defined $VM->ChildPid and kill(0, $VM->ChildPid)) + if ($KillVMs) + { + kill("TERM", $VM->ChildPid) if (defined $VM->ChildPid); + } + elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and + defined $VM->ChildPid and kill(0, $VM->ChildPid)) { # This VM is still being reverted. Let that process run its course. LogMsg "$VMKey is being reverted\n"; @@ -188,6 +208,43 @@ sub Cleanup() } +sub HandleShutdown +{ + my ($KillTasks, $KillVMs) = @_; + + if (!defined $KillTasks or !defined $KillVMs) + { + LogMsg "Missing parameters in shutdown message\n"; + return "0Missing shutdown parameters"; + } + + # Untaint parameters + if ($KillTasks =~ /^([01])$/) + { + $KillTasks = $1; + } + else + { + LogMsg "Invalid KillTasks $KillTasks in shutdown message\n"; + return "0Invalid KillTasks shutdown parameter\n"; + } + if ($KillVMs =~ /^([01])$/) + { + $KillVMs = $1; + } + else + { + LogMsg "Invalid KillVMs $KillVMs in shutdown message\n"; + return "0Invalid KillVMs shutdown parameter\n"; + } + + Cleanup($KillTasks, $KillVMs); + $RunEngine = 0; + + LogMsg "Waiting for the last clients to disconnect...\n"; + return "1OK\n"; +} + sub HandlePing { return "1pong\n"; @@ -492,6 +549,7 @@ my %Handlers=( "jobstatuschange" => \&HandleJobStatusChange, "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, + "shutdown" => \&HandleShutdown, "taskcomplete" => \&HandleTaskComplete, "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, @@ -621,6 +679,40 @@ sub REAPER sub main { + my ($Shutdown, $KillTasks, $KillVMs); + while (@ARGV) + { + my $Arg = shift @ARGV; + if ($Arg eq "--shutdown") + { + $Shutdown = 1; + } + elsif ($Arg eq "--kill-tasks") + { + $KillTasks = 1; + $Shutdown = 1; + } + elsif ($Arg eq "--kill-vms") + { + $KillVMs = 1; + $Shutdown = 1; + } + else + { + die "Usage: Engine.pl [--shutdown] [--kill-tasks] [--kill-vms]"; + } + } + if ($Shutdown) + { + my $ErrMessage = Shutdown($KillTasks, $KillVMs); + if (defined $ErrMessage) + { + print STDERR "$ErrMessage\n"; + exit 1; + } + exit 0; + } + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; $SIG{CHLD} = \&REAPER; @@ -657,7 +749,7 @@ sub main AddEvent("SafetyNet", 600, 1, \&SafetyNet); my @Clients; - while (1) + while ($RunEngine or @Clients) { my $ReadyRead = ""; my $ReadyWrite = ""; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 8452615..1a1ab6d 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,8 +33,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &JobRestart - &TaskComplete &VMStatusChange &FoundWinetestUpdate +(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel + &JobRestart &TaskComplete &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -74,6 +74,25 @@ sub SendCmdReceiveReply return $Reply; } +sub Shutdown +{ + my ($KillTasks, $KillVMs) = @_; + + $KillTasks ||= 0; + $KillVMs ||= 0; + my $Reply = SendCmdReceiveReply("shutdown $KillTasks $KillVMs\n"); + if (length($Reply) < 1) + { + return "Unrecognized reply received from engine"; + } + if (substr($Reply, 0, 1) eq "1") + { + return undef; + } + + return substr($Reply, 1); +} + sub PingEngine { my $Reply = SendCmdReceiveReply("ping\n");

1 0

Francois Gouget : testbot: Document a harmless race in the task startup and its consequences.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: e7ea9b8e63644471762d7cf4fda4e7018f0dbe02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ea9b8e63644471762d7cf4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:54:31 2013 +0100 testbot: Document a harmless race in the task startup and its consequences. --- testbot/lib/WineTestBot/Tasks.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 56028d8..8ca9da0 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -129,6 +129,10 @@ sub Run exit(1); } + # Note that if the child process completes quickly (typically due to some + # error), it may set ChildPid to undef before we get here. So we may end up + # with non-running tasks for which ChildPid is set. That's ok because + # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); my ($ErrProperty, $ErrMessage) = $self->Save(); @@ -206,6 +210,7 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), + # Note: ChildPid is only valid when Status == 'running'. CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19),

1 0

Francois Gouget : testbot/VMs: Change a couple of default values for new VM objects.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: f93154263153680594e4b55d5ff6d9f32bceda2f URL: http://source.winehq.org/git/tools.git/?a=commit;h=f93154263153680594e4b55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:55:37 2013 +0100 testbot/VMs: Change a couple of default values for new VM objects. --- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index fd064a1..fdd06cb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -217,8 +217,8 @@ sub InitializeNew { my $self = shift; - $self->Status("Idle"); - $self->IdleSnapshot("winetest_on"); + $self->Status("idle"); + $self->IdleSnapshot("wtb"); $self->SUPER::InitializeNew(@_); }

1 0

Francois Gouget : testbot/scripts: Fix the initd script's indentation.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 6d3107a5fee397475202efc6cef1895ffb2dba92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d3107a5fee397475202efc6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:50:02 2013 +0100 testbot/scripts: Fix the initd script's indentation. --- testbot/scripts/initd | 88 ++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index d782cbc..fe670ed 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -159,50 +159,50 @@ then # considered a success. case "$1" in - start) - echo -n "Starting WineTestBot " - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - /sbin/startproc -u $USER $DAEMON - - # Remember status and be verbose - rc_status -v - ;; - stop) - echo -n "Shutting down WineTestBot " - ## Stop daemon with killproc(8) and if this fails - ## killproc sets the return value according to LSB. - - /sbin/killproc -TERM $DAEMON - - # Remember status and be verbose - rc_status -v - ;; - try-restart|condrestart|reload) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - # Remember status and be quiet - rc_status - ;; - restart|force-reload) - ## Stop the service and regardless of whether it was - ## running or not, start it again. - $0 stop - $0 start - - # Remember status and be quiet - rc_status - ;; + start) + echo -n "Starting WineTestBot " + ## Start daemon with startproc(8). If this fails + ## the return value is set appropriately by startproc. + /sbin/startproc -u $USER $DAEMON + + # Remember status and be verbose + rc_status -v + ;; + stop) + echo -n "Shutting down WineTestBot " + ## Stop daemon with killproc(8) and if this fails + ## killproc sets the return value according to LSB. + + /sbin/killproc -TERM $DAEMON + + # Remember status and be verbose + rc_status -v + ;; + try-restart|condrestart|reload) + ## Do a restart only if the service was active before. + ## Note: try-restart is now part of LSB (as of 1.9). + ## RH has a similar command named condrestart. + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + # Remember status and be quiet + rc_status + ;; + restart|force-reload) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; status) status_of_proc $DAEMON echo -n "Checking for service WineTestBot "

1 0

Francois Gouget : testbot: Fix and simplify filtering the enabled VMs.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 08297b4d2088f6aa98a7223dbf623ba958092f7e URL: http://source.winehq.org/git/tools.git/?a=commit;h=08297b4d2088f6aa98a7223d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:20 2013 +0100 testbot: Fix and simplify filtering the enabled VMs. When a VM is marked as retired or deleted its status is not relevant anymore. So filtering on the status alone is incorrect. Also rename the functions as there is more than one role for disabled VMs, and there could be more than one status too. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/bin/Engine.pl | 3 ++- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 11 +++++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c776fe5..c8909e6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -92,7 +92,7 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - $VMs->FilterNotOffline(); + $VMs->FilterEnabledStatus(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index da3e54c..0a467fb 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -402,7 +402,8 @@ sub InitVMs() # On startup we don't know what state the VMs are in. So consider them all # to be dirty. my $VMs = CreateVMs(); - $VMs->FilterNotOffline(); + $VMs->FilterEnabledRole(); + $VMs->FilterEnabledStatus(); foreach my $VM (@{$VMs->GetItems()}) { $VM->Status('dirty'); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 22e00e1..e8143ca 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,7 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - $VMs->FilterNotOffline(); + $VMs->FilterEnabledStatus(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b519f33..ff57d5a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -639,10 +639,17 @@ sub SortKeysBySortOrder return \@SortedKeys; } -sub FilterNotOffline($) +sub FilterEnabledRole($) { my ($self) = @_; - # All but the offline ones + # Filter out the disabled VMs, that is the retired and deleted ones + $self->AddFilter("Role", ["extra", "base", "winetest"]); +} + +sub FilterEnabledStatus($) +{ + my ($self) = @_; + # Filter out the disabled VMs, that is the offline ones $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); }

1 0

Francois Gouget : testbot/VMs: Fix _GetSnapshot() to report an error when given a nonexistent snapshot.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 89df2fd54a79730a8d63fb4b1256737ef0b2f828 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89df2fd54a79730a8d63fb4b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 10:55:28 2013 +0100 testbot/VMs: Fix _GetSnapshot() to report an error when given a nonexistent snapshot. --- testbot/lib/WineTestBot/VMs.pm | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index fdd06cb..360958e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -287,9 +287,8 @@ sub _GetSnapshot($$) last; } } - $@ = "Snapshot '$SnapshotName' not found" if (!$Snapshot); }; - return ($@->message(), undef, undef) if ($@); + return ("Snapshot '$SnapshotName' not found", undef, undef) if (!defined $Snapshot); return (undef, $Domain, $Snapshot); }

1 0

Francois Gouget : testbot/Engine: Refuse to start a new server if one is running already.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 142b7fcdd8328483b9d283c37e7b419df805e248 URL: http://source.winehq.org/git/tools.git/?a=commit;h=142b7fcdd8328483b9d283c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:48:23 2013 +0100 testbot/Engine: Refuse to start a new server if one is running already. --- testbot/bin/Engine.pl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index fec0c67..5fcce05 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -712,6 +712,11 @@ sub main } exit 0; } + if (PingEngine()) + { + print STDERR "The WineTestBot Engine is running already\n"; + exit 1; + } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV};

1 0

Francois Gouget : testbot/TestAgent: Optimize GetVersion().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: f6535406115e2e158b032acd7e8fde55c1264f1a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6535406115e2e158b032acd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:41 2013 +0100 testbot/TestAgent: Optimize GetVersion(). To get the server version we just need to connect, we don't need to send a full RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 4aaaea0..f542991 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -987,8 +987,8 @@ sub GetVersion($) if (!$self->{agentversion}) { - # Force a connection - $self->Ping(); + # Retrieve the server version + $self->_Connect(); } # And return the version we got. # If the connection failed it will be undef as expected.

1 0

Francois Gouget : testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 6032b11f0b005fcd489445ff0f66ef7b4e67ca3f URL: http://source.winehq.org/git/tools.git/?a=commit;h=6032b11f0b005fcd489445ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:14:12 2013 +0100 testbot/TestAgent: Fix Wait() to not depend on other RPCs to retrieve the server version. --- testbot/lib/WineTestBot/TestAgent.pm | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index bce1a78..4aaaea0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1107,6 +1107,9 @@ sub Wait($$$) # Add 1 second for the reply to come back my $OldTimeout = $self->SetTimeout($Timeout + 1) if ($Timeout); + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + # Send the command if ($self->{agentversion} =~ / 1\.0$/) {

1 0

Francois Gouget : testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 6c6aa897db13a20ca4bd8c93b8f44361916d0dae URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c6aa897db13a20ca4bd8c93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 13:12:53 2013 +0100 testbot/testagentd: Fix the zero / infinite timeouts in the wait2 RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 6 +++--- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 645a18c..bce1a78 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1122,7 +1122,7 @@ sub Wait($$$) if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize(2) or !$self->_SendUInt64($Pid) or - !$self->_SendUInt32($Timeout)) + !$self->_SendUInt32(defined $Timeout ? $Timeout : 0xffffffff)) { return undef; } diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index 621ce98..fffaa4b 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -64,6 +64,8 @@ enum run_flags_t { RUN_DNTRUNC_ERR = 4, }; +#define RUN_NOTIMEOUT ((uint32_t)0xffffffff) + /* Starts the specified command in the background and reports the status to * the client. */ diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 48eef73..e003135 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -154,7 +154,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return 0; } - if (timeout) + if (timeout != RUN_NOTIMEOUT) deadline = time(NULL) + timeout; while (!child->reaped) { @@ -170,14 +170,14 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child debug("Waiting for " U64FMT "\n", pid); FD_ZERO(&rfds); FD_SET(client, &rfds); - if (timeout) + if (timeout != RUN_NOTIMEOUT) { 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); + ready = select(client+1, &rfds, NULL, NULL, timeout != RUN_NOTIMEOUT ? &tv : NULL); if (ready == 0) { /* This is the timeout */ diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 92fc9aa..a0dccfa 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -177,7 +177,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child handles[0] = WSACreateEvent(); WSAEventSelect(client, handles[0], FD_CLOSE); handles[1] = child->handle; - r = WaitForMultipleObjects(2, handles, FALSE, timeout * 1000); + r = WaitForMultipleObjects(2, handles, FALSE, timeout == RUN_NOTIMEOUT ? INFINITE : timeout * 1000); success = 0; switch (r) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 534495d..75782c4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -34,8 +34,9 @@ * 1.0: Initial release. * 1.1: Added the wait2 RPC. * 1.2: Add more redirection options to the run RPC. + * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. */ -#define PROTOCOL_VERSION "testagentd 1.2" +#define PROTOCOL_VERSION "testagentd 1.3" #define BLOCK_SIZE 65536

1 0

Francois Gouget : testbot/scripts: The WineTestBot does not support SIGHUP so emulate 'initd reload' through try-restart.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 0a7915b95b3279c5dd1df4bf8f300c24cbc025f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a7915b95b3279c5dd1df4bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:49:09 2013 +0100 testbot/scripts: The WineTestBot does not support SIGHUP so emulate 'initd reload' through try-restart. --- testbot/scripts/initd | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 8853f6c..d782cbc 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -86,7 +86,7 @@ then $0 start ;; - try-restart) + try-restart|reload) ## Do a restart only if the service was active before. if $0 status then @@ -94,12 +94,6 @@ then fi ;; - reload) - log_daemon_msg "Reloading the WineTestBot configuration" - killproc -p $PIDFILE $DAEMON -HUP - log_end_msg $? - ;; - status) status="0" pidofproc -p $PIDFILE $DAEMON >/dev/null || status="$?" @@ -184,7 +178,7 @@ then # Remember status and be verbose rc_status -v ;; - try-restart|condrestart) + try-restart|condrestart|reload) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. @@ -209,15 +203,6 @@ then # Remember status and be quiet rc_status ;; - reload) - log_daemon_msg "Reloading service WineTestBot" - killproc -HUP $DAEMON - log_end_msg $? - - ## Otherwise if it does not support reload: - #rc_failed 3 - #rc_status -v - ;; status) status_of_proc $DAEMON echo -n "Checking for service WineTestBot "

1 0

Piotr Caban : msvcrt: Fixed copied buffer size in _ui64tow_s.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 737bb1bb1800e727024096f231b8777a24fa4ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737bb1bb1800e727024096f23… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 13:37:29 2013 +0100 msvcrt: Fixed copied buffer size in _ui64tow_s. --- dlls/msvcrt/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e4e94ff..1b2dea8 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1187,7 +1187,7 @@ int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, MSVCRT_wchar_t *str, return MSVCRT_EINVAL; } - memcpy(str, pos, buffer-pos+65); + memcpy(str, pos, (buffer-pos+65)*sizeof(MSVCRT_wchar_t)); return 0; } @@ -1248,7 +1248,7 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) /********************************************************************* * _ultow_s (MSVCRT.@) */ -int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix) +int CDECL _ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong digit; WCHAR buffer[33], *pos; @@ -1295,7 +1295,7 @@ int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix return MSVCRT_ERANGE; } - memcpy(str, pos, len * sizeof(WCHAR)); + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); return 0; }

1 0

Jacek Caban : secur32: Pass whole schan_credentials struct to schannel backend implementations.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: b7a75b468ab57d4e03304e587f1f74b3f4167ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a75b468ab57d4e03304e587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 13:55:20 2013 +0100 secur32: Pass whole schan_credentials struct to schannel backend implementations. --- dlls/secur32/schannel.c | 14 ++++---------- dlls/secur32/schannel_gnutls.c | 15 +++++++-------- dlls/secur32/schannel_macosx.c | 13 ++++++------- dlls/secur32/secur32_priv.h | 14 +++++++++----- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bf64fcd..387eaad 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -50,12 +50,6 @@ struct schan_handle enum schan_handle_type type; }; -struct schan_credentials -{ - ULONG credential_use; - schan_imp_certificate_credentials credentials; -}; - struct schan_context { schan_imp_session session; @@ -316,7 +310,7 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) + if (!schan_imp_allocate_certificate_credentials(creds)) { schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; @@ -424,7 +418,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - schan_imp_free_certificate_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -705,7 +699,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials)) + if (!schan_imp_create_session(&ctx->session, cred)) { schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); @@ -1329,7 +1323,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - schan_imp_free_certificate_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred); HeapFree(GetProcessHeap(), 0, cred); } } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b273e96..8975b2d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,12 +106,11 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); + int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -129,7 +128,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials_t)cred); + (gnutls_certificate_credentials_t)cred->credentials); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -405,17 +404,17 @@ again: return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { - int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)&c->credentials); if (ret != GNUTLS_E_SUCCESS) pgnutls_perror(ret); return (ret == GNUTLS_E_SUCCESS); } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); + pgnutls_certificate_free_credentials(c->credentials); } static void schan_gnutls_log(int level, const char *msg) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 05b0a5e..2acb6ca 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -631,19 +631,18 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, } -BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) +BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { struct mac_session *s; OSStatus status; - TRACE("(%p, %d)\n", session, is_server); + TRACE("(%p)\n", session); s = HeapAlloc(GetProcessHeap(), 0, sizeof(*s)); if (!s) return FALSE; - status = SSLNewContext(is_server, &s->context); + status = SSLNewContext(cred->credential_use == SECPKG_CRED_INBOUND, &s->context); if (status != noErr) { ERR("Failed to create session context: %ld\n", (long)status); @@ -966,14 +965,14 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } -BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +BOOL schan_imp_allocate_certificate_credentials(schan_credentials *c) { /* The certificate is never really used for anything. */ - *c = NULL; + c->credentials = NULL; return TRUE; } -void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +void schan_imp_free_certificate_credentials(schan_credentials *c) { } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 164a2eb..bc4b74b 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -209,7 +209,12 @@ SecPkgInfoA *ntlm_package_infoA; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; -typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; + +typedef struct schan_credentials +{ + ULONG credential_use; + void *credentials; +} schan_credentials; struct schan_transport; @@ -237,8 +242,7 @@ extern int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ extern schan_imp_session schan_session_for_transport(struct schan_transport* t) DECLSPEC_HIDDEN; /* schannel implementation interface */ -extern BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - schan_imp_certificate_credentials cred) DECLSPEC_HIDDEN; +extern BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) DECLSPEC_HIDDEN; extern void schan_imp_dispose_session(schan_imp_session session) DECLSPEC_HIDDEN; extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; @@ -253,8 +257,8 @@ extern SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buf SIZE_T *length) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; -extern BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) DECLSPEC_HIDDEN; -extern void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) DECLSPEC_HIDDEN; +extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : winhttp: Remove support for MSG_PEEK.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a55e3d4f57d5585ce0cd4f239d01794751bf45ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55e3d4f57d5585ce0cd4f239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:27:15 2013 +0100 winhttp: Remove support for MSG_PEEK. --- dlls/winhttp/net.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 9fca4b5..631939a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -667,17 +667,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd SIZE_T size, cread; BOOL res, eof; - if (flags & ~(MSG_PEEK | MSG_WAITALL)) - FIXME("SSL_read does not support the following flags: %08x\n", flags); - - if (flags & MSG_PEEK && conn->peek_msg) - { - if (len < conn->peek_len) FIXME("buffer isn't big enough, should we wrap?\n"); - *recvd = min( len, conn->peek_len ); - memcpy( buf, conn->peek_msg, *recvd ); - return TRUE; - } - else if (conn->peek_msg) + if (conn->peek_msg) { *recvd = min( len, conn->peek_len ); memcpy( buf, conn->peek_msg, *recvd ); @@ -691,7 +681,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd conn->peek_msg = NULL; } /* check if we have enough data from the peek buffer */ - if (!(flags & MSG_WAITALL) || (*recvd == len)) return TRUE; + if (!(flags & MSG_WAITALL) || *recvd == len) return TRUE; } size = *recvd; @@ -712,14 +702,6 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd size += cread; }while(!size || ((flags & MSG_WAITALL) && size < len)); - if(size && (flags & MSG_PEEK)) { - conn->peek_msg_mem = conn->peek_msg = heap_alloc(size); - if(!conn->peek_msg) - return FALSE; - - memcpy(conn->peek_msg, buf, size); - } - TRACE("received %ld bytes\n", size); *recvd = size; return TRUE;

1 0

Hans Leidekker : winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: bb3097f01e532583c8c78c9daf64ff29f8eb255c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3097f01e532583c8c78c9da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:37 2013 +0100 winhttp: Add a read-ahead buffer to allow WinHttpQueryDataAvailable to return the right values in chunked mode. This is a port of wininet commit 3d02c42b39c7346a97c41974418a6d01a29f9b81. --- dlls/winhttp/request.c | 381 +++++++++++++++++++++++++--------------- dlls/winhttp/tests/winhttp.c | 78 ++++++++ dlls/winhttp/winhttp_private.h | 5 + 3 files changed, 318 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb3097f01e532583c8c78…

1 0

Piotr Caban : msvcrt: Remove incorrect cast in fgetws function.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: cde73251d818afdb135b722889d6f083fdb6c45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73251d818afdb135b72288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:39:37 2013 +0100 msvcrt: Remove incorrect cast in fgetws function. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28aefc1..6e8b324 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3315,7 +3315,7 @@ MSVCRT_wint_t CDECL MSVCRT_getwchar(void) */ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* file) { - int cc = MSVCRT_WEOF; + MSVCRT_wint_t cc = MSVCRT_WEOF; MSVCRT_wchar_t * buf_start = s; TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", @@ -3325,7 +3325,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { - *s++ = (char)cc; + *s++ = cc; size --; } if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/

1 0

Qian Hong : atl100: Fixed register class types in AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: ed62fcb70085c8228e2ad16953dc66a16bde73d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed62fcb70085c8228e2ad1695… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:14:01 2013 +0800 atl100: Fixed register class types in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 2 +- dlls/atl100/tests/atl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index cdefbea..319b3e8 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -95,7 +95,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; wcex.cbSize = sizeof(wcex); - wcex.style = 0; + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = GetModuleHandleW( NULL ); diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 76fa9c4..1304ac1 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -583,11 +583,13 @@ static void test_ax_win(void) wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); ok(ret, "AtlAxWin100 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); } START_TEST(atl)

1 0

Jacek Caban : jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 4ece40f86bf6d7cd52ad2958a645ec162813dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ece40f86bf6d7cd52ad2958a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 25 12:28:38 2013 +0100 jscript: Return buffer pointer separately from jsstr_t from jsstr_alloc_len. --- dlls/jscript/array.c | 34 ++++++++++++------------ dlls/jscript/date.c | 64 +++++++++++++++++++++++++++++----------------- dlls/jscript/engine.c | 4 +- dlls/jscript/error.c | 16 +++++++---- dlls/jscript/function.c | 11 ++++--- dlls/jscript/global.c | 59 +++++++++++++++++++----------------------- dlls/jscript/jsstr.c | 21 +++++++++------ dlls/jscript/jsstr.h | 2 +- dlls/jscript/number.c | 6 +--- dlls/jscript/object.c | 7 +++-- dlls/jscript/string.c | 40 ++++++++++++++-------------- 11 files changed, 141 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ece40f86bf6d7cd52ad2…

1 0

Piotr Caban : vbscript: Added IMatchCollection interface to MatchCollection2 object.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: fbf01da470f57ce2282c03b443ca65caca5ca39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf01da470f57ce2282c03b44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 12:34:38 2013 +0100 vbscript: Added IMatchCollection interface to MatchCollection2 object. --- dlls/vbscript/tests/vbscript.c | 4 ++ dlls/vbscript/vbregexp.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 6b25ddd..f37c7cb 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -852,6 +852,10 @@ static void test_RegExp(void) ok(hres == S_OK, "QueryInterface(IID_IMatchCollection2) returned %x\n", hres); IDispatch_Release(disp); + hres = IMatchCollection2_QueryInterface(mc, &IID_IMatchCollection, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IMatchCollection) returned %x\n", hres); + IUnknown_Release(unk); + hres = IMatchCollection2_get_Count(mc, NULL); ok(hres == E_POINTER, "get_Count returned %x, expected E_POINTER\n", hres); diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index f3fb874..b464232 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -110,6 +110,7 @@ typedef struct MatchCollectionEnum { typedef struct MatchCollection2 { IMatchCollection2 IMatchCollection2_iface; + IMatchCollection IMatchCollection_iface; LONG ref; @@ -700,6 +701,9 @@ static HRESULT WINAPI MatchCollection2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatchCollection2)) { TRACE("(%p)->(IID_IMatchCollection2 %p)\n", This, ppv); *ppv = &This->IMatchCollection2_iface; + }else if(IsEqualGUID(riid, &IID_IMatchCollection)) { + TRACE("(%p)->(IID_IMatchCollection %p)\n", This, ppv); + *ppv = &This->IMatchCollection_iface; }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = NULL; @@ -842,6 +846,90 @@ static const IMatchCollection2Vtbl MatchCollection2Vtbl = { MatchCollection2_get__NewEnum }; +static inline MatchCollection2 *impl_from_IMatchCollection(IMatchCollection *iface) +{ + return CONTAINING_RECORD(iface, MatchCollection2, IMatchCollection_iface); +} + +static HRESULT WINAPI MatchCollection_QueryInterface(IMatchCollection *iface, REFIID riid, void **ppv) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_QueryInterface(&This->IMatchCollection2_iface, riid, ppv); +} + +static ULONG WINAPI MatchCollection_AddRef(IMatchCollection *iface) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_AddRef(&This->IMatchCollection2_iface); +} + +static ULONG WINAPI MatchCollection_Release(IMatchCollection *iface) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_Release(&This->IMatchCollection2_iface); +} + +static HRESULT WINAPI MatchCollection_GetTypeInfoCount(IMatchCollection *iface, UINT *pctinfo) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetTypeInfoCount(&This->IMatchCollection2_iface, pctinfo); +} + +static HRESULT WINAPI MatchCollection_GetTypeInfo(IMatchCollection *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetTypeInfo(&This->IMatchCollection2_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI MatchCollection_GetIDsOfNames(IMatchCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_GetIDsOfNames(&This->IMatchCollection2_iface, + riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI MatchCollection_Invoke(IMatchCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_Invoke(&This->IMatchCollection2_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI MatchCollection_get_Item(IMatchCollection *iface, LONG index, IDispatch **ppMatch) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get_Item(&This->IMatchCollection2_iface, index, ppMatch); +} + +static HRESULT WINAPI MatchCollection_get_Count(IMatchCollection *iface, LONG *pCount) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get_Count(&This->IMatchCollection2_iface, pCount); +} + +static HRESULT WINAPI MatchCollection_get__NewEnum(IMatchCollection *iface, IUnknown **ppEnum) +{ + MatchCollection2 *This = impl_from_IMatchCollection(iface); + return IMatchCollection2_get__NewEnum(&This->IMatchCollection2_iface, ppEnum); +} + +static const IMatchCollectionVtbl MatchCollectionVtbl = { + MatchCollection_QueryInterface, + MatchCollection_AddRef, + MatchCollection_Release, + MatchCollection_GetTypeInfoCount, + MatchCollection_GetTypeInfo, + MatchCollection_GetIDsOfNames, + MatchCollection_Invoke, + MatchCollection_get_Item, + MatchCollection_get_Count, + MatchCollection_get__NewEnum +}; + static HRESULT add_match(IMatchCollection2 *iface, IMatch2 *add) { MatchCollection2 *This = impl_from_IMatchCollection2(iface); @@ -881,6 +969,7 @@ static HRESULT create_match_collection2(IMatchCollection2 **match_collection) return E_OUTOFMEMORY; ret->IMatchCollection2_iface.lpVtbl = &MatchCollection2Vtbl; + ret->IMatchCollection_iface.lpVtbl = &MatchCollectionVtbl; ret->ref = 1; *match_collection = &ret->IMatchCollection2_iface;

1 0

Huw Davies : riched20: We don' t need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised . This fixes setting PFE_RTLPARA.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 503c6caba647d94035e421f8641fb22dbdd79712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503c6caba647d94035e421f86… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:54 2013 +0000 riched20: We don't need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised. This fixes setting PFE_RTLPARA. --- dlls/riched20/para.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index ebe7eda..8cf3d24 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -154,35 +154,31 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } - if (dwMask & (PFM_ALL2 & ~PFM_ALL)) - { - /* PARAFORMAT2 fields */ - #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ PFM_TABLE) - /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ - if (dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; - para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); - para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); - } + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (dwMask & EFFECTS_MASK) + { + para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; + para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); + } #undef EFFECTS_MASK - COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); - COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); - COPY_FIELD(PFM_LINESPACING, dyLineSpacing); - COPY_FIELD(PFM_STYLE, sStyle); - COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); - COPY_FIELD(PFM_SHADING, wShadingWeight); - COPY_FIELD(PFM_SHADING, wShadingStyle); - COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); - COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); - COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); - COPY_FIELD(PFM_BORDER, wBorderSpace); - COPY_FIELD(PFM_BORDER, wBorderWidth); - COPY_FIELD(PFM_BORDER, wBorders); - } + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); para->member.para.pFmt->dwMask |= dwMask; #undef COPY_FIELD

1 0

Ken Thomases : winemac: Don't read an array at index -1 in debugstr_pf().
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3158fd764d5f765ad8701a48ab883e62c18cc621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3158fd764d5f765ad8701a48a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 25 00:34:32 2013 -0500 winemac: Don't read an array at index -1 in debugstr_pf(). --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e3e9aa4..8627b70 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -366,7 +366,7 @@ static const char *debugstr_pf(const pixel_format *pf) color_modes[pf->color_mode].alpha_bits, pf->depth_bits, pf->stencil_bits, - color_modes[pf->accum_mode - 1].color_bits, + pf->accum_mode ? color_modes[pf->accum_mode - 1].color_bits : 0, pf->aux_buffers, pf->backing_store, pf->double_buffer,

1 0

André Hentschel : ntdll: Implement RtlLookupFunctionEntry on ARM.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3c04958b8a47f56a6dfc9ac067ca88f34a4e29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c04958b8a47f56a6dfc9ac06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:24:04 2013 +0100 ntdll: Implement RtlLookupFunctionEntry on ARM. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 68 +++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a07a9ff..72c1697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1034,7 +1034,7 @@ @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d67c85e..b0cb43a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -738,7 +738,7 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stub RtlLookupElementGenericTable # @ stub RtlLookupElementGenericTableAvl -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) # @ stub RtlMapSecurityErrorToNtStatus diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f9cde38..bf144a0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -47,6 +47,8 @@ # include <sys/signal.h> #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -100,6 +102,15 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; + +struct UNWIND_INFO +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + /*********************************************************************** * dispatch_signal */ @@ -933,6 +944,63 @@ BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) return TRUE; } +/********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, HMODULE module, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size/sizeof(*func) - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + DWORD begin = (func[pos].BeginAddress & ~1), end; + if (func[pos].u.s.Flag) + end = begin + func[pos].u.s.FunctionLength * 2; + else + { + struct UNWIND_INFO *info; + info = (struct UNWIND_INFO *)((char *)module + func[pos].u.UnwindData); + end = begin + info->function_length * 2; + } + + if ((char *)pc < (char *)module + begin) max = pos - 1; + else if ((char *)pc >= (char *)module + end) min = pos + 1; + else return func + pos; + } + return NULL; +} + +/********************************************************************** + * RtlLookupFunctionEntry (NTDLL.@) + */ +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, DWORD *base, + UNWIND_HISTORY_TABLE *table ) +{ + LDR_MODULE *module; + RUNTIME_FUNCTION *func; + ULONG size; + + /* FIXME: should use the history table to make things faster */ + + if (LdrFindEntryForAddress( (void *)pc, &module )) + { + WARN( "module not found for %lx\n", pc ); + return NULL; + } + if (!(func = RtlImageDirectoryEntryToData( module->BaseAddress, TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size ))) + { + WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc ); + return NULL; + } + func = find_function_info( pc, module->BaseAddress, func, size ); + if (func) *base = (DWORD)module->BaseAddress; + return func; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index a40ff75..79e91c0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1710,6 +1710,7 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */

1 0

Austin English : msvcp90/tests: Remove thiscall_thunk_retptr struct definitions.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: f3c154197edbf9a347b7a96a5ca105b568571b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c154197edbf9a347b7a96a5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 20 20:24:13 2013 -0700 msvcp90/tests: Remove thiscall_thunk_retptr struct definitions. --- dlls/msvcp90/tests/ios.c | 2 -- dlls/msvcp90/tests/misc.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0ae34d3..9c78318 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -544,8 +544,6 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); -struct thiscall_thunk_retptr *thunk_retptr; - static void init_thiscall_thunk(void) { struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index dc099d3..f8eee4e 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -149,7 +149,6 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); -struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) {

1 0