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

Francois Gouget : testbot/build: Improve the WineRun{Build, Reconfig}. pl error handling.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 1e7c07b2d89ad828c65cc6a61c2762ff9378b356 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1e7c07b2d89ad828c65cc6a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:53:36 2013 +0100 testbot/build: Improve the WineRun{Build,Reconfig}.pl error handling. Don't try to copy the generated executables in WineRunBuild.pl if the build failed. Document what happens if we fail to take a new snapshot in WineRunReconfig.pl. --- testbot/bin/WineRunBuild.pl | 105 ++++++++++++++++++++-------------------- testbot/bin/WineRunReconfig.pl | 29 +++++++---- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e7dfafd..f750a0b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -198,29 +198,24 @@ my $TaskDir = "$StepDir/$TaskNo"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; -my $BaseName; -my $Run64 = !1; +my ($Run64, $BaseName); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { - if ($OtherStep->No != $StepNo) + next if ($OtherStep->No == $StepNo); + + $Run64 = 1 if ($OtherStep->FileType eq "exe64"); + my $OtherFileName = $OtherStep->FileName; + if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) { - my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) + if (defined $BaseName and $BaseName ne $1) { - if (defined $BaseName && $BaseName ne $1) - { - FatalError "$1 doesn't match previously found $BaseName\n", - $FullErrFileName, $Job, $Task; - } - $BaseName = $1; - if ($OtherStep->FileType eq "exe64") - { - $Run64 = 1; - } + FatalError "$1 doesn't match previously found $BaseName\n", + $FullErrFileName, $Job, $Task; } + $BaseName = $1; } } -if (! defined($BaseName)) +if (!defined $BaseName) { FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } @@ -234,7 +229,7 @@ if ($VM->Status ne "idle" and $VM->Status ne "running") } $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; @@ -244,7 +239,7 @@ my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy patch to VM: $ErrMessage\n", + FatalError "Could not copy the patch to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Script = "#!/bin/sh\n" . @@ -256,61 +251,67 @@ $Script .= " >>Build.log 2>&1\n"; if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't send the script to VM: $ErrMessage\n", + FatalError "Can't send the build script to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); + # Try to grab the build log before reporting the failure } - -if (defined($ErrMessage)) +my $NewStatus; +if ($TA->GetFile("Build.log", $FullLogFileName)) { - $TA->GetFile("Build.log", $FullLogFileName); - ProcessLog($FullLogFileName, $FullErrFileName); - FatalError "Failure running script in VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); } - -if (!$TA->GetFile("Build.log", $FullLogFileName)) +elsif (!defined $ErrMessage) { + # This GetFile() error is the first one so report it $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy log from VM: $ErrMessage\n", + FatalError "Can't copy the build log from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; +} +if (defined $ErrMessage) +{ + # Now we can report the previous Run() / Wait() error + FatalError "Failure running the build script in the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); -foreach my $OtherStep (@{$Job->Steps->GetItems()}) +# Don't try copying the test executables if the build step failed +if ($NewStatus eq "completed") { - if ($OtherStep->No != $StepNo) + foreach my $OtherStep (@{$Job->Steps->GetItems()}) { + next if ($OtherStep->No == $StepNo); + my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^[\w_\-]+(|\.exe)_test(|64)\.exe$/) - { - my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; - mkdir $OtherStepDir; + next if ($OtherFileName !~ /^[\w_\-]+(?:|\.exe)_test(?:|64)\.exe$/); - my $Bits = $OtherStep->FileType eq "exe64" ? "64" : "32"; - my $TestExecutable; - if ($Step->FileType ne "patchprograms") - { - $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; - } - else - { - $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; - } - if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) - { - $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy generated executable from VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; - } - chmod 0664, "$OtherStepDir/$OtherFileName"; + my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; + mkdir $OtherStepDir; + + my $Bits = $OtherStep->FileType eq "exe64" ? "64" : "32"; + my $TestExecutable; + if ($Step->FileType ne "patchprograms") + { + $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; + } + else + { + $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; } + if (!$TA->GetFile($TestExecutable, "$OtherStepDir/$OtherFileName")) + { + $ErrMessage = $TA->GetLastError(); + FatalError "Can't copy the generated executable from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; + } + chmod 0664, "$OtherStepDir/$OtherFileName"; } } + $TA->Disconnect(); $Task->Status($NewStatus); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7460361..5d9d6b3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -219,32 +219,36 @@ my $Script = "#!/bin/sh\n" . if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) { $ErrMessage = $TA->GetLastError(); - FatalError "Can't send the script to VM: $ErrMessage\n", + FatalError "Can't send the script to the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } my $Pid = $TA->Run(["./task"], 0); if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) { $ErrMessage = $TA->GetLastError(); + # Try to grab the reconfig log before reporting the failure } - -if (defined($ErrMessage)) +my $NewStatus; +if ($TA->GetFile("Reconfig.log", $FullLogFileName)) { - $TA->GetFile("Reconfig.log", $FullLogFileName); - ProcessLog($FullLogFileName, $FullErrFileName); - FatalError "Failure running script in VM: $ErrMessage\n", - $FullErrFileName, $Job, $Task; + $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); } - -if (!$TA->GetFile("Reconfig.log", $FullLogFileName)) +elsif (!defined $ErrMessage) { + # This GetFile() error is the first one so report it $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy log from VM: $ErrMessage\n", + FatalError "Can't copy the reconfig log from the VM: $ErrMessage\n", + $FullErrFileName, $Job, $Task; +} +if (defined $ErrMessage) +{ + # Now we can report the previous Run() / Wait() error + FatalError "Could not run the reconfig script in the VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + $TA->Disconnect(); -my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); if ($NewStatus eq "completed") { $ErrMessage = $VM->RemoveSnapshot($VM->IdleSnapshot); @@ -257,6 +261,9 @@ if ($NewStatus eq "completed") $ErrMessage = $VM->CreateSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) { + # Without the snapshot the VM is not usable anymore but FatalError() will + # just mark it as 'dirty'. It's only the next time it is used that the + # problem will be noticed and that it will be taken offline. FatalError "Can't take snapshot: $ErrMessage\n", $FullErrFileName, $Job, $Task; }

1 0

Francois Gouget : testbot/build: Simplify the log handling.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 04b85f724825512ef257d1abe5fd148e286f2a46 URL: http://source.winehq.org/git/tools.git/?a=commit;h=04b85f724825512ef257d1ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:55 2013 +0100 testbot/build: Simplify the log handling. We no longer remove the Build / Reconfig status lines. This means we no longer need separate raw and processed logs. Also better report log processing errors. Specify a prototype for ProcessLog(). --- testbot/bin/WineRunBuild.pl | 88 ++++++++++++++++++++------------------ testbot/bin/WineRunReconfig.pl | 93 ++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 87 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 3f5b592..e7dfafd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -71,55 +71,61 @@ sub FatalError($$$$) exit 1; } -sub ProcessRawlog +sub ProcessLog($$) { - my ($FullRawlogFileName, $FullLogFileName, $FullErrFileName) = @_; + my ($FullLogFileName, $FullErrFileName) = @_; - my $FoundOk = !1; - if (open RAWLOG, "<$FullRawlogFileName") + my ($Status, $Errors); + if (open(my $LogFile, "<", $FullLogFileName)) { - if (open LOG, ">$FullLogFileName") + # Collect and analyze the 'Build:' status line(s) + $Errors = ""; + foreach my $Line (<$LogFile>) { - if (open ERR, ">$FullErrFileName") + chomp($Line); + next if ($Line !~ /^Build: (.*)$/); + if ($1 ne "ok") { - my $Line; - while (defined($Line = <RAWLOG>)) - { - chomp($Line); - if ($Line =~ m/^Build: (.*)$/) - { - if ($1 eq "ok") - { - $FoundOk = 1; - } - else - { - print ERR "$1\n"; - } - } - else - { - print LOG "$Line\n"; - } - } - - close ERR; - if (-z $FullErrFileName) - { - unlink($FullErrFileName); - } + $Errors .= "$1\n"; + $Status = "failed"; } + elsif (!defined $Status) + { + $Status = "completed"; + } + } + close($LogFile); - close LOG; + if (!defined $Status) + { + $Status = "failed"; + $Errors = "Missing build status line\n"; } + } + else + { + $Status = "failed"; + $Errors = "Unable to open the log file\n"; + LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; + } - close RAWLOG; - unlink($FullRawlogFileName); + if ($Errors) + { + if (open(my $ErrFile, ">", $FullErrFileName)) + { + print $ErrFile $Errors; + close($ErrFile); + } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } } - return $FoundOk; + return $Status; } + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -189,7 +195,6 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; -my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; @@ -262,20 +267,19 @@ if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) if (defined($ErrMessage)) { - $TA->GetFile("Build.log", $FullRawlogFileName); - ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); + $TA->GetFile("Build.log", $FullLogFileName); + ProcessLog($FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -if (!$TA->GetFile("Build.log", $FullRawlogFileName)) +if (!$TA->GetFile("Build.log", $FullLogFileName)) { $ErrMessage = $TA->GetLastError(); FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -my $NewStatus = ProcessRawlog($FullRawlogFileName, $FullLogFileName, - $FullErrFileName) ? "completed" : "failed"; +my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); foreach my $OtherStep (@{$Job->Steps->GetItems()}) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0333705..7460361 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -71,55 +71,61 @@ sub FatalError($$$$) exit 1; } -sub ProcessRawlog +sub ProcessLog($$) { - my ($FullRawlogFileName, $FullLogFileName, $FullErrFileName) = @_; + my ($FullLogFileName, $FullErrFileName) = @_; - my $FoundOk = !1; - if (open RAWLOG, "<$FullRawlogFileName") + my ($Status, $Errors); + if (open(my $LogFile, "<", $FullLogFileName)) { - if (open LOG, ">$FullLogFileName") + # Collect and analyze the 'Reconfig:' status line(s) + $Errors = ""; + foreach my $Line (<$LogFile>) { - if (open ERR, ">$FullErrFileName") + chomp($Line); + next if ($Line !~ /^Reconfig: (.*)$/); + if ($1 ne "ok") { - my $Line; - while (defined($Line = <RAWLOG>)) - { - chomp($Line); - if ($Line =~ m/^Reconfig: (.*)$/) - { - if ($1 eq "ok") - { - $FoundOk = 1; - } - else - { - print ERR "$1\n"; - } - } - else - { - print LOG "$Line\n"; - } - } - - close ERR; - if (-z $FullErrFileName) - { - unlink($FullErrFileName); - } + $Errors .= "$1\n"; + $Status = "failed"; } + elsif (!defined $Status) + { + $Status = "completed"; + } + } + close($LogFile); - close LOG; + if (!defined $Status) + { + $Status = "failed"; + $Errors = "Missing reconfig status line\n"; } + } + else + { + $Status = "failed"; + $Errors = "Unable to open the log file\n"; + LogMsg "Unable to open '$FullLogFileName' for reading: $!\n"; + } - close RAWLOG; - unlink($FullRawlogFileName); + if ($Errors) + { + if (open(my $ErrFile, ">", $FullErrFileName)) + { + print $ErrFile $Errors; + close($ErrFile); + } + else + { + LogMsg "Unable to open '$FullErrFileName' for writing: $!\n"; + } } - return $FoundOk; + return $Status; } + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; @@ -189,7 +195,6 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; -my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; @@ -225,13 +230,13 @@ if (!$Pid or !defined $TA->Wait($Pid, $Task->Timeout)) if (defined($ErrMessage)) { - $TA->GetFile("Reconfig.log", $FullRawlogFileName); - ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); + $TA->GetFile("Reconfig.log", $FullLogFileName); + ProcessLog($FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Task; } -if (!$TA->GetFile("Reconfig.log", $FullRawlogFileName)) +if (!$TA->GetFile("Reconfig.log", $FullLogFileName)) { $ErrMessage = $TA->GetLastError(); FatalError "Can't copy log from VM: $ErrMessage\n", @@ -239,9 +244,8 @@ if (!$TA->GetFile("Reconfig.log", $FullRawlogFileName)) } $TA->Disconnect(); -my $Success = ProcessRawlog($FullRawlogFileName, $FullLogFileName, - $FullErrFileName); -if ($Success) +my $NewStatus = ProcessLog($FullLogFileName, $FullErrFileName); +if ($NewStatus eq "completed") { $ErrMessage = $VM->RemoveSnapshot($VM->IdleSnapshot); if (defined($ErrMessage)) @@ -258,14 +262,13 @@ if ($Success) } $VM->Status("idle"); - $Task->Status("completed"); } else { - $Task->Status("failed"); $VM->Status("dirty"); } +$Task->Status($NewStatus); $Task->ChildPid(undef); $Task->Ended(time); $Task->Save();

1 0

Francois Gouget : testbot: Fix a typo in the MySQL setup section.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 11bfc2af4c49a4a544eaf00e2b7f5517512333c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=11bfc2af4c49a4a544eaf00e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:21 2013 +0100 testbot: Fix a typo in the MySQL setup section. The sample winetestbot.sql script now sets up the required winetestbot privileges. Also some more documentation formatting tweaks. --- testbot/doc/INSTALL.txt | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4e4e33c..4c14668 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -14,10 +14,8 @@ Dependencies: MySQL setup: - Create a new 'winetestbot' database and its tables using the ddl/winetestbot.sql script. -- Set the 'winetestbot' user password - INSERT, UPDATE and DELETE on all tables in the database. So this is - something like: - SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); +- Make sure to change the 'winetestbot' user password. Typically: + SET PASSWORD FOR 'winetestbot'@'localhost' = PASSWORD('mypassword'); Apache setup: - Create a new virtual host, use doc/vhost_winetestbot.conf as a @@ -55,11 +53,11 @@ General setup for the web site: - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a known value, e.g. - mysql> update Users set ResetCode = 'a' where Name = '<username>'; + mysql> update Users set ResetCode = 'a' where Name = '<username>'; - Browse to http://server.name/ResetPassword.pl and enter your username, the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: - mysql> insert into UserRoles values('<username>', 'admin'); + mysql> insert into UserRoles values('<username>', 'admin'); - When you refresh the home page, you should now have an "Admin" menu in the sidebar. @@ -113,7 +111,7 @@ Setup for wine-patches: | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file + formail -ds $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file 2. VM hosts setup

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 918d9a53cca257efa6d384dde4c4d075aeee2559 URL: http://source.winehq.org/git/tools.git/?a=commit;h=918d9a53cca257efa6d384dd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:19:03 2013 +0100 testbot/CheckForWinetestUpdate: Use a shorter name for the WineTest jobs. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 2e28cdc..c776fe5 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -60,7 +60,7 @@ sub AddJob my $NewJob = $Jobs->Add(); $NewJob->User(WineTestBot::Users->GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); - $NewJob->Remarks("http://test.winehq.org job - " . + $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . " VMs");

