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

Francois Gouget : testbot/build: Time the Build.pl operations.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: dcb4c422b20f9b495fe701c06abb431a3bad2652 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dcb4c422b20f9b495fe701c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:39 2013 +0100 testbot/build: Time the Build.pl operations. --- testbot/bin/build/Build.pl | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index dca4328..ef3fece 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include/Makefile " . + " time make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -201,7 +201,7 @@ sub BuildTestExecutable } system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include " . + " time make -j$ncpus include " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -223,7 +223,7 @@ sub BuildTestExecutable else { system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + " time make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -249,7 +249,7 @@ sub BuildTestExecutable { InfoMsg "Making build dependencies\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus __builddeps__ " . + " time make -j$ncpus __builddeps__ " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -269,7 +269,7 @@ sub BuildTestExecutable InfoMsg "Making test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $TestsDir " . + " time make -j$ncpus -C $TestsDir " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/web: Make JobDetails. pl handle empty err logs correctly.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 0c329e178170c6c489ca98198f2958b8d0c30c5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c329e178170c6c489ca9819… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:45 2013 +0100 testbot/web: Make JobDetails.pl handle empty err logs correctly. The task scripts used to create the err log and then delete it if it was empty. However the Task module now redirects the script's stderr to the err log to help diagnose script bugs (e.g. perl errors). That means the script must only append to the err log and should certainly not delete it. So JobDetails.pl should now be able to deal with empty err logs. --- testbot/web/JobDetails.pl | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 11bb122..a751f11 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -410,22 +410,25 @@ sub GenerateBody if (open ERRFILE, "<$ErrName") { - if (! $First) - { - print "</code></pre>\n"; - $First = 1; - } + $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) { $HasLogEntries = 1; chomp($Line); - if ($First) + if ($PrintedDll ne $CurrentDll) { - print "<br>\n"; - print "<pre><code>"; - $First = !1; + if ($First) + { + $First = !1; + } + else + { + print "</code></pre>\n"; + } + $PrintedDll = $CurrentDll; } - print $self->escapeHTML($Line), "\n"; + print "<br>\n"; + print "<pre><code>", $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/build: Also update the makefile if one of the top-level Make.*. in files is modified.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: fcab37e192762e826bf7dd6140bd20f6a246d7ea URL: http://source.winehq.org/git/tools.git/?a=commit;h=fcab37e192762e826bf7dd61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:36 2013 +0100 testbot/build: Also update the makefile if one of the top-level Make.*.in files is modified. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 76e73f4..dca4328 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -86,7 +86,7 @@ sub ApplyPatch ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { - if ($Line =~ m=^diff.*tests/Makefile\.in=) + if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) { $NeedMakefile = 1; }

1 0

Francois Gouget : testbot/TestAgent: Quote the unknown command to avoid ambiguity.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 55a4611ff48ca27d8aea736a91e210b5bb27f4ad URL: http://source.winehq.org/git/tools.git/?a=commit;h=55a4611ff48ca27d8aea736a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:36:13 2013 +0100 testbot/TestAgent: Quote the unknown command to avoid ambiguity. --- testbot/scripts/TestAgent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 521e741..897ca81 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -188,7 +188,7 @@ while (@ARGV) } else { - error("unknown command $arg\n"); + error("unknown command '$arg'\n"); $Usage = 2; } }

1 0

Francois Gouget : testbot/build: Let make rebuild the makefiles instead of calling config.status from Build .pl.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: e3a4ae40910388d8f68afa5abf3e47e515055d31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e3a4ae40910388d8f68afa5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:32 2013 +0100 testbot/build: Let make rebuild the makefiles instead of calling config.status from Build.pl. --- testbot/bin/build/Build.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 2964049..76e73f4 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + " make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/build: Use the standard MinGW compiler names in the Build.pl script.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 77322aa20f775bb2aac62ff2764f5893281ef628 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77322aa20f775bb2aac62ff2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:29 2013 +0100 testbot/build: Use the standard MinGW compiler names in the Build.pl script. The same fix was applied to the Reconfig.pl script previously. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 21899af..2964049 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -177,7 +177,7 @@ sub BuildTestExecutable if ($NeedConfigure) { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1");

1 0