1 0

Francois Gouget : testbot: Don't hardcode the WineTestBot name.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 9e7cc538135367f1846b782e7b5b1caf609aca8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=9e7cc538135367f1846b782e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:37:28 2013 +0100 testbot: Don't hardcode the WineTestBot name. --- testbot/bin/RevertVM.pl | 2 +- testbot/bin/WineSendLog.pl | 4 ++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 8 ++++---- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/scripts/CheckWineTestBot.pl | 2 +- testbot/web/Feedback.pl | 4 ++-- testbot/web/Register.pl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index 7d3359e..f9edeb7 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -57,7 +57,7 @@ sub FatalError my $VMSnapshot = $VM->IdleSnapshot; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: VM $VMKey offline diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 04e9009..515b6c8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -190,7 +190,7 @@ sub SendLog my @SortedKeys = sort @{$StepsTasks->GetKeys()}; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; my $Description = $Job->GetDescription(); @@ -425,7 +425,7 @@ EOF if ($Messages) { open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL "From: Marvin <$RobotEMail>\n"; + print SENDMAIL "From: $RobotEMail\n"; print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 38e6a3a..544ac3e 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -31,10 +31,10 @@ $WineTestBot::Config::DbUsername = "winetestbot"; # The password of the database account $WineTestBot::Config::DbPassword = ""; -# Email address of the WineTestBot administrator +# Name and email address of the WineTestBot administrator $WineTestBot::Config::AdminEMail = undef; -# From address of mails sent by WineTestBot to users +# Name and address for the 'From' field of mails sent by WineTestBot $WineTestBot::Config::RobotEMail = undef; # If set, sends the results to the specified email address instead of the @@ -42,8 +42,8 @@ $WineTestBot::Config::RobotEMail = undef; # can provide useful results to Wine developers. $WineTestBot::Config::WinePatchToOverride = $WineTestBot::Config::AdminEMail; -# If set, CC the results to the specified email address, for instance the -# wine-devel mailing list. +# If set, CC the results to the specified name + email address, for instance +# the wine-devel mailing list. $WineTestBot::Config::WinePatchCc = ""; # Email address to send the results to for integration with the Wine Patches diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2e6eedc..54c07bf 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -149,7 +149,7 @@ sub Approve my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request @@ -189,7 +189,7 @@ sub SendResetCode my $Recipient = $self->GetEMailRecipient(); open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $Recipient Subject: winetestbot account request diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 6415dc3..5e8a053 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -49,7 +49,7 @@ if (! PingEngine()) open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) +From: $RobotEMail To: $AdminEMail Subject: WineTestBot engine died diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 626a7f8..c266ce4 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -111,8 +111,8 @@ sub OnSend open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot feedback EOF diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 6d8e7f4..766d363 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -116,8 +116,8 @@ sub OnSendRequest open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); print SENDMAIL <<"EOF"; -From: <$RobotEMail> (Marvin) -To: <$AdminEMail> +From: $RobotEMail +To: $AdminEMail Subject: winetestbot account request $Msg

1 0

Francois Gouget : testbot/TestAgent: Send file data in 64KiB chunks to ( slightly) reduce overhead.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 3e03d63c5a11c73a280b8fcb828f083db57f5f4d URL: http://source.winehq.org/git/tools.git/?a=commit;h=3e03d63c5a11c73a280b8fcb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:55 2013 +0100 testbot/TestAgent: Send file data in 64KiB chunks to (slightly) reduce overhead. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/testagentd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2b834f7..645a18c 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -27,7 +27,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT_OK = qw(new); -my $BLOCK_SIZE = 4096; +my $BLOCK_SIZE = 65536; my $RPC_PING = 0; my $RPC_GETFILE = 1; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index c06af72..534495d 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,7 +37,7 @@ */ #define PROTOCOL_VERSION "testagentd 1.2" -#define BLOCK_SIZE 4096 +#define BLOCK_SIZE 65536 const char *name0; int opt_debug = 0;

1 0

Francois Gouget : winetest: Link the individual test result pages to the configuration / dll versions page.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 703b769e28a5be47d353c44e111aa7f463140e5e URL: http://source.winehq.org/git/tools.git/?a=commit;h=703b769e28a5be47d353c44e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:07:36 2013 +0100 winetest: Link the individual test result pages to the configuration / dll versions page. --- winetest/dissect | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index f2e18a2..fe80a44 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -407,6 +407,7 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE "<div class=\"navbar\">"; print FILE $boxes[$i]->{prev} ? "<a href=\"./$boxes[$i]->{prev}.html\">prev</a> | " : "prev | "; print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | "; + print FILE "<a href=\"version.html\">info</a> | "; printf FILE "<a href=\"report.html%s\">full report</a> | ", $i ? "#$boxes[$i]->{id}" : ""; print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n";

1 0

Stefan Dösinger : ddraw/tests: Use a software VP device in test_surface_interface_mismatch.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: f39443787ad4ca270078203abb5cf2e9ebc545ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39443787ad4ca270078203ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:32 2013 -0700 ddraw/tests: Use a software VP device in test_surface_interface_mismatch. --- dlls/ddraw/tests/ddraw7.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 90e666f..027e03a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -940,7 +940,7 @@ static void test_surface_interface_mismatch(void) } memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d, &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { skip("No depth buffer formats available, skipping test.\n"); @@ -968,7 +968,7 @@ static void test_surface_interface_mismatch(void) goto cleanup; /* Here too */ - hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DTnLHalDevice, (IDirectDrawSurface7 *)surface3, &device); + hr = IDirect3D7_CreateDevice(d3d, &IID_IDirect3DHALDevice, (IDirectDrawSurface7 *)surface3, &device); ok(SUCCEEDED(hr), "Failed to create d3d device.\n"); if (FAILED(hr)) goto cleanup;

1 0

Stefan Dösinger : ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: a990dbfa223c7fb3ebe8830f1a5361159b567e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a990dbfa223c7fb3ebe8830f1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:31 2013 -0700 ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests. Intel GPUs don't support d3d7 hardware vertexprocessing on Windows. In d3d8 and d3d9 it is available starting with i965 chips, but for some reason the driver does not expose this for d3d7. --- dlls/ddraw/tests/ddraw7.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6651687..90e666f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -202,6 +202,17 @@ static IDirectDraw7 *create_ddraw(void) return ddraw; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) { IDirectDrawSurface7 *surface, *ds; @@ -211,6 +222,8 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) IDirectDraw7 *ddraw; IDirect3D7 *d3d7; HRESULT hr; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if (!(ddraw = create_ddraw())) return NULL; @@ -249,8 +262,12 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } + hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&z_fmt, 0, sizeof(z_fmt)); - hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); + hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt); if (FAILED(hr) || !z_fmt.dwSize) { IDirect3D7_Release(d3d7); @@ -284,7 +301,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) return NULL; } - hr = IDirect3D7_CreateDevice(d3d7, &IID_IDirect3DTnLHalDevice, surface, &device); + hr = IDirect3D7_CreateDevice(d3d7, devtype, surface, &device); IDirect3D7_Release(d3d7); IDirectDrawSurface7_Release(surface); if (FAILED(hr))

1 0

Andrew Talbot : msvcp71: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 0515b44f2f3de0df76e79eacf2a9aa8d714b2ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0515b44f2f3de0df76e79eacf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 11 20:48:38 2013 +0000 msvcp71: Avoid signed-unsigned integer comparisons. --- dlls/msvcp71/ios.c | 2 +- dlls/msvcp71/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index cbfc78b..8fe6000 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2560,7 +2560,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp71/misc.c b/dlls/msvcp71/misc.c index 21ca929..227c1b8 100644 --- a/dlls/msvcp71/misc.c +++ b/dlls/msvcp71/misc.c @@ -160,7 +160,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Michael Stefaniuc : kernel32: Avoid TRUE FALSE conditional expressions.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2dcc12aac3b50876bed880ce8acaeb02a43444ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcc12aac3b50876bed880ce8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 12 10:28:04 2013 +0100 kernel32: Avoid TRUE FALSE conditional expressions. --- dlls/kernel32/sync.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 3264884..6b5a949 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1398,9 +1398,9 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, options = 0; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; - pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; - read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) ? TRUE : FALSE; - non_block = (dwPipeMode & PIPE_NOWAIT) ? TRUE : FALSE; + pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) != 0; + read_mode = (dwPipeMode & PIPE_READMODE_MESSAGE) != 0; + non_block = (dwPipeMode & PIPE_NOWAIT) != 0; if (nMaxInstances >= PIPE_UNLIMITED_INSTANCES) nMaxInstances = ~0U; timeout.QuadPart = (ULONGLONG)nDefaultTimeOut * -10000;

1 0

Stefan Dösinger : ddraw/tests: Use hardware VP only if available in the visual tests.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 3eb6045325e007270c5ce3a1cc068655887c7064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb6045325e007270c5ce3a1c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 12 07:20:33 2013 -0700 ddraw/tests: Use hardware VP only if available in the visual tests. --- dlls/ddraw/tests/visual.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 02ba913..b8a4b76 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -64,6 +64,17 @@ static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) return DDENUMRET_OK; } +static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx) +{ + BOOL *hal_ok = ctx; + if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice)) + { + *hal_ok = TRUE; + return DDENUMRET_CANCEL; + } + return DDENUMRET_OK; +} + static BOOL createObjects(void) { HRESULT hr; @@ -71,6 +82,8 @@ static BOOL createObjects(void) WNDCLASS wc = {0}; DDSURFACEDESC2 ddsd; DDPIXELFORMAT zfmt; + BOOL hal_ok = FALSE; + const GUID *devtype = &IID_IDirect3DHALDevice; if(!hmod) return FALSE; pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); @@ -116,8 +129,12 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + hr = IDirect3D7_EnumDevices(Direct3D, enum_devtype_cb, &hal_ok); + ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr); + if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice; + memset(&zfmt, 0, sizeof(zfmt)); - hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); + hr = IDirect3D7_EnumZBufferFormats(Direct3D, devtype, enum_z_fmt, &zfmt); if (FAILED(hr)) goto err; if (zfmt.dwSize == 0) goto err; @@ -136,7 +153,7 @@ static BOOL createObjects(void) ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr); if (FAILED(hr)) goto err; - hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); + hr = IDirect3D7_CreateDevice(Direct3D, devtype, Surface, &Direct3DDevice); if (FAILED(hr) || !Direct3DDevice) goto err; return TRUE;

1 0

Francois Gouget : msxml3/tests: Make test_xmlns_attribute() static.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 78a52bd8670331186ec1bcbd428118310c3c753f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a52bd8670331186ec1bcbd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 12 11:34:43 2013 +0100 msxml3/tests: Make test_xmlns_attribute() static. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8775312..d5f2413 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10754,7 +10754,7 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } -void test_xmlns_attribute(void) +static void test_xmlns_attribute(void) { BSTR str; IXMLDOMDocument *doc;

1 0

Sergey Guralnik : user32: Use window height/ width instead of client for combo resizing.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: ac0738471da49f57105d7d5498603d73fbc650f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0738471da49f57105d7d549… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Mar 8 22:28:39 2013 +0200 user32: Use window height/width instead of client for combo resizing. --- dlls/user32/combo.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d20005c..346b346 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1507,7 +1507,7 @@ static void CBResetPos( /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +static void COMBO_Size( LPHEADCOMBO lphc ) { /* * Those controls are always the same height. So we have to make sure @@ -1515,8 +1515,12 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) */ if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { - int newComboHeight; + int newComboHeight, curComboHeight, curComboWidth; + RECT rc; + GetWindowRect(lphc->self, &rc); + curComboHeight = rc.bottom - rc.top; + curComboWidth = rc.right - rc.left; newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); /* @@ -1527,18 +1531,18 @@ static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if( HIWORD(lParam) > newComboHeight ) + if( curComboHeight > newComboHeight ) { TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", - HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; } /* * Restore original height */ - if( HIWORD(lParam) != newComboHeight ) - SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + if( curComboHeight != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } @@ -1862,7 +1866,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar } case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

1 0

Stefan Leichter : msvcr110: Add VS2012 C/C++ runtime.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 0e7f39439da99ac7900fa32786b0cd81463573fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7f39439da99ac7900fa3278… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Mar 10 11:35:03 2013 +0100 msvcr110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcr110/Makefile.in | 9 + dlls/msvcr110/msvcr110.c | 44 + dlls/msvcr110/msvcr110.spec | 2248 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 2303 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7f39439da99ac7900fa…

1 0

Jörg Höhle : winmm: Fix GetPosition when using MSACM codecs.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2722f2cbfcd5f45a3f53e5b818439fba1de2c14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2722f2cbfcd5f45a3f53e5b81… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 10 14:43:51 2013 +0100 winmm: Fix GetPosition when using MSACM codecs. --- dlls/winmm/waveform.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 0368790..594d82c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2035,7 +2035,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) } static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, - UINT32 sample_rate, UINT32 bytes_per_frame) + UINT32 sample_rate, UINT32 bytes_per_sec) { switch(time->wType){ case TIME_SAMPLES: @@ -2058,7 +2058,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, time->wType = TIME_BYTES; /* fall through */ case TIME_BYTES: - time->u.cb = played_frames * bytes_per_frame; + time->u.cb = MulDiv(played_frames, bytes_per_sec, sample_rate); return MMSYSERR_NOERROR; } } @@ -2066,7 +2066,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); - UINT32 played_frames, sample_rate, bytes_per_frame; + UINT32 played_frames, sample_rate, bytes_per_sec; TRACE("(%p, %p)\n", hwave, time); @@ -2075,12 +2075,11 @@ static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) played_frames = device->played_frames; sample_rate = device->orig_fmt->nSamplesPerSec; - bytes_per_frame = device->orig_fmt->nBlockAlign; + bytes_per_sec = device->orig_fmt->nAvgBytesPerSec; LeaveCriticalSection(&device->lock); - return WINMM_FramesToMMTime(time, played_frames, sample_rate, - bytes_per_frame); + return WINMM_FramesToMMTime(time, played_frames, sample_rate, bytes_per_sec); } static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags,

1 0