Francois Gouget : testbot/VMs: Add a maintenance status for VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 89ec21a5445fde7d66000371d3b725d0bee8ee42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89ec21a5445fde7d66000371… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:35 2013 +0100 testbot/VMs: Add a maintenance status for VMs. This makes it possible to distinguish between broken (offline) VMs, and VMs the administrator is reconfiguring. --- testbot/ddl/update22.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 10 ++++++++-- testbot/web/Submit.pl | 8 ++++++-- testbot/web/index.pl | 31 +++++++++++++++++++++++-------- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/ddl/update22.sql b/testbot/ddl/update22.sql new file mode 100644 index 0000000..cd4f5a2 --- /dev/null +++ b/testbot/ddl/update22.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 4763d86..4912a59 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,7 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL, ChildPid INT(5) NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 826b0f6..04aeb3c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -185,6 +185,12 @@ responding anymore), making it temporarily unusable. New jobs can still be added for this VM but they won't be run until an administrator fixes it. The main web status page has a warning indicator on when some VMs are offline. +=item maintenance + +A WineTestBot administrator is working on the VM so that it cannot be used for +the tests. The main web status page has a warning indicator on when some VMs +are undergoing maintenance. + =back =cut @@ -572,7 +578,7 @@ BEGIN CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance']), # Note: ChildPid is only valid when Status == 'reverting' or 'sleeping'. CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), @@ -668,7 +674,7 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline ones + # Filter out the disabled VMs, that is the offline and maintenance ones $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 88a27dc..1288bf0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -83,10 +83,10 @@ sub GetHeaderText { my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); - $VMs->AddFilter("Status", ["offline"]); + $VMs->AddFilter("Status", ["offline", "maintenance"]); if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; + $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } return $HeaderText; } @@ -260,6 +260,10 @@ sub GenerateFields { print " [offline]"; } + elsif ($VM->Status eq 'maintenance') + { + print " [maintenance]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) { diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94d8254..1dffaf7 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -234,22 +234,37 @@ sub GenerateBody } print "</div>\n"; - print "<div class='GeneralStatusItem'>"; - my $VMs = CreateVMs(); - $VMs->FilterEnabledRole(); - $VMs->AddFilter("Status", ["offline"]); - if ($VMs->IsEmpty()) + my $OfflineVMs = CreateVMs(); + $OfflineVMs->FilterEnabledRole(); + $OfflineVMs->AddFilter("Status", ["offline"]); + my $MaintenanceVMs = CreateVMs(); + $MaintenanceVMs->FilterEnabledRole(); + $MaintenanceVMs->AddFilter("Status", ["maintenance"]); + if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) { + print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); print "<div class='GeneralStatusItemText'><a href='#vms'>All VMs are online</a></div>"; + print "</div>\n"; } else { - $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + if (!$OfflineVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "</div>\n"; + } + if (!$MaintenanceVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "</div>\n"; + } } print "</div>\n"; - print "</div>\n"; print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs();

1 0