Nikolay Sivov : msxml3: Fix some test failures on Windows 8.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 40d30cf39955c501201239c4774398a2215b99b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d30cf39955c501201239c47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:58:31 2013 +0400 msxml3: Fix some test failures on Windows 8. --- dlls/msxml3/httprequest.c | 16 ++++++++-------- dlls/msxml3/tests/httpreq.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f9db1cd..c67177b 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -948,7 +948,8 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST { struct httpheader *entry; - if (!header || !value) return E_INVALIDARG; + if (!header) return E_INVALIDARG; + if (!value) return E_POINTER; if (This->raw_respheaders && list_empty(&This->respheaders)) { @@ -982,7 +983,7 @@ static HRESULT httprequest_getResponseHeader(httprequest *This, BSTR header, BST static HRESULT httprequest_getAllResponseHeaders(httprequest *This, BSTR *respheaders) { - if (!respheaders) return E_INVALIDARG; + if (!respheaders) return E_POINTER; *respheaders = SysAllocString(This->raw_respheaders); @@ -1015,17 +1016,16 @@ static HRESULT httprequest_abort(httprequest *This) static HRESULT httprequest_get_status(httprequest *This, LONG *status) { - if (!status) return E_INVALIDARG; - if (This->state != READYSTATE_COMPLETE) return E_FAIL; + if (!status) return E_POINTER; *status = This->status; - return S_OK; + return This->state == READYSTATE_COMPLETE ? S_OK : E_FAIL; } static HRESULT httprequest_get_statusText(httprequest *This, BSTR *status) { - if (!status) return E_INVALIDARG; + if (!status) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; *status = SysAllocString(This->status_text); @@ -1038,7 +1038,7 @@ static HRESULT httprequest_get_responseText(httprequest *This, BSTR *body) HGLOBAL hglobal; HRESULT hr; - if (!body) return E_INVALIDARG; + if (!body) return E_POINTER; if (This->state != READYSTATE_COMPLETE) return E_FAIL; hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); @@ -1184,7 +1184,7 @@ static HRESULT httprequest_get_responseStream(httprequest *This, VARIANT *body) static HRESULT httprequest_get_readyState(httprequest *This, LONG *state) { - if (!state) return E_INVALIDARG; + if (!state) return E_POINTER; *state = This->state; return S_OK; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 6744657..5c62772 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1469,12 +1469,12 @@ static void test_XMLHTTP(void) /* initial status code */ hr = IXMLHttpRequest_get_status(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, &str); ok(hr == E_FAIL, "got 0x%08x\n", hr); @@ -1497,7 +1497,7 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_readyState(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1523,7 +1523,7 @@ static void test_XMLHTTP(void) status = 0xdeadbeef; hr = IXMLHttpRequest_get_status(xhr, &status); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); - ok(status == 0xdeadbeef, "got %d\n", status); + ok(status == READYSTATE_UNINITIALIZED || broken(status == 0xdeadbeef) /* <win8 */, "got %d\n", status); state = -1; hr = IXMLHttpRequest_get_readyState(xhr, &state); @@ -1564,7 +1564,7 @@ static void test_XMLHTTP(void) /* response headers */ hr = IXMLHttpRequest_getAllResponseHeaders(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); EXPECT_HR(hr, S_OK); /* status line is stripped already */ @@ -1579,7 +1579,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_getResponseHeader(xhr, _bstr_("Date"), &str); EXPECT_HR(hr, S_OK); ok(*str != ' ', "got leading space in header %s\n", wine_dbgstr_w(str)); @@ -1592,7 +1592,7 @@ static void test_XMLHTTP(void) ok(status == 200, "got %d\n", status); hr = IXMLHttpRequest_get_statusText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_statusText(xhr, &str); EXPECT_HR(hr, S_OK); @@ -1640,7 +1640,7 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); hr = IXMLHttpRequest_get_responseText(xhr, NULL); - EXPECT_HR(hr, E_INVALIDARG); + ok(hr == E_POINTER || broken(hr == E_INVALIDARG) /* <win8 */, "got 0x%08x\n", hr); hr = IXMLHttpRequest_get_responseText(xhr, &bstrResponse); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Added a simple test for CDATA processing with SAX reader.
by Alexandre Julliard March 12, 2013

March 12, 2013

Module: wine Branch: master Commit: 2321f8b06f2ad184b4c663f4e2fe8891334add2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2321f8b06f2ad184b4c663f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 12:45:54 2013 +0400 msxml3: Added a simple test for CDATA processing with SAX reader. --- dlls/msxml3/tests/saxreader.c | 103 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 06fd56a..da662bb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -168,9 +168,11 @@ typedef enum _CH { CH_IGNORABLEWHITESPACE, CH_PROCESSINGINSTRUCTION, CH_SKIPPEDENTITY, + LH_STARTCDATA, + LH_ENDCDATA, EH_ERROR, EH_FATALERROR, - EG_IGNORABLEWARNING, + EH_IGNORABLEWARNING, EVENT_LAST } CH; @@ -187,6 +189,8 @@ static const char *event_names[EVENT_LAST] = { "ignorableWhitespace", "processingInstruction", "skippedEntity", + "startCDATA", + "endCDATA", "error", "fatalError", "ignorableWarning" @@ -410,6 +414,8 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, case CH_PUTDOCUMENTLOCATOR: case CH_STARTDOCUMENT: case CH_ENDDOCUMENT: + case LH_STARTCDATA: + case LH_ENDCDATA: break; case CH_STARTPREFIXMAPPING: /* prefix, uri */ @@ -459,7 +465,7 @@ static void ok_sequence_(struct call_sequence **seq, int sequence_index, context, get_event_name(actual->id), expected->ret, actual->ret); break; case EH_ERROR: - case EG_IGNORABLEWARNING: + case EH_IGNORABLEWARNING: default: ok(0, "%s: callback not handled, %s\n", context, get_event_name(actual->id)); } @@ -570,6 +576,10 @@ static const char test_attributes[] = "<node1 xmlns:p=\"test\" />" "</document>\n"; +static const char test_cdata_xml[] = +"<?xml version=\"1.0\" ?>" +"<a><![CDATA[Some \r\ntext\n\rdata\n]]></a>"; + static struct call_entry content_handler_test1[] = { { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, { CH_STARTDOCUMENT, 0, 0, S_OK }, @@ -894,6 +904,37 @@ static struct call_entry attribute_norm_alt[] = { { CH_ENDTEST } }; +static struct call_entry cdata_test[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTELEMENT, 1, 26, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 35, S_OK }, + { CH_CHARACTERS, 1, 35, S_OK, "Some \n" }, + { CH_CHARACTERS, 1, 42, S_OK, "text\n\n" }, + { CH_CHARACTERS, 4, 1, S_OK, "data\n" }, + { LH_ENDCDATA, 4, 1, S_OK }, + { CH_ENDELEMENT, 4, 6, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, S_OK }, + { CH_ENDTEST } +}; + +/* this is what MSXML6 does */ +static struct call_entry cdata_test_alt[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTELEMENT, 1, 25, S_OK, "", "a", "a" }, + { LH_STARTCDATA, 1, 34, S_OK }, + { CH_CHARACTERS, 1, 40, S_OK, "Some " }, + { CH_CHARACTERS, 2, 0, S_OK, "\n" }, + { CH_CHARACTERS, 3, 1, S_OK, "text\n" }, + { CH_CHARACTERS, 4, 0, S_OK, "\n" }, + { CH_CHARACTERS, 5, 3, S_OK, "data\n" }, + { LH_ENDCDATA, 5, 3, S_OK }, + { CH_ENDELEMENT, 5, 7, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 5, 7, S_OK }, + { CH_ENDTEST } +}; + static const char xmlspace_attr[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" "<a xml:space=\"preserve\"> Some text data </a>"; @@ -1275,7 +1316,7 @@ static HRESULT WINAPI isaxerrorHandler_fatalError( return S_OK; } -static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( +static HRESULT WINAPI isaxerrorHandler_ignorableWarning( ISAXErrorHandler* iface, ISAXLocator *pLocator, const WCHAR *pErrorMessage, @@ -1292,7 +1333,7 @@ static const ISAXErrorHandlerVtbl errorHandlerVtbl = isaxerrorHandler_Release, isaxerrorHandler_error, isaxerrorHandler_fatalError, - isaxerrorHanddler_ignorableWarning + isaxerrorHandler_ignorableWarning }; static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; @@ -1583,14 +1624,24 @@ static HRESULT WINAPI isaxlexical_endEntity(ISAXLexicalHandler *iface, static HRESULT WINAPI isaxlexical_startCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_STARTCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_endCDATA(ISAXLexicalHandler *iface) { - ok(0, "call not expected\n"); - return E_NOTIMPL; + struct call_entry call; + + init_call_entry(locator, &call); + call.id = LH_ENDCDATA; + add_call(sequences, CONTENT_HANDLER_INDEX, &call); + + return get_expected_ret(); } static HRESULT WINAPI isaxlexical_comment(ISAXLexicalHandler *iface, @@ -1880,6 +1931,9 @@ static struct msxmlsupported_data_t reader_support_data[] = { NULL } }; +static struct saxlexicalhandler lexicalhandler; +static struct saxdeclhandler declhandler; + static void test_saxreader(void) { const struct msxmlsupported_data_t *table = reader_support_data; @@ -2230,6 +2284,36 @@ static void test_saxreader(void) hr = ISAXXMLReader_putEntityResolver(reader, NULL); ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + /* CDATA sections */ + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(test_cdata_xml); + IStream_SetSize(stream, size); + IStream_Write(stream, test_cdata_xml, strlen(test_cdata_xml), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + + init_saxlexicalhandler(&lexicalhandler, S_OK); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface; + hr = ISAXXMLReader_putProperty(reader, _bstr_("http://xml.org/sax/properties/lexical-handler"), var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + test_seq = cdata_test_alt; + else + test_seq = cdata_test; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "cdata test", TRUE); + + IStream_Release(stream); + ISAXXMLReader_Release(reader); table++; } @@ -2243,9 +2327,6 @@ struct saxreader_props_test_t IUnknown *iface; }; -static struct saxlexicalhandler lexicalhandler; -static struct saxdeclhandler declhandler; - static const struct saxreader_props_test_t props_test_data[] = { { "http://xml.org/sax/properties/lexical-handler", (IUnknown*)&lexicalhandler.ISAXLexicalHandler_iface }, { "http://xml.org/sax/properties/declaration-handler", (IUnknown*)&declhandler.ISAXDeclHandler_iface },

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in disp_get_id .
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 67d86e630e83098ea2e4e250b8048bfd93a00e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d86e630e83098ea2e4e250b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:03:15 2013 +0100 jscript: Use BSTR also for pure IDispatch call in disp_get_id. --- dlls/jscript/engine.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 52cdc88..f05fedf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -350,6 +350,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR { IDispatchEx *dispex; jsdisp_t *jsdisp; + BSTR bstr; HRESULT hres; jsdisp = iface_to_jsdisp((IUnknown*)disp); @@ -359,24 +360,27 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR return hres; } + if(name_bstr) { + bstr = name_bstr; + }else { + bstr = SysAllocString(name); + if(!bstr) + return E_OUTOFMEMORY; + } + *id = 0; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - BSTR str = name_bstr; - - if(!str) - str = SysAllocString(name); - if(str) - hres = IDispatchEx_GetDispID(dispex, str, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); - else - hres = E_OUTOFMEMORY; + hres = IDispatchEx_GetDispID(dispex, bstr, make_grfdex(ctx, flags|fdexNameCaseSensitive), id); IDispatchEx_Release(dispex); - return hres; + }else { + TRACE("using IDispatch\n"); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); } - TRACE("using IDispatch\n"); - - return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + if(name_bstr != bstr) + SysFreeString(bstr); + return hres; } static inline BOOL var_is_null(const VARIANT *v)

1 0

Andrew Eikum : winmm: Truncate buffers to align to frame size.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: f74128f132df677999c26bbb409bc16bbb1e5e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74128f132df677999c26bbb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 11 06:42:19 2013 -0500 winmm: Truncate buffers to align to frame size. --- dlls/winmm/waveform.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1dceb26..0368790 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1467,6 +1467,11 @@ static LRESULT WID_Close(HWAVEIN hwave) return MMSYSERR_NOERROR; } +static DWORD WINMM_FixedBufferLen(DWORD length, WINMM_Device *device) +{ + return length - length % device->bytes_per_frame; +} + static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) { WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); @@ -1550,10 +1555,10 @@ static UINT32 WINMM_HeaderLenBytes(WINMM_Device *device, WAVEHDR *header) { if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; - return ash->cbDstLengthUsed; + return WINMM_FixedBufferLen(ash->cbDstLengthUsed, device); } - return header->dwBufferLength; + return WINMM_FixedBufferLen(header->dwBufferLength, device); } static UINT32 WINMM_HeaderLenFrames(WINMM_Device *device, WAVEHDR *header) @@ -1690,14 +1695,11 @@ static void WOD_PushData(WINMM_Device *device) queue = device->playing; - if(device->acm_handle){ - ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)queue->reserved; - queue_bytes = ash->cbDstLengthUsed; - queue_data = ash->pbDst; - }else{ - queue_bytes = queue->dwBufferLength; + queue_bytes = WINMM_HeaderLenBytes(device, queue); + if(device->acm_handle) + queue_data = ((ACMSTREAMHEADER*)queue->reserved)->pbDst; + else queue_data = (BYTE*)queue->lpData; - } queue_frames = (queue_bytes - device->ofs_bytes) / device->bytes_per_frame; @@ -1817,8 +1819,8 @@ static void WID_PullACMData(WINMM_Device *device) while(queue){ UINT32 to_copy_bytes; - to_copy_bytes = min(queue->dwBufferLength - queue->dwBytesRecorded, - device->acm_hdr.cbDstLengthUsed - device->acm_offs); + to_copy_bytes = min(WINMM_FixedBufferLen(queue->dwBufferLength, device) - queue->dwBytesRecorded, + WINMM_FixedBufferLen(device->acm_hdr.cbDstLengthUsed, device) - device->acm_offs); memcpy(queue->lpData + queue->dwBytesRecorded, device->acm_hdr.pbDst + device->acm_offs, to_copy_bytes); @@ -1833,7 +1835,7 @@ static void WID_PullACMData(WINMM_Device *device) device->first = queue = queue->lpNext; } - if(device->acm_offs >= device->acm_hdr.cbDstLengthUsed){ + if(device->acm_offs >= WINMM_FixedBufferLen(device->acm_hdr.cbDstLengthUsed, device)){ acmStreamUnprepareHeader(device->acm_handle, &device->acm_hdr, 0); HeapFree(GetProcessHeap(), 0, device->acm_hdr.pbDst); device->acm_hdr.cbDstLength = 0; @@ -1893,7 +1895,7 @@ static void WID_PullData(WINMM_Device *device) UINT32 to_copy_bytes; to_copy_bytes = min(packet * device->bytes_per_frame, - queue->dwBufferLength - queue->dwBytesRecorded); + WINMM_FixedBufferLen(queue->dwBufferLength, device) - queue->dwBytesRecorded); memcpy(queue->lpData + queue->dwBytesRecorded, data + (packet_len - packet) * device->bytes_per_frame, @@ -2832,6 +2834,8 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) return WAVERR_STILLPLAYING; } + TRACE("dwBufferLength: %u\n", header->dwBufferLength); + if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved;

1 0

Ken Thomases : winemac: Add support for delay-rendered (a.k.a. promised) clipboard data.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 449e2655c2ca59eb0ab3b32e95bd9071c665d921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449e2655c2ca59eb0ab3b32e9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:51 2013 -0500 winemac: Add support for delay-rendered (a.k.a. promised) clipboard data. --- dlls/winemac.drv/clipboard.c | 154 +++++++++++++++++++++++++++--------- dlls/winemac.drv/cocoa_clipboard.m | 8 +- dlls/winemac.drv/cocoa_event.m | 2 + dlls/winemac.drv/cocoa_window.m | 15 ++++ dlls/winemac.drv/event.c | 4 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 8 ++- 7 files changed, 149 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=449e2655c2ca59eb0ab3b…

1 0

André Hentschel : winapi: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: a7e240194ac75ddf9838da17e1c95e24f42a046c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e240194ac75ddf9838da17e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:43:37 2013 +0100 winapi: Remove SPARC support. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 2eac716..926cd1f 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64|arm64"; + my $ARCHES="arm|arm64|i386|powerpc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in disp_delete_name.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 587d007d69152fed5fcbacbb4a890dec73440996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587d007d69152fed5fcbacbb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:02:58 2013 +0100 jscript: Use BSTR also for pure IDispatch call in disp_delete_name. --- dlls/jscript/dispex.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 721ad16..6a0153b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1518,6 +1518,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL { IDispatchEx *dispex; jsdisp_t *jsdisp; + BSTR bstr; HRESULT hres; jsdisp = iface_to_jsdisp((IUnknown*)disp); @@ -1536,26 +1537,21 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } + bstr = SysAllocStringLen(NULL, jsstr_length(name)); + if(!bstr) + return E_OUTOFMEMORY; + jsstr_flush(name, bstr); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - BSTR bstr; - - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(bstr) { - hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); - SysFreeString(bstr); - if(SUCCEEDED(hres)) - *ret = hres == S_OK; - }else { - hres = E_OUTOFMEMORY; - } - + hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); + if(SUCCEEDED(hres)) + *ret = hres == S_OK; IDispatchEx_Release(dispex); }else { - WCHAR *name_str = name->str; DISPID id; - hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name_str, 1, 0, &id); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, 0, &id); if(SUCCEEDED(hres)) { /* Property exists and we can't delete it from pure IDispatch interface, so return false. */ *ret = FALSE; @@ -1566,6 +1562,7 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL } } + SysFreeString(bstr); return hres; }