Francois Gouget : testbot/VMs: Schedule jobs on offline VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: e7ea34bd527a38065ddf63f6e3036f1bd09b0cf8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ea34bd527a38065ddf63f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:30 2013 +0100 testbot/VMs: Schedule jobs on offline VMs. Being 'offline' is supposed to be temporary so jobs can still be scheduled on these VMs (especially the WineTest ones). These jobs will just be run later, once an administrator has fixed the VM. --- testbot/bin/CheckForWinetestUpdate.pl | 1 - testbot/lib/WineTestBot/Jobs.pm | 1 - testbot/lib/WineTestBot/Patches.pm | 1 - testbot/lib/WineTestBot/VMs.pm | 8 ++++---- testbot/web/Submit.pl | 11 ++++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c8909e6..8cbcc9c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -92,7 +92,6 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - $VMs->FilterEnabledStatus(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4b7d425..c6421e9 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -542,7 +542,6 @@ sub ScheduleJobs() my %Hosts; my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); - $VMs->FilterEnabledStatus(); foreach my $VM (@{$VMs->GetItems()}) { my $Host = $VM->GetHost(); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e8143ca..186398d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,6 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - $VMs->FilterEnabledStatus(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index eea9e78..826b0f6 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -180,10 +180,10 @@ next step will be to revert it to the idle snapshot so it can be used again. =item offline -This VM should not be used. The WineTestBot automatically puts VMs into this -state if errors happen when manipulating them, such as if they fail to revert, -etc. The main web status page has a warning indicator on when some VMs are -offline. +An error occurred with this VM (typically it failed to revert or is not +responding anymore), making it temporarily unusable. New jobs can still be +added for this VM but they won't be run until an administrator fixes it. +The main web status page has a warning indicator on when some VMs are offline. =back diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 56e542d..88a27dc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -84,10 +84,9 @@ sub GetHeaderText my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); $VMs->AddFilter("Status", ["offline"]); - if (! $VMs->IsEmpty()) + if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Some VMs are currently offline and are not " . - "shown here."; + $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; } return $HeaderText; } @@ -237,8 +236,6 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Scheduling jobs on offline VMs is not allowed - $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones @@ -259,6 +256,10 @@ sub GenerateFields { print " (", $self->CGI->escapeHTML($VM->Description), ")"; } + if ($VM->Status eq 'offline') + { + print " [offline]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) {

1 0

Francois Gouget : testbot/web: Don't report 'offline VMs' if it' s only retired and deleted VMs.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 1aecad4c688e74ab404cfb895d692f71829d7372 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1aecad4c688e74ab404cfb89… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:21 2013 +0100 testbot/web: Don't report 'offline VMs' if it's only retired and deleted VMs. The Status is irrelevant for retired and deleted VMs. --- testbot/web/index.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 59bf16a..94d8254 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -236,6 +236,7 @@ sub GenerateBody print "<div class='GeneralStatusItem'>"; my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); $VMs->AddFilter("Status", ["offline"]); if ($VMs->IsEmpty()) {

1 0

Francois Gouget : winhttp: netconn_get_next_line() is not used anymore so remove it.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: fbe7ab5c5af9b7ca3decc82ae986be2c78fa6165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe7ab5c5af9b7ca3decc82ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 26 16:27:51 2013 +0100 winhttp: netconn_get_next_line() is not used anymore so remove it. --- dlls/winhttp/net.c | 75 ---------------------------------------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 0 insertions(+), 76 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 631939a..bc83542 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -734,81 +734,6 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } -BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) -{ - struct pollfd pfd; - BOOL ret = FALSE; - DWORD recvd = 0; - - if (!netconn_connected( conn )) return FALSE; - - if (conn->secure) - { - while (recvd < *buflen) - { - int dummy; - if (!netconn_recv( conn, &buffer[recvd], 1, 0, &dummy )) - { - set_last_error( ERROR_CONNECTION_ABORTED ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; - } - - pfd.fd = conn->socket; - pfd.events = POLLIN; - while (recvd < *buflen) - { - int timeout, res; - struct timeval tv; - socklen_t len = sizeof(tv); - - if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1)) - timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; - else - timeout = -1; - if (poll( &pfd, 1, timeout ) > 0) - { - if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) - { - if (res == -1) set_last_error( sock_get_error( errno ) ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - else - { - set_last_error( ERROR_WINHTTP_TIMEOUT ); - break; - } - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; -} - DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { struct timeval tv; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b19aadf..82b4582 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -235,7 +235,6 @@ BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; -BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Keep stable surface for layered windows using UpdateLayeredWindow().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 4ec2809e7309b71eb7d07885649d7d2cc522929c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec2809e7309b71eb7d078856… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 08:54:51 2013 -0500 winemac: Keep stable surface for layered windows using UpdateLayeredWindow(). --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index aeeee2d..970a228 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -127,6 +127,7 @@ struct macdrv_win_data BOOL on_screen : 1; /* is window ordered in? (minimized or not) */ BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ + BOOL ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ BOOL minimized : 1; /* is window minimized? */ struct window_surface *surface; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eba8d86..07c4643 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -971,6 +971,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ { data->layered = FALSE; + data->ulw_layered = FALSE; sync_window_opacity(data, 0, 0, FALSE, 0); if (data->surface) set_surface_use_alpha(data->surface, FALSE); } @@ -1092,6 +1093,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * if (!(data = get_win_data(hwnd))) return FALSE; data->layered = TRUE; + data->ulw_layered = TRUE; rect = *window_rect; OffsetRect(&rect, -window_rect->left, -window_rect->top); @@ -1271,6 +1273,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags /* create the window surface if necessary */ if (!data->cocoa_window) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + if (data->ulw_layered) goto done; if (*surface) window_surface_release(*surface); *surface = NULL; @@ -1318,11 +1321,13 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, data->window_rect = *window_rect; data->whole_rect = *visible_rect; data->client_rect = *client_rect; - if (surface) - window_surface_add_ref(surface); - set_window_surface(data->cocoa_window, surface); - if (data->surface) window_surface_release(data->surface); - data->surface = surface; + if (!data->ulw_layered) + { + if (surface) window_surface_add_ref(surface); + set_window_surface(data->cocoa_window, surface); + if (data->surface) window_surface_release(data->surface); + data->surface = surface; + } TRACE("win %p/%p window %s whole %s client %s style %08x flags %08x surface %p\n", hwnd, data->cocoa_window, wine_dbgstr_rect(window_rect),

1 0

Ken Thomases : explorer: Create desktop window hidden and only show it if it wins the race.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 7eec5ad781bd909259c4ffbb2245c8d3b9f97beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eec5ad781bd909259c4ffbb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 04:55:04 2013 -0500 explorer: Create desktop window hidden and only show it if it wins the race. --- programs/explorer/desktop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 3e01f9f..4c8e599 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -302,7 +302,7 @@ void manage_desktop( WCHAR *arg ) /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), 0, 0, 0, NULL ); @@ -321,6 +321,7 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); + ShowWindow( hwnd, SW_SHOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd );

1 0

Detlef Riekenberg : kernel32/tests: Avoid test failure on multicore machines.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: ece3fafcdabb7dc4ecfaa22e5ed1a76596dad588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece3fafcdabb7dc4ecfaa22e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Mar 16 18:23:59 2013 +0100 kernel32/tests: Avoid test failure on multicore machines. --- dlls/kernel32/tests/thread.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 76a7a33..55014f8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -829,8 +829,6 @@ static VOID test_thread_processor(void) ok(retMask == processMask, "SetThreadAffinityMask failed\n"); retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0 >> 3); ok(retMask == processMask, "SetThreadAffinityMask failed\n"); - retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)1); - ok(retMask == 0, "SetThreadAffinityMask succeeded\n"); } /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) {

1 0

Alexandre Julliard : winex11: Don't use uninitialized variables (Coverity).
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: c2d53af33b2e6ba2b46a4bab327b89ed63d570ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d53af33b2e6ba2b46a4bab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 17:14:42 2013 +0100 winex11: Don't use uninitialized variables (Coverity). --- dlls/winex11.drv/opengl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ee62402..b11e8e3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1349,8 +1349,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; - TRACE( "setting drawable %lx pos %d,%d,%dx%d\n", - gl->drawable, changes.x, changes.y, changes.width, changes.height ); + TRACE( "setting drawable %lx size %dx%d\n", gl->drawable, changes.width, changes.height ); switch (gl->type) { @@ -1380,7 +1379,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r default: break; } - SetRect( &gl->rect, changes.x, changes.y, changes.x + changes.width, changes.y + changes.height ); + SetRect( &gl->rect, 0, 0, changes.width, changes.height ); done: release_gl_drawable( gl ); }

1 0

Huw Davies : gdi32: Printer drivers don' t use the character extra spacing if lpdx is supplied.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 5713311657f68d7d19108c5b87f4f356da65497b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5713311657f68d7d19108c5b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 26 11:14:26 2013 +0000 gdi32: Printer drivers don't use the character extra spacing if lpdx is supplied. --- dlls/gdi32/font.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 65e09d3..8fb101f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2266,6 +2266,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, y = pt.y; char_extra = GetTextCharacterExtra(hdc); + if (char_extra && lpDx && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + char_extra = 0; /* Printer drivers don't add char_extra if lpDx is supplied */ + if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) { UINT i;

1 0

André Hentschel : ntdll: Improve stub for FileFsAttributeInformation in NtQueryVolumeInformationFile .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: d53a55ea88c01647575b1388e22b1bbdf43b8a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53a55ea88c01647575b1388e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 25 16:07:33 2013 +0100 ntdll: Improve stub for FileFsAttributeInformation in NtQueryVolumeInformationFile. --- dlls/ntdll/file.c | 19 ++++++++++++++++++- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 791570e..5147ef5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -92,6 +92,7 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +static const WCHAR ntfsW[] = {'N','T','F','S'}; /************************************************************************** * FILE_CreateFile (internal) @@ -2639,7 +2640,23 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } break; case FileFsAttributeInformation: - FIXME( "%p: attribute info not supported\n", handle ); + if (length < offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName[sizeof(ntfsW)/sizeof(WCHAR)] )) + io->u.Status = STATUS_BUFFER_TOO_SMALL; + else + { + FILE_FS_ATTRIBUTE_INFORMATION *info = buffer; + + FIXME( "%p: faking attribute info\n", handle ); + info->FileSystemAttribute = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | + FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | + FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; + info->MaximumComponentNameLength = MAXIMUM_FILENAME_LENGTH - 1; + info->FileSystemNameLength = sizeof(ntfsW); + memcpy(info->FileSystemName, ntfsW, sizeof(ntfsW)); + + io->Information = sizeof(*info); + io->u.Status = STATUS_SUCCESS; + } break; case FileFsControlInformation: FIXME( "%p: control info not supported\n", handle ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f6a9e7c..c077b71 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1634,6 +1634,52 @@ todo_wine CloseHandle( dir ); } +static void test_query_attribute_information_file(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + FILE_FS_ATTRIBUTE_INFORMATION *ffai; + BYTE buf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + ZeroMemory( buf, sizeof(buf) ); + U(io).Status = 0xdadadada; + io.Information = 0xcacacaca; + + status = pNtQueryVolumeInformationFile( dir, &io, buf, sizeof(buf), FileFsAttributeInformation ); + + ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf; + + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); + ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); + + trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); + + CloseHandle( dir ); +} + static void test_NtCreateFile(void) { static const struct test_data @@ -1770,4 +1816,5 @@ START_TEST(file) test_file_name_information(); test_file_all_name_information(); test_query_volume_information_file(); + test_query_attribute_information_file(); }

1 0

Jacek Caban : mshtml: Use Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME in CreateUri calls.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 7b9fc3bb7d588321858bbefe5b0a09f8701229c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9fc3bb7d588321858bbefe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 11:37:47 2013 +0100 mshtml: Use Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME in CreateUri calls. --- dlls/mshtml/binding.h | 3 ++- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsio.c | 12 ++++++------ dlls/mshtml/persist.c | 11 ++++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 1366d98..4e86b76 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -121,8 +121,9 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC** HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; -HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; +HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; +HRESULT create_uri(const WCHAR*,DWORD,IUri**) DECLSPEC_HIDDEN; IUri *get_uri_nofrag(IUri*) DECLSPEC_HIDDEN; void set_current_mon(HTMLOuterWindow*,IMoniker*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2a2b5ca..6cfa76b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2083,7 +2083,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, translated_url = NULL; } - hres = CreateUri(translated_url ? translated_url : url, 0, 0, &uri); + hres = create_uri(translated_url ? translated_url : url, 0, &uri); CoTaskMemFree(translated_url); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f0edca0..012d7ac 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2327,7 +2327,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u hres = CoInternetCombineUrlEx(base_uri, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); else - hres = CreateUri(new_url, 0, 0, &uri); + hres = create_uri(new_url, 0, &uri); if(FAILED(hres)) return hres; @@ -2346,7 +2346,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url)); SysFreeString(display_uri); IUri_Release(uri); - hres = CreateUri(translated_url, 0, 0, &uri); + hres = create_uri(translated_url, 0, &uri); CoTaskMemFree(translated_url); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1e8f1bb..d313676 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1904,10 +1904,10 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) if(!spec) return NS_ERROR_OUT_OF_MEMORY; - hres = CreateUri(spec, 0, 0, &uri); + hres = create_uri(spec, 0, &uri); heap_free(spec); if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); + WARN("create_uri failed: %08x\n", hres); return NS_ERROR_FAILURE; } @@ -2924,7 +2924,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **re nsresult nsres; HRESULT hres; - hres = CreateUri(url, 0, 0, &iuri); + hres = create_uri(url, 0, &iuri); if(FAILED(hres)) return hres; @@ -2974,7 +2974,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC nsresult nsres; HRESULT hres; - hres = CreateUri(url, 0, 0, &iuri); + hres = create_uri(url, 0, &iuri); if(FAILED(hres)) return hres; @@ -3287,9 +3287,9 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(FAILED(hres)) WARN("CoInternetCombineUrlEx failed: %08x\n", hres); }else { - hres = CreateUri(new_spec, 0, 0, &urlmon_uri); + hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres)) - WARN("CreateUri failed: %08x\n", hres); + WARN("create_uri failed: %08x\n", hres); } if(FAILED(hres)) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index df9bafd..a0bb208 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -158,7 +158,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); if(SUCCEEDED(hres)) { - hres = CreateUri(url, 0, 0, &uri); + hres = create_uri(url, 0, &uri); if(FAILED(hres)) { WARN("CrateUri failed: %08x\n", hres); set_current_uri(This, NULL); @@ -178,11 +178,16 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } +HRESULT create_uri(const WCHAR *uri_str, DWORD flags, IUri **uri) +{ + return CreateUri(uri_str, flags | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); +} + HRESULT create_relative_uri(HTMLOuterWindow *window, const WCHAR *rel_uri, IUri **uri) { return window->uri ? CoInternetCombineUrlEx(window->uri, rel_uri, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, uri, 0) - : CreateUri(rel_uri, 0, 0, uri); + : create_uri(rel_uri, 0, uri); } void set_download_state(HTMLDocumentObj *doc, int state) @@ -967,7 +972,7 @@ static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream hres = E_FAIL; if(SUCCEEDED(hres)) { uri_str[str_len] = 0; - hres = CreateUri(uri_str, 0, 0, &uri); + hres = create_uri(uri_str, 0, &uri); } heap_free(uri_str); if(FAILED(hres))

1 0

Jacek Caban : urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 79b7c1108e3a0c8626799a20492e6c1daecfd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b7c1108e3a0c8626799a204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 11:34:12 2013 +0100 urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bc6d1be..e5faa81 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -360,6 +360,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt",S_OK}, + {"/z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -6926,7 +6951,62 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } + }; typedef struct _uri_parse_test { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 42cfe71..0f6ee31 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6461,7 +6461,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, return E_OUTOFMEMORY; } - parse_uri(&data, 0); + parse_uri(&data, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -6800,7 +6800,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW } } - hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL; return hr;

1 0

Jacek Caban : jscript: Use jsstr_flatten to access string buffer in dispex. c.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: b11d47fc9097e63e12b76260a58dbb52ffd0934e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d47fc9097e63e12b76260a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:37:31 2013 +0100 jscript: Use jsstr_flatten to access string buffer in dispex.c. --- dlls/jscript/dispex.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6a0153b..347e7e1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1524,8 +1524,15 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { dispex_prop_t *prop; + const WCHAR *ptr; + + ptr = jsstr_flatten(name); + if(!ptr) { + jsdisp_release(jsdisp); + return E_OUTOFMEMORY; + } - hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + hres = find_prop_name(jsdisp, string_hash(ptr), ptr, &prop); if(prop) { hres = delete_prop(prop, ret); }else {

1 0

Jacek Caban : jscript: Added jsstr_flatten helper and use it to access string buffer in date.c.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: e3d940334f24a15b967b88fa0cbbfe095dccc1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d940334f24a15b967b88fa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:36:58 2013 +0100 jscript: Added jsstr_flatten helper and use it to access string buffer in date.c. --- dlls/jscript/date.c | 4 +++- dlls/jscript/jsstr.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3d67248..d40d80f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2054,7 +2054,9 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { DWORD lcid_en; input_len = jsstr_length(input_str); - input = input_str->str; + input = jsstr_flatten(input_str); + if(!input) + return E_OUTOFMEMORY; for(i=0; i<input_len; i++) { if(input[i] == '(') nest_level++; diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 709d1c6..09893fa 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -53,6 +53,12 @@ static inline jsstr_t *jsstr_addref(jsstr_t *str) return str; } +/* This will be failable in the future. */ +static inline const WCHAR *jsstr_flatten(jsstr_t *str) +{ + return str->str; +} + static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) { unsigned len = jsstr_length(str1);

1 0

Piotr Caban : msvcrt20: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 16668e82fe869c2fea9e2641f0f7ddaadfce0277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16668e82fe869c2fea9e2641f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:02:45 2013 +0100 msvcrt20: Match parameters list with function we're forwarding to. --- dlls/msvcrt20/msvcrt20.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b2293ee..b166ada 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1141,7 +1141,7 @@ @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr -@ cdecl _tccpy(str str) msvcrt._mbccpy +@ cdecl _tccpy(ptr str) msvcrt._mbccpy @ cdecl _tclen(ptr) msvcrt._mbclen @ cdecl _tcschr(str long) msvcrt._mbschr @ cdecl _tcsclen(str) msvcrt._mbslen @@ -1156,19 +1156,19 @@ @ cdecl _tcsnccat(str str long) msvcrt._mbsncat @ cdecl _tcsnccmp(str str long) msvcrt._mbsncmp @ cdecl _tcsnccnt(str long) msvcrt._mbsnccnt -@ cdecl _tcsnccpy(str str long) msvcrt._mbsncpy +@ cdecl _tcsnccpy(ptr str long) msvcrt._mbsncpy @ cdecl _tcsncicmp(str str long) msvcrt._mbsnicmp @ cdecl _tcsncmp(str str long) msvcrt._mbsnbcmp @ cdecl _tcsncpy(ptr str long) msvcrt._mbsnbcpy -@ cdecl _tcsncset(str long long) msvcrt._mbsnset +@ cdecl _tcsncset(ptr long long) msvcrt._mbsnset @ cdecl _tcsnextc(str) msvcrt._mbsnextc @ cdecl _tcsnicmp(str str long) msvcrt._mbsnbicmp @ cdecl _tcsninc(str long) msvcrt._mbsninc -@ cdecl _tcsnset(str long long) msvcrt._mbsnbset +@ cdecl _tcsnset(ptr long long) msvcrt._mbsnbset @ cdecl _tcspbrk(str str) msvcrt._mbspbrk @ cdecl _tcsrchr(str long) msvcrt._mbsrchr @ cdecl _tcsrev(str) msvcrt._mbsrev -@ cdecl _tcsset(str long) msvcrt._mbsset +@ cdecl _tcsset(ptr long) msvcrt._mbsset @ cdecl _tcsspn(str str) msvcrt._mbsspn @ cdecl _tcsspnp(str str) msvcrt._mbsspnp @ cdecl _tcsstr(str str) msvcrt._mbsstr

1 0

Piotr Caban : msvcrt: Match architecture with function we're forwarding to.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 607316df5f3d2cc5a13b4c6d2216bc757e93b85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=607316df5f3d2cc5a13b4c6d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:01:59 2013 +0100 msvcrt: Match architecture with function we're forwarding to. --- dlls/msvcr100/msvcr100.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr110/msvcr110.spec | 48 +++++++++++++++++++++--------------------- dlls/msvcr80/msvcr80.spec | 44 +++++++++++++++++++------------------- dlls/msvcr90/msvcr90.spec | 44 +++++++++++++++++++------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=607316df5f3d2cc5a13b4…

1 0

Piotr Caban : wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 2bcd8a3fae434bc7435ef147e1f0a56dba6bcbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcd8a3fae434bc7435ef147e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:48 2013 +0100 wininet: Reorder functions to avoid urlcache_create_hash_table forward declaration. --- dlls/wininet/urlcache.c | 310 +++++++++++++++++++++++------------------------ 1 files changed, 154 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bcd8a3fae434bc7435ef…

1 0

Piotr Caban : wininet: Rename URLCACHECONTAINER to cache_container.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 299739d07f648088db8d52527e529b53a133d283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299739d07f648088db8d52527… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:03 2013 +0100 wininet: Rename URLCACHECONTAINER to cache_container. --- dlls/wininet/urlcache.c | 160 +++++++++++++++++++++++----------------------- 1 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=299739d07f648088db8d5…

1 0

Ken Thomases : winemac: Support CFSTR_SHELLURLW (UniformResourceLocator) clipboard format, mapped to public.url.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 678f08690495fad734d4e43bed92e8ca35715fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678f08690495fad734d4e43be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 00:48:02 2013 -0500 winemac: Support CFSTR_SHELLURLW (UniformResourceLocator) clipboard format, mapped to public.url. --- dlls/winemac.drv/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 81b4c34..6dfb2a2 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -208,6 +208,7 @@ static const struct { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, CFSTR("public.html"), import_clipboard_data, export_clipboard_data }, + { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */

1 0