1 0

Ken Thomases : winemac: Implement IsClipboardFormatAvailable() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: af10783e18f59c62829ea0fd723270829ead1ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=af10783e18f59c62829ea0fd7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:09 2013 -0500 winemac: Implement IsClipboardFormatAvailable() with support for text formats. --- dlls/winemac.drv/clipboard.c | 43 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 90788ce..3f15a37 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -647,6 +647,49 @@ INT CDECL macdrv_CountClipboardFormats(void) /************************************************************************** + * IsClipboardFormatAvailable (MACDRV.@) + */ +BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) +{ + CFArrayRef types; + int count; + UINT i; + BOOL found = FALSE; + + TRACE("desired_format %s\n", debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return FALSE; + } + + count = CFArrayGetCount(types); + TRACE("got %d types\n", count); + + for (i = 0; !found && i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while (!found && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); + + if (format->format_id == desired_format) + found = TRUE; + } + } + + CFRelease(types); + TRACE(" -> %d\n", found); + return found; +} + + +/************************************************************************** * MACDRV Private Clipboard Exports **************************************************************************/ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 809ee2a..f5d1f15 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -20,6 +20,7 @@ @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl IsClipboardFormatAvailable(long) macdrv_IsClipboardFormatAvailable @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC

1 0

André Hentschel : libport: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: fc08021151d499ec09cb5c115316afa1d4bc0f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc08021151d499ec09cb5c115… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:40:54 2013 +0100 libport: Remove SPARC support. --- libs/wine/port.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 87e5833..a532b2d 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -169,19 +169,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "ldr x19, [sp,#16]\n\t" /* restore register from stack */ "ldp x29, x30, [sp],#32\n\t" /* restore return address */ "ret") /* return */ -#elif defined(__sparc__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack, - "save %sp, -96, %sp\n\t" /* push: change register window */ - "mov %sp, %l2\n\t" /* store old sp in local var */ - "mov %i0, %l0\n\t" /* func */ - "mov %i1, %l1\n\t" /* arg */ - "sub %i2, 96, %sp\n\t" /* stack */ - "call %l0, 0\n\t" /* call func */ - "mov %l1, %o0\n\t" /* delay slot: arg for func */ - "mov %l2, %sp\n\t" /* restore old sp from local var */ - "mov %o0, %i0\n\t" /* move return value to right register window */ - "ret\n\t" /* return */ - "restore\n\t") /* delay slot: pop */ #else #error You must implement wine_call_on_stack for your platform #endif

1 0

Ken Thomases : winemac: Add support for "query" events which wait for synchronous responses.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 69e631e04e75e7596f58d2d16ba674b343886877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e631e04e75e7596f58d2d16… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:26 2013 -0500 winemac: Add support for "query" events which wait for synchronous responses. --- dlls/winemac.drv/cocoa_app.h | 7 ++- dlls/winemac.drv/cocoa_app.m | 86 ++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 1 + dlls/winemac.drv/cocoa_event.h | 7 ++ dlls/winemac.drv/cocoa_event.m | 169 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_opengl.m | 2 +- dlls/winemac.drv/event.c | 32 +++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 26 ++++++- dlls/winemac.drv/macdrv_main.c | 2 +- 10 files changed, 314 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e631e04e75e7596f58d…

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in Object. hasOwnProperty.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 52fc8b3d94853e66d7c854bc33095759008245d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fc8b3d94853e66d7c854bc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:05:27 2013 +0100 jscript: Use BSTR also for pure IDispatch call in Object.hasOwnProperty. --- dlls/jscript/object.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8047d3f..1139f3c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -113,6 +113,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl { jsstr_t *name; DISPID id; + BSTR bstr; HRESULT hres; TRACE("\n"); @@ -131,6 +132,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl BOOL result; hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result); + jsstr_release(name); if(FAILED(hres)) return hres; @@ -139,22 +141,20 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } - if(is_dispex(jsthis)) { - BSTR bstr; - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(!bstr) - return E_OUTOFMEMORY; + bstr = SysAllocStringLen(NULL, jsstr_length(name)); + if(bstr) + jsstr_flush(name, bstr); + jsstr_release(name); + if(!bstr) + return E_OUTOFMEMORY; - hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, - make_grfdex(ctx, fdexNameCaseSensitive), &id); - SysFreeString(bstr); - } else { - OLECHAR *names = name->str; - hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, - &names, 1, ctx->lcid, &id); - } + if(is_dispex(jsthis)) + hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id); + else + hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, &bstr, 1, ctx->lcid, &id); + SysFreeString(bstr); if(r) *r = jsval_bool(SUCCEEDED(hres)); return S_OK;

1 0

André Hentschel : winebuild: Remove get_asm_short_keyword.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4f1beed10628c17b087f9162b3762995060b837e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1beed10628c17b087f9162b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:37:05 2013 +0100 winebuild: Remove get_asm_short_keyword. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 2 +- tools/winebuild/res16.c | 12 ++-- tools/winebuild/res32.c | 9 ++-- tools/winebuild/spec16.c | 130 ++++++++++++++++++++-------------------------- tools/winebuild/spec32.c | 40 ++++++-------- tools/winebuild/utils.c | 8 --- 7 files changed, 85 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1beed10628c17b087f9…

1 0

André Hentschel : ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6e8be236eec5b532d0f1715b376fea07b9bc3e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8be236eec5b532d0f1715b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 15:43:12 2013 +0100 ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64. --- dlls/ntdll/signal_arm.c | 8 ++++---- dlls/ntdll/signal_arm64.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bf94b17..ce6a6b6 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -124,7 +124,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(x) context->R##x = REGn_sig(x,sigcontext) /* Save normal registers */ @@ -146,7 +146,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(x) REGn_sig(x,sigcontext) = context->R##x /* Restore normal registers */ @@ -167,7 +167,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } @@ -178,7 +178,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 01af577..018d84f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -115,7 +115,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(n) context->X##n = REGn_sig(n,sigcontext) /* Save normal registers */ @@ -136,7 +136,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(n) REGn_sig(n,sigcontext) = context->X##n /* Restore normal registers */ @@ -156,7 +156,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); } @@ -167,7 +167,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); }

1 0

André Hentschel : winecrt0: Android NDK doesn' t have _init and _fini.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e0f3e6bcf2045c6a0ff00af631a508dabd13420f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3e6bcf2045c6a0ff00af63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 12:04:00 2013 +0100 winecrt0: Android NDK doesn't have _init and _fini. --- dlls/winecrt0/crt0_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/crt0_private.h b/dlls/winecrt0/crt0_private.h index 05cf75d..b2c902e 100644 --- a/dlls/winecrt0/crt0_private.h +++ b/dlls/winecrt0/crt0_private.h @@ -21,7 +21,7 @@ #ifndef __WINE_CRT0_PRIVATE_H__ #define __WINE_CRT0_PRIVATE_H__ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) static inline void _init(int argc, char **argv, char **envp ) { /* nothing */ } static inline void _fini(void) { /* nothing */ } #else

1 0

Ken Thomases : winemac: Implement setting of clipboard data with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: bf824ed38c62f90c0fe66b1b61f7fedc8c377900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf824ed38c62f90c0fe66b1b6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:21 2013 -0500 winemac: Implement setting of clipboard data with support for text formats. --- dlls/winemac.drv/clipboard.c | 372 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 77 ++++++++ dlls/winemac.drv/macdrv_cocoa.h | 3 + dlls/winemac.drv/winemac.drv.spec | 4 + 4 files changed, 444 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf824ed38c62f90c0fe66…

1 0

Ken Thomases : winemac: Implement GetClipboardData() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 764a8edb0991b2aaca225923e00f4a1cb8d92e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764a8edb0991b2aaca225923e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:18 2013 -0500 winemac: Implement GetClipboardData() with support for text formats. --- dlls/winemac.drv/clipboard.c | 67 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_clipboard.m | 28 +++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2c07fc8..9ae9e9c 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -738,6 +738,73 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) /************************************************************************** + * GetClipboardData (MACDRV.@) + */ +HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("desired_format %s\n", debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * IsClipboardFormatAvailable (MACDRV.@) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index f9f9c6a..753a497 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -50,3 +50,31 @@ CFArrayRef macdrv_copy_pasteboard_types(void) [pool release]; return ret; } + + +/*********************************************************************** + * macdrv_copy_pasteboard_data + * + * Returns the pasteboard data for a specified type, or NULL on error or + * if there's no such type on the pasteboard. The caller is responsible + * for releasing the returned data object with CFRelease(). + */ +CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +{ + __block NSData* ret = nil; + + OnMainThread(^{ + @try + { + NSPasteboard* pb = [NSPasteboard generalPasteboard]; + if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[pb dataForType:(NSString*)type] copy]; + } + @catch (id e) + { + ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + } + }); + + return (CFDataRef)ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3bb03d6..e36c301 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -275,6 +275,7 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; /* opengl */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 3bbaac2..d1195f1 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -16,6 +16,7 @@ @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetClipboardData(long) macdrv_GetClipboardData @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName

1 0

Ken Thomases : winemac: Implement EnumClipboardFormats() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 7cf3e0596f556030f9caa6d497c827c2de0c99c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf3e0596f556030f9caa6d49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:12 2013 -0500 winemac: Implement EnumClipboardFormats() with support for text formats. --- dlls/winemac.drv/clipboard.c | 91 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3f15a37..2c07fc8 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -647,6 +647,97 @@ INT CDECL macdrv_CountClipboardFormats(void) /************************************************************************** + * EnumClipboardFormats (MACDRV.@) + */ +UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + UINT ret; + + TRACE("prev_format %s\n", debugstr_format(prev_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return 0; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + if (!count) + { + CFRelease(types); + return 0; + } + + if (prev_format) + { + CFMutableArrayRef formats = CFArrayCreateMutable(NULL, 0, NULL); + if (!formats) + { + WARN("Failed to allocate array to track formats\n"); + CFRelease(types); + return 0; + } + + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while ((format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + + if (format->synthesized) + { + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + CFArrayAppendValue(formats, (void*)format->format_id); + } + else + { + /* If the type was already in the array, it must have been synthesized + because this one's real. Remove the synthesized entry in favor of + this one. */ + CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), + (void*)format->format_id); + if (index != kCFNotFound) + CFArrayRemoveValueAtIndex(formats, index); + CFArrayAppendValue(formats, (void*)format->format_id); + } + } + } + + count = CFArrayGetCount(formats); + i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); + if (i == kCFNotFound || i + 1 >= count) + ret = 0; + else + ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); + + CFRelease(formats); + } + else + { + CFStringRef type = CFArrayGetValueAtIndex(types, 0); + WINE_CLIPFORMAT *format = format_for_type(NULL, type); + + ret = format ? format->format_id : 0; + } + + CFRelease(types); + TRACE(" -> %u\n", ret); + return ret; +} + + +/************************************************************************** * IsClipboardFormatAvailable (MACDRV.@) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index f5d1f15..3bbaac2 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -13,6 +13,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon @ cdecl DestroyWindow(long) macdrv_DestroyWindow +@ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos

1 0

Ken Thomases : winemac: Implement CountClipboardFormats() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6b2b3e69f734afcfe02571eb248cd0bf74109d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2b3e69f734afcfe02571eb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:03 2013 -0500 winemac: Implement CountClipboardFormats() with support for text formats. --- dlls/winemac.drv/Makefile.in | 2 + dlls/winemac.drv/clipboard.c | 673 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_clipboard.m | 52 +++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/macdrv_main.c | 2 + dlls/winemac.drv/winemac.drv.spec | 1 + 7 files changed, 736 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2b3e69f734afcfe0257…

1 0

André Hentschel : include: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 41658157b1fce998a485c9996104e91092ed054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41658157b1fce998a485c9996… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:33:37 2013 +0100 include: Remove SPARC support. --- include/cvconst.h | 13 -------- include/winnt.h | 86 ----------------------------------------------------- 2 files changed, 0 insertions(+), 99 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 8b48f78..9ad6324 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -666,19 +666,6 @@ enum CV_HREG_e CV_AMD64_R15 = 343, /* Wine extension */ - CV_SPARC_NOREG = CV_REG_NONE, - CV_SPARC_G0 = 10, /* includes g0 to g7 */ - CV_SPARC_O0 = 18, /* includes o0 to o7 */ - CV_SPARC_L0 = 26, /* includes l0 to l7 */ - CV_SPARC_I0 = 34, /* includes i0 to i7 */ - CV_SPARC_PSR = 42, - CV_SPARC_PC = 43, - CV_SPARC_NPC = 44, - CV_SPARC_Y = 45, - CV_SPARC_WIM = 46, - CV_SPARC_TBR = 47, - - /* Wine extension */ CV_ARM64_NOREG = CV_REG_NONE, CV_ARM64_X0 = 10, /* this includes X0 to X30 */ CV_ARM64_SP = 41, diff --git a/include/winnt.h b/include/winnt.h index 711cda8..0dac8b1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -649,9 +649,6 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF -/* Wine extension */ -#define PROCESSOR_ARCHITECTURE_SPARC 20 - /* dwProcessorType */ #define PROCESSOR_INTEL_386 386 #define PROCESSOR_INTEL_486 486 @@ -2013,88 +2010,6 @@ typedef struct _STACK_FRAME_HEADER #endif /* __powerpc__ */ -#ifdef __sparc__ - -/* - * FIXME: - * - * There is no official CONTEXT structure defined for the SPARC - * architecture, so I just made one up. - * - * This structure is valid only for 32-bit SPARC architectures, - * not for 64-bit SPARC. - * - * Note that this structure contains only the 'top-level' registers; - * the rest of the register window chain is not visible. - * - * The layout follows the Solaris 'prgregset_t' structure. - * - */ - -#define CONTEXT_SPARC 0x10000000 - -#define CONTEXT_CONTROL (CONTEXT_SPARC | 0x00000001) -#define CONTEXT_FLOATING_POINT (CONTEXT_SPARC | 0x00000002) -#define CONTEXT_INTEGER (CONTEXT_SPARC | 0x00000004) - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) - -#define EXCEPTION_READ_FAULT 0 -#define EXCEPTION_WRITE_FAULT 1 -#define EXCEPTION_EXECUTE_FAULT 8 - -typedef struct _CONTEXT -{ - DWORD ContextFlags; - - /* These are selected by CONTEXT_INTEGER */ - DWORD g0; - DWORD g1; - DWORD g2; - DWORD g3; - DWORD g4; - DWORD g5; - DWORD g6; - DWORD g7; - DWORD o0; - DWORD o1; - DWORD o2; - DWORD o3; - DWORD o4; - DWORD o5; - DWORD o6; - DWORD o7; - DWORD l0; - DWORD l1; - DWORD l2; - DWORD l3; - DWORD l4; - DWORD l5; - DWORD l6; - DWORD l7; - DWORD i0; - DWORD i1; - DWORD i2; - DWORD i3; - DWORD i4; - DWORD i5; - DWORD i6; - DWORD i7; - - /* These are selected by CONTEXT_CONTROL */ - DWORD psr; - DWORD pc; - DWORD npc; - DWORD y; - DWORD wim; - DWORD tbr; - - /* FIXME: floating point registers missing */ - -} CONTEXT; - -#endif /* __sparc__ */ - #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) #error You need to define a CONTEXT for your CPU #endif @@ -2556,7 +2471,6 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_CEE 0xc0ee /* Wine extension */ -#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_FILE_MACHINE_ARM64 0x01c5 #define IMAGE_SIZEOF_FILE_HEADER 20

1 0

Andrew Eikum : winmm/tests: Add tests for non-block-aligned fragment sizes.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: dd0751ae83529d8229325e1d0b790d3b33ba781a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0751ae83529d8229325e1d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 11 06:42:25 2013 -0500 winmm/tests: Add tests for non-block-aligned fragment sizes. --- dlls/winmm/tests/wave.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index eb619cd..09c7c89 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1508,9 +1508,88 @@ static void test_sndPlaySound(void) ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); } +static void test_fragmentsize(void) +{ + MMRESULT rc; + WAVEHDR hdr[2]; + HWAVEOUT wout; + WAVEFORMATEX fmt; + MMTIME mmtime; + DWORD wait; + HANDLE hevent; + + if(waveOutGetNumDevs() == 0) + return; + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = sizeof(WAVEFORMATEX); + + hevent = CreateEvent(NULL, FALSE, FALSE, NULL); + g_tid = GetCurrentThreadId(); + + rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)callback_func, + (DWORD_PTR)hevent, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_NOERROR || rc == WAVERR_BADFORMAT || + rc == MMSYSERR_INVALFLAG || rc == MMSYSERR_INVALPARAM, + "waveOutOpen(%s) failed: %s\n", dev_name(WAVE_MAPPER), wave_out_error(rc)); + if(rc != MMSYSERR_NOERROR){ + CloseHandle(hevent); + return; + } + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "wave open callback missed\n"); + + memset(hdr, 0, sizeof(hdr)); + hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; + hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; + hdr[1].lpData = hdr[0].lpData = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + + rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutPrepareHeader(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + trace("writing %u bytes then %u bytes\n", hdr[0].dwBufferLength, hdr[1].dwBufferLength); + rc = waveOutWrite(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 1 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 2 callback missed\n"); + + memset(&mmtime, 0, sizeof(mmtime)); + mmtime.wType = TIME_BYTES; + + rc = waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); + ok(rc == MMSYSERR_NOERROR, "waveOutGetPosition failed: %s\n", wave_out_error(rc)); + + /* windows behavior is inconsistent */ + ok(mmtime.u.cb == 88200 || + mmtime.u.cb == 88196, "after position: %u\n", mmtime.u.cb); + + rc = waveOutClose(wout); + ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + + CloseHandle(hevent); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); test_sndPlaySound(); + test_fragmentsize(); }

1 0

André Hentschel : winebuild: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 0ee8e2b5b1f633d51cbcc55d46cfe968665b683e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee8e2b5b1f633d51cbcc55d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:35:13 2013 +0100 winebuild: Remove SPARC support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 34 ---------------------------------- tools/winebuild/main.c | 2 -- tools/winebuild/spec32.c | 11 +---------- tools/winebuild/utils.c | 4 ---- 5 files changed, 2 insertions(+), 51 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 359428f..fd56c8c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 81325e9..fab4158 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -648,28 +648,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) case CPU_x86_64: output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; - case CPU_SPARC: - if ( !UsePIC ) - { - output( "\tsethi %%hi(%s+%d), %%g1\n", table, pos ); - output( "\tld [%%g1+%%lo(%s+%d)], %%g1\n", table, pos ); - output( "\tjmp %%g1\n" ); - output( "\tnop\n" ); - } - else - { - /* Hmpf. Stupid sparc assembler always interprets global variable - names as GOT offsets, so we have to do it the long way ... */ - output( "\tsave %%sp, -96, %%sp\n" ); - output( "0:\tcall 1f\n" ); - output( "\tnop\n" ); - output( "1:\tsethi %%hi(%s+%d-0b), %%g1\n", table, pos ); - output( "\tor %%g1, %%lo(%s+%d-0b), %%g1\n", table, pos ); - output( "\tld [%%g1+%%o7], %%g1\n" ); - output( "\tjmp %%g1\n" ); - output( "\trestore\n" ); - } - break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tldr PC,[IP,#%d]\n", pos); @@ -987,13 +965,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -88" ); output( "\tjmp *%%rax\n" ); break; - case CPU_SPARC: - output( "\tsave %%sp, -96, %%sp\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov %%g1, %%o0\n" ); - output( "\tjmp %%o0\n" ); - output( "\trestore\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tmov LR,PC\n"); @@ -1094,11 +1065,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; - case CPU_SPARC: - output( "\tset %d, %%g1\n", (idx << 16) | j ); - output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" ); output( "\tmov r0, #%d\n", idx ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 39dbe62..16b4165 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -52,8 +52,6 @@ int unwind_tables = 0; enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__sparc__) -enum target_cpu target_cpu = CPU_SPARC; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f6c8cd2..ab69797 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -38,7 +38,6 @@ #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ -#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_FILE_MACHINE_ARM64 0x01C5 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 @@ -439,11 +438,6 @@ static void output_asm_constructor( const char *constructor ) output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; - case CPU_SPARC: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tcall %s\n", asm_name(constructor) ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); @@ -488,7 +482,6 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; @@ -520,10 +513,9 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; - case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } output( "\t%s 0x%04x\n", /* Machine */ get_asm_short_keyword(), machine ); @@ -709,7 +701,6 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bab2b85..44bd92d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -56,7 +56,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "arm64", CPU_ARM64 }, @@ -892,7 +891,6 @@ unsigned int get_alignment(unsigned int align) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: @@ -917,7 +915,6 @@ unsigned int get_page_size(void) case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; case CPU_ARM64: return 4096; - case CPU_SPARC: return 8192; } /* unreached */ assert(0); @@ -931,7 +928,6 @@ unsigned int get_ptr_size(void) { case CPU_x86: case CPU_POWERPC: - case CPU_SPARC: case CPU_ARM: return 4; case CPU_x86_64:

1 0

André Hentschel : winegcc: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: ee7ffdcb53e6541a1000fdc92958a84f465714ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ffdcb53e6541a1000fdc92… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:34:33 2013 +0100 winegcc: Remove SPARC support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index a75b3cc..7d20c62 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7d528e0..06aa200 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -158,7 +158,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "aarch64", CPU_ARM64 } @@ -218,8 +217,6 @@ struct options static const enum target_cpu build_cpu = CPU_x86; #elif defined(__x86_64__) static const enum target_cpu build_cpu = CPU_x86_64; -#elif defined(__sparc__) -static const enum target_cpu build_cpu = CPU_SPARC; #elif defined(__powerpc__) static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__)

1 0

André Hentschel : winedump: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 1948f3253be105736ba14e9e5d692df842ae4f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1948f3253be105736ba14e9e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:39:12 2013 +0100 winedump: Remove SPARC support. --- tools/winedump/pe.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4cf0b40..b6c8a34 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -64,7 +64,6 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; - case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; } return "???"; }

1 0

Ken Thomases : winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4d51a688e37d070d6345587d63facbc630a43a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d51a688e37d070d6345587d6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:30 2013 -0500 winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface. This fixes a problem with flickering when repeatedly attaching and detaching a GL context from a window, such as for each WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5879b4d..f67ea89 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -38,6 +38,31 @@ [super dealloc]; } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the + undesirable side effect of ordering the view's GL surface off-screen. This isn't + done when just changing the context's view to a different view (which I would + think would be analogous, since the old view and surface end up without a + context attached). So, we finesse things by first setting the context's view to + a different view (the content view of an off-screen window) and then letting the + original implementation proceed. */ + - (void) clearDrawable + { + static NSWindow* dummyWindow; + static dispatch_once_t once; + + dispatch_once(&once, ^{ + OnMainThread(^{ + dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) + styleMask:NSBorderlessWindowMask + backing:NSBackingStoreBuffered + defer:NO]; + }); + }); + + [self setView:[dummyWindow contentView]]; + [super clearDrawable]; + } + @end

1 0

Ken Thomases : winemac: Don' t defer attaching OpenGL context to view if it is backed by a window device .
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 89a4e5a6d1c77646fd397e3419a91a08533bbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a4e5a6d1c77646fd397e341… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:25 2013 -0500 winemac: Don't defer attaching OpenGL context to view if it is backed by a window device. This fixes a problem with certain OpenGL programs which create a context very briefly before destroying it, like while handling WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 66eec63..5879b4d 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -21,6 +21,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" @interface WineOpenGLContext () @@ -97,8 +98,21 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { + __block BOOL windowHasDevice; + macdrv_add_view_opengl_context(v, c); - [context setLatentView:view]; + + OnMainThread(^{ + windowHasDevice = [[view window] windowNumber] > 0; + }); + if (windowHasDevice) + { + [context setView:view]; + [context setLatentView:nil]; + } + else + [context setLatentView:view]; + [context makeCurrentContext]; } else

1 0

Andrew Talbot : msvcp60: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 956219b5d9801189fa18be8243dd6277410e5a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956219b5d9801189fa18be824… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:53 2013 +0000 msvcp60: Avoid signed-unsigned integer comparisons. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f68bcde..64b3271 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2456,7 +2456,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 98eb9cf..a54fd28 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -80,7 +80,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Akihiro Sagawa : msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 0010ee021a6c79eb766b805f5fa1485f13bb51f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0010ee021a6c79eb766b805f5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:40 2013 +0900 msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l. --- dlls/msvcrt/tests/string.c | 8 ++++---- dlls/msvcrt/wcs.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 98d79c4..31314fd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2491,8 +2491,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); res = p_wcstoi64(stock, &endpos, 10); - todo_wine ok(res == 0, "res != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(res == 0, "res != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2506,8 +2506,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(stock, &endpos, 10); - todo_wine ok(ures == 0, "ures != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(ures == 0, "ures != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); ures = p_wcstoui64(tamil, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a0b1cb6..ba53084 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1395,7 +1395,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; if(isdigitW(cur)) { @@ -1493,10 +1493,10 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigit(cur)) { + if(isdigitW(cur)) { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Akihiro Sagawa : msvcrt/tests: Add _wcstoi64/_wcstoui64 tests.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 564b68244702031299d99d5354e7b573620f40e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564b68244702031299d99d535… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:38 2013 +0900 msvcrt/tests: Add _wcstoi64/_wcstoui64 tests. --- dlls/msvcrt/tests/string.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 43fe7c5..98d79c4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -71,6 +71,8 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); +static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); @@ -2468,6 +2470,57 @@ static void test__stricmp(void) setlocale(LC_ALL, "C"); } +static void test__wcstoi64(void) +{ + static const WCHAR digit[] = { '9', 0 }; + static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ + static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ + static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + + __int64 res; + unsigned __int64 ures; + WCHAR *endpos; + + if (!p_wcstoi64 || !p_wcstoui64) { + win_skip("_wcstoi64 or _wcstoui64 not found\n"); + return; + } + + res = p_wcstoi64(digit, NULL, 10); + ok(res == 9, "res != 9\n"); + res = p_wcstoi64(stock, &endpos, 10); + todo_wine ok(res == 0, "res != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(tamil, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + res = p_wcstoi64(thai, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(fullwidth, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(hex, NULL, 16); + todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + + ures = p_wcstoui64(digit, NULL, 10); + ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(stock, &endpos, 10); + todo_wine ok(ures == 0, "ures != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ures = p_wcstoui64(tamil, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + ures = p_wcstoui64(thai, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(fullwidth, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(hex, NULL, 16); + todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + + return; +} + START_TEST(string) { char mem[100]; @@ -2495,6 +2548,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + p_wcstoi64 = (void *)GetProcAddress(hMsvcrt, "_wcstoi64"); + p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); @@ -2564,4 +2619,5 @@ START_TEST(string) test_tolower(); test__atodbl(); test__stricmp(); + test__wcstoi64(); }

1 0

Dmitry Timoshkov : gdiplus: Print a passed in rectangle in GdipCombineRegionRect.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 65bd8f2b262075938324ec2689e667aca96350cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bd8f2b262075938324ec268… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:31:52 2013 +0900 gdiplus: Print a passed in rectangle in GdipCombineRegionRect. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5583514..99c5d35 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, region_element *left, *right = NULL; GpStatus stat; - TRACE("%p %p %d\n", region, rect, mode); + TRACE("%p %s %d\n", region, debugstr_rectf(rect), mode); if (!(region && rect)) return InvalidParameter;

1 0

Nikolay Sivov : xmllite: Fix a test failure on Windows 8.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e5a48b2d75bd9669ae6c78f4090fc385e36937b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a48b2d75bd9669ae6c78f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:49:28 2013 +0400 xmllite: Fix a test failure on Windows 8. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 16734d4..92ab215 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2246,6 +2246,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT TRACE("(%p)->(%p %p)\n", This, value, len); + *value = NULL; + if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) || is_reader_pending(This)) { diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7373a69..b0a14d3 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1238,16 +1238,16 @@ static void test_read_pending(void) int c; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); @@ -1257,8 +1257,8 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "Expected E_PENDING, got %08x\n", hr); - ok(value == (void*)0xdeadbeef, "got %p\n", value); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Make another read attempt if we don' t have enough data initially.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 88d7b66be2716e8c8374d7a45bd823f7e6430026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d7b66be2716e8c8374d7a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:45:53 2013 +0400 xmllite: Make another read attempt if we don't have enough data initially. --- dlls/xmllite/reader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 688497c..16734d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -610,7 +610,12 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */

1 0

Nikolay Sivov : xmllite: Actually resume comment and PI parsing while on Misc part.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: c38c471b644d571c038fbee6fcdd1ed1772edb81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c471b644d571c038fbee6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 15:45:38 2013 +0400 xmllite: Actually resume comment and PI parsing while on Misc part. --- dlls/xmllite/reader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 489d346..9216127 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -1064,6 +1065,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_Comment; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1088,6 +1090,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } else @@ -1354,14 +1357,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) { HRESULT hr = S_FALSE; - if (is_reader_pending(reader)) + if (reader->resumestate != XmlReadResumeState_Initial) { hr = reader_more(reader); if (FAILED(hr)) return hr; /* finish current node */ - if (reader->nodetype == XmlNodeType_Comment) + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } } while (1)

1 0

Detlef Riekenberg : kernel32/tests: Fix failures with virtual Drives ( AppVirt Client).
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 3826193f33fbbf726dd02d4a2187f3117f0bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826193f33fbbf726dd02d4a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 11 00:11:22 2013 +0100 kernel32/tests: Fix failures with virtual Drives (AppVirt Client). --- dlls/kernel32/tests/drive.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 14c0cf2..ca6cb44 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -114,16 +114,12 @@ static void test_GetDiskFreeSpaceA(void) drive, ret, GetLastError()); else { - ok(ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_INVALID_DRIVE || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", - drive, ret, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError()); + if( GetVersion() & 0x80000000) /* win3.0 through winME */ ok( total_clusters <= 65535, @@ -135,14 +131,12 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError()); + ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive); @@ -196,15 +190,10 @@ static void test_GetDiskFreeSpaceW(void) ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); - else - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", - drive[0], ret, GetLastError()); + else if (!ret) + /* GetDiskFreeSpaceW() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError()); } logical_drives >>= 1; }

1 0

Vincent Povirk : gdiplus: Fix GdipCreateBitmapFromGraphics implementation.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 636e60b6e020a8e37e6dac03481bedcb20f3edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e60b6e020a8e37e6dac034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 9 12:08:27 2013 -0600 gdiplus: Fix GdipCreateBitmapFromGraphics implementation. --- dlls/gdiplus/image.c | 14 +++++----- dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ff27334..98c0bd0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1595,12 +1595,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, return NotImplemented; } -/* FIXME: this should create a bitmap in the given size with the attributes - * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1608,12 +1605,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } + return ret; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 08b2465..e41751a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4282,6 +4282,58 @@ static void test_alpha_hdc(void) DeleteDC(hdc); } +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4349,6 +4401,7 @@ START_TEST(graphics) test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0