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

Andrew Eikum : mmdevapi: Don't free resources on PROCESS_DETACH.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 1d3aac50a68469bc90cd4372ad0c279aaf5cb980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3aac50a68469bc90cd4372a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 25 14:46:38 2013 -0500 mmdevapi: Don't free resources on PROCESS_DETACH. --- dlls/mmdevapi/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index e19f27d..447813f 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -176,6 +176,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if(lpvReserved) + break; MMDevEnum_Free(); break; }

1 0

Piotr Caban : wininet: Rename STREAM_HANDLE to stream_handle.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: db9d650342a42d69a26f7ae91e7033d81657d044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9d650342a42d69a26f7ae91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:52 2013 +0100 wininet: Rename STREAM_HANDLE to stream_handle. --- dlls/wininet/urlcache.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d8da402..a6197db 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -178,11 +178,11 @@ typedef struct BYTE allocation_table[ALLOCATION_TABLE_SIZE]; } urlcache_header; -typedef struct _STREAM_HANDLE +typedef struct { - HANDLE hFile; - CHAR lpszUrl[1]; -} STREAM_HANDLE; + HANDLE file; + CHAR url[1]; +} stream_handle; typedef struct _URLCACHECONTAINER { @@ -3455,7 +3455,7 @@ BOOL WINAPI ReadUrlCacheEntryStream( ) { /* Get handle to file from 'stream' */ - STREAM_HANDLE * pStream = (STREAM_HANDLE *)hUrlCacheStream; + stream_handle *pStream = (stream_handle*)hUrlCacheStream; if (dwReserved != 0) { @@ -3464,15 +3464,15 @@ BOOL WINAPI ReadUrlCacheEntryStream( return FALSE; } - if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->lpszUrl, INTERNET_MAX_URL_LENGTH)) + if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->url, INTERNET_MAX_URL_LENGTH)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (SetFilePointer(pStream->hFile, dwLocation, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) + if (SetFilePointer(pStream->file, dwLocation, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) return FALSE; - return ReadFile(pStream->hFile, lpBuffer, *lpdwLen, lpdwLen, NULL); + return ReadFile(pStream->file, lpBuffer, *lpdwLen, lpdwLen, NULL); } /*********************************************************************** @@ -3493,7 +3493,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( * on this behaviour. (Native version appears to allocate * indices into a table) */ - STREAM_HANDLE * pStream; + stream_handle *pStream; HANDLE hFile; TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, @@ -3518,7 +3518,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( return FALSE; /* allocate handle storage space */ - pStream = heap_alloc(sizeof(STREAM_HANDLE) + strlen(lpszUrlName) * sizeof(CHAR)); + pStream = heap_alloc(sizeof(stream_handle) + strlen(lpszUrlName) * sizeof(CHAR)); if (!pStream) { CloseHandle(hFile); @@ -3526,8 +3526,8 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( return FALSE; } - pStream->hFile = hFile; - strcpy(pStream->lpszUrl, lpszUrlName); + pStream->file = hFile; + strcpy(pStream->url, lpszUrlName); return pStream; } @@ -3551,7 +3551,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( * on this behaviour. (Native version appears to allocate * indices into a table) */ - STREAM_HANDLE * pStream; + stream_handle *pStream; HANDLE hFile; TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, @@ -3576,7 +3576,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( return FALSE; /* allocate handle storage space */ - size = sizeof(STREAM_HANDLE); + size = sizeof(stream_handle); url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); size += url_len; pStream = heap_alloc(size); @@ -3587,8 +3587,8 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( return FALSE; } - pStream->hFile = hFile; - WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->lpszUrl, url_len, NULL, NULL); + pStream->file = hFile; + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->url, url_len, NULL, NULL); return pStream; } @@ -3601,7 +3601,7 @@ BOOL WINAPI UnlockUrlCacheEntryStream( IN DWORD dwReserved ) { - STREAM_HANDLE * pStream = (STREAM_HANDLE *)hUrlCacheStream; + stream_handle *pStream = (stream_handle*)hUrlCacheStream; if (dwReserved != 0) { @@ -3610,16 +3610,16 @@ BOOL WINAPI UnlockUrlCacheEntryStream( return FALSE; } - if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->lpszUrl, INTERNET_MAX_URL_LENGTH)) + if (IsBadReadPtr(pStream, sizeof(*pStream)) || IsBadStringPtrA(pStream->url, INTERNET_MAX_URL_LENGTH)) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!UnlockUrlCacheEntryFileA(pStream->lpszUrl, 0)) + if (!UnlockUrlCacheEntryFileA(pStream->url, 0)) return FALSE; - CloseHandle(pStream->hFile); + CloseHandle(pStream->file); heap_free(pStream); return TRUE; }

1 0

Ken Thomases : winemac: Specify import and export functions explicitly in builtin_format_names[].
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 36343f520bde568efff79b9f7ce2066f99874fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36343f520bde568efff79b9f7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 00:47:58 2013 -0500 winemac: Specify import and export functions explicitly in builtin_format_names[]. --- dlls/winemac.drv/clipboard.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 21d332d..81b4c34 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -197,15 +197,17 @@ static const WCHAR wszPNG[] = {'P','N','G',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const struct { - LPCWSTR name; - CFStringRef type; + LPCWSTR name; + CFStringRef type; + DRVIMPORTFUNC import; + DRVEXPORTFUNC export; } builtin_format_names[] = { - { wszRichTextFormat, CFSTR("public.rtf") }, - { wszGIF, CFSTR("com.compuserve.gif") }, - { wszJFIF, CFSTR("public.jpeg") }, - { wszPNG, CFSTR("public.png") }, - { wszHTMLFormat, CFSTR("public.html") }, + { wszRichTextFormat, CFSTR("public.rtf"), import_clipboard_data, export_clipboard_data }, + { wszGIF, CFSTR("com.compuserve.gif"), import_clipboard_data, export_clipboard_data }, + { 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 }, }; /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ @@ -1755,12 +1757,11 @@ BOOL CDECL macdrv_SetClipboardData(UINT format_id, HANDLE data, BOOL owner) void macdrv_clipboard_process_attach(void) { UINT i; + WINE_CLIPFORMAT *format; /* Register built-in formats */ for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) { - WINE_CLIPFORMAT *format; - if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = builtin_format_ids[i].id; format->type = CFRetain(builtin_format_ids[i].type); @@ -1772,8 +1773,15 @@ void macdrv_clipboard_process_attach(void) /* Register known mappings between Windows formats and Mac types */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) - insert_clipboard_format(RegisterClipboardFormatW(builtin_format_names[i].name), - builtin_format_names[i].type); + { + if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; + format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->type = CFRetain(builtin_format_names[i].type); + format->import_func = builtin_format_names[i].import; + format->export_func = builtin_format_names[i].export; + format->synthesized = FALSE; + list_add_tail(&format_list, &format->entry); + } }

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_UpdateHlink().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 4521044758af1804e70430f96c88c90cbc5d1238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4521044758af1804e70430f96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:50:32 2013 +0400 hlink: Implement IHlinkBrowseContext_UpdateHlink(). --- dlls/hlink/browse_ctx.c | 80 +++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 48a20cb..d09d59d 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -212,12 +212,56 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, return S_OK; } +static struct link_entry *context_get_entry(HlinkBCImpl *ctxt, ULONG hlid) +{ + struct list *entry; + + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&ctxt->links, &ctxt->current->entry); + break; + case HLID_NEXT: + entry = list_next(&ctxt->links, &ctxt->current->entry); + break; + case HLID_CURRENT: + entry = &ctxt->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&ctxt->links); + break; + case HLID_STACKTOP: + entry = list_head(&ctxt->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; + } + + return entry ? LIST_ENTRY(entry, struct link_entry, entry) : NULL; +} + static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface, - ULONG uHLID, IMoniker* pimkTarget, LPCWSTR pwzLocation, - LPCWSTR pwzFriendlyName) + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *entry = context_get_entry(This, hlid); + IHlink *link; + HRESULT hr; + + TRACE("(%p)->(0x%x %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!entry) + return E_INVALIDARG; + + hr = HlinkCreateFromMoniker(target, location, friendly_name, NULL, 0, NULL, &IID_IHlink, (void**)&link); + if (FAILED(hr)) + return hr; + + IHlink_Release(entry->link); + entry->link = link; + + return S_OK; } static HRESULT WINAPI IHlinkBC_EnumNavigationStack( IHlinkBrowseContext *iface, @@ -238,37 +282,13 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); struct link_entry *link; - struct list *entry; TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - switch (hlid) - { - case HLID_PREVIOUS: - entry = list_prev(&This->links, &This->current->entry); - break; - case HLID_NEXT: - entry = list_next(&This->links, &This->current->entry); - break; - case HLID_CURRENT: - entry = &This->current->entry; - break; - case HLID_STACKBOTTOM: - entry = list_tail(&This->links); - break; - case HLID_STACKTOP: - entry = list_head(&This->links); - break; - default: - WARN("unknown id 0x%x\n", hlid); - entry = NULL; - } - - if (!entry) + link = context_get_entry(This, hlid); + if (!link) return E_FAIL; - link = LIST_ENTRY(entry, struct link_entry, entry); - *ret = link->link; IHlink_AddRef(*ret);

1 0

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

March 26, 2013

Module: wine Branch: master Commit: 96ace8cbcbb2887eb8e4aa0e2a80bf7244d5918a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8cbcbb2887eb8e4aa0e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:38:01 2013 +0100 jscript: Use jsstr_flatten to access string buffer in jsutils.c. --- dlls/jscript/jsutils.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 60260bb..d141378 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -502,16 +502,15 @@ static int hex_to_int(WCHAR c) /* ECMA-262 3rd Edition 9.3.1 */ static HRESULT str_to_number(jsstr_t *str, double *ret) { - const WCHAR *ptr = str->str; + const WCHAR *ptr; BOOL neg = FALSE; DOUBLE d = 0.0; static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; - if(!ptr) { - *ret = 0; - return S_OK; - } + ptr = jsstr_flatten(str); + if(!ptr) + return E_OUTOFMEMORY; while(isspaceW(*ptr)) ptr++;

1 0

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

March 26, 2013

Module: wine Branch: master Commit: 78ea6a75929970db9664fcd4416f8f46550d8762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea6a75929970db9664fcd44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:00:00 2013 +0100 msvcp: Match parameters list and architecture with function we're forwarding to. --- dlls/msvcp60/msvcp60.spec | 18 ++++---- dlls/msvcp70/msvcp70.spec | 90 ++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78ea6a75929970db9664f…

1 0

Piotr Caban : wininet: Rename URLCacheContainers_* functions to cache_containers_*.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 21b84e7ac94fea09fc6c4e33ed0310d125445515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b84e7ac94fea09fc6c4e33e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:37 2013 +0100 wininet: Rename URLCacheContainers_* functions to cache_containers_*. --- dlls/wininet/urlcache.c | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 117eb9c..3ae6a16 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -531,7 +531,7 @@ static void cache_container_close_index(cache_container *pContainer) pContainer->mapping = NULL; } -static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, +static BOOL cache_containers_add(LPCWSTR cache_prefix, LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) { cache_container *pContainer = heap_alloc(sizeof(cache_container)); @@ -590,7 +590,7 @@ static void cache_container_delete_container(cache_container *pContainer) heap_free(pContainer); } -static void URLCacheContainers_CreateDefaults(void) +static void cache_containers_init(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -644,12 +644,12 @@ static void URLCacheContainers_CreateDefaults(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } - URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, + cache_containers_add(DefaultContainerData[i].cache_prefix, wszCachePath, DefaultContainerData[i].default_entry_type, wszMutexName); } } -static void URLCacheContainers_DeleteAll(void) +static void cache_containers_free(void) { while(!list_empty(&UrlContainers)) cache_container_delete_container( @@ -657,7 +657,7 @@ static void URLCacheContainers_DeleteAll(void) ); } -static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container **ppContainer) +static DWORD cache_containers_findW(LPCWSTR lpwszUrl, cache_container **ppContainer) { cache_container *pContainer; @@ -680,7 +680,7 @@ static DWORD URLCacheContainers_FindContainerW(LPCWSTR lpwszUrl, cache_container return ERROR_FILE_NOT_FOUND; } -static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container **ppContainer) +static DWORD cache_containers_findA(LPCSTR lpszUrl, cache_container **ppContainer) { LPWSTR url = NULL; DWORD ret; @@ -688,12 +688,12 @@ static DWORD URLCacheContainers_FindContainerA(LPCSTR lpszUrl, cache_container * if (lpszUrl && !(url = heap_strdupAtoW(lpszUrl))) return ERROR_OUTOFMEMORY; - ret = URLCacheContainers_FindContainerW(url, ppContainer); + ret = cache_containers_findW(url, ppContainer); heap_free(url); return ret; } -static BOOL URLCacheContainers_Enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) +static BOOL cache_containers_enum(LPCWSTR lpwszSearchPattern, DWORD dwIndex, cache_container **ppContainer) { DWORD i = 0; cache_container *pContainer; @@ -1768,7 +1768,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (dwFlags & ~GET_INSTALLED_ENTRY) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); + error = cache_containers_findA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1911,7 +1911,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( if (dwFlags) FIXME("ignoring unsupported flags: %x\n", dwFlags); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1994,7 +1994,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( TRACE("(%s, %p, 0x%08x)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2051,7 +2051,7 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); + error = cache_containers_findW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2126,7 +2126,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2224,7 +2224,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2660,7 +2660,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( return FALSE; } - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2736,7 +2736,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -2929,7 +2929,7 @@ BOOL WINAPI CreateUrlCacheEntryW( szFile[0] = 0; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3117,7 +3117,7 @@ static BOOL urlcache_entry_commit( file_size.u.LowPart = file_attr.nFileSizeLow; file_size.u.HighPart = file_attr.nFileSizeHigh; - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3641,7 +3641,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) TRACE("(%s)\n", debugstr_a(lpszUrlName)); - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = cache_containers_findA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -3695,7 +3695,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) return FALSE; } - error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); + error = cache_containers_findW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { heap_free(urlA); @@ -3934,7 +3934,7 @@ static BOOL urlcache_find_next_entry( return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + for (; cache_containers_enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; @@ -4284,7 +4284,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerA(url, &pContainer)) + if (cache_containers_findA(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4352,7 +4352,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa FIXME("unknown flags 0x%08x\n", dwFlags); /* Any error implies that the URL is expired, i.e. not in the cache */ - if (URLCacheContainers_FindContainerW(url, &pContainer)) + if (cache_containers_findW(url, &pContainer)) { memset(pftLastModified, 0, sizeof(*pftLastModified)); return TRUE; @@ -4468,7 +4468,7 @@ BOOL init_urlcache(void) return FALSE; } - URLCacheContainers_CreateDefaults(); + cache_containers_init(); return TRUE; } @@ -4480,7 +4480,7 @@ void free_urlcache(void) CloseHandle(free_cache_running); CloseHandle(dll_unload_event); - URLCacheContainers_DeleteAll(); + cache_containers_free(); } /***********************************************************************

1 0

Piotr Caban : wininet: Rename URLCache_* functions to urlcache_*.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 4e624561ca809ca90b88cf29f203dcfe567a98cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e624561ca809ca90b88cf29f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:23 2013 +0100 wininet: Rename URLCache_* functions to urlcache_*. --- dlls/wininet/urlcache.c | 296 +++++++++++++++++++++++------------------------ 1 files changed, 144 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e624561ca809ca90b88c…

1 0

Piotr Caban : wininet: Rename URLCacheFindEntryHandle to find_handle.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 33725537c1ce2cd34b253506eab972414573e9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33725537c1ce2cd34b253506e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:53:13 2013 +0100 wininet: Rename URLCacheFindEntryHandle to find_handle. --- dlls/wininet/urlcache.c | 79 +++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 188d77c..1c54a7f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -100,6 +100,8 @@ static const char urlcache_ver[] = "0.2012001"; #define DWORD_ALIGN(x) ( (DWORD)(((DWORD)(x)+sizeof(DWORD)-1)/sizeof(DWORD))*sizeof(DWORD) ) +#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD + typedef struct { DWORD signature; @@ -195,6 +197,14 @@ typedef struct DWORD default_entry_type; } cache_container; +typedef struct +{ + DWORD magic; + LPWSTR url_search_pattern; + DWORD container_idx; + DWORD hash_table_idx; + DWORD hash_entry_idx; +} find_handle; /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); @@ -3839,17 +3849,6 @@ HANDLE WINAPI FindFirstUrlCacheEntryExW( return NULL; } -#define URLCACHE_FIND_ENTRY_HANDLE_MAGIC 0xF389ABCD - -typedef struct URLCacheFindEntryHandle -{ - DWORD dwMagic; - LPWSTR lpszUrlSearchPattern; - DWORD dwContainerIndex; - DWORD dwHashTableIndex; - DWORD dwHashEntryIndex; -} URLCacheFindEntryHandle; - /*********************************************************************** * FindFirstUrlCacheEntryA (WININET.@) * @@ -3857,7 +3856,7 @@ typedef struct URLCacheFindEntryHandle INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3865,21 +3864,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupAtoW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupAtoW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryA(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3896,7 +3895,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { - URLCacheFindEntryHandle *pEntryHandle; + find_handle *pEntryHandle; TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); @@ -3904,21 +3903,21 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, if (!pEntryHandle) return NULL; - pEntryHandle->dwMagic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; + pEntryHandle->magic = URLCACHE_FIND_ENTRY_HANDLE_MAGIC; if (lpszUrlSearchPattern) { - pEntryHandle->lpszUrlSearchPattern = heap_strdupW(lpszUrlSearchPattern); - if (!pEntryHandle->lpszUrlSearchPattern) + pEntryHandle->url_search_pattern = heap_strdupW(lpszUrlSearchPattern); + if (!pEntryHandle->url_search_pattern) { heap_free(pEntryHandle); return NULL; } } else - pEntryHandle->lpszUrlSearchPattern = NULL; - pEntryHandle->dwContainerIndex = 0; - pEntryHandle->dwHashTableIndex = 0; - pEntryHandle->dwHashEntryIndex = 0; + pEntryHandle->url_search_pattern = NULL; + pEntryHandle->container_idx = 0; + pEntryHandle->hash_table_idx = 0; + pEntryHandle->hash_entry_idx = 0; if (!FindNextUrlCacheEntryW(pEntryHandle, lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize)) { @@ -3934,17 +3933,17 @@ static BOOL FindNextUrlCacheEntryInternal( LPDWORD lpdwNextCacheEntryInfoBufferSize, BOOL unicode) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; cache_container *pContainer; - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - for (; URLCacheContainers_Enum(pEntryHandle->lpszUrlSearchPattern, pEntryHandle->dwContainerIndex, &pContainer); - pEntryHandle->dwContainerIndex++, pEntryHandle->dwHashTableIndex = 0) + for (; URLCacheContainers_Enum(pEntryHandle->url_search_pattern, pEntryHandle->container_idx, &pContainer); + pEntryHandle->container_idx++, pEntryHandle->hash_table_idx = 0) { urlcache_header *pHeader; entry_hash_table *pHashTableEntry; @@ -3960,12 +3959,12 @@ static BOOL FindNextUrlCacheEntryInternal( if (!(pHeader = cache_container_lock_index(pContainer))) return FALSE; - for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->dwHashTableIndex, &pHashTableEntry); - pEntryHandle->dwHashTableIndex++, pEntryHandle->dwHashEntryIndex = 0) + for (; URLCache_EnumHashTables(pHeader, &pEntryHandle->hash_table_idx, &pHashTableEntry); + pEntryHandle->hash_table_idx++, pEntryHandle->hash_entry_idx = 0) { const struct hash_entry *pHashEntry = NULL; - for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->dwHashEntryIndex, &pHashEntry); - pEntryHandle->dwHashEntryIndex++) + for (; URLCache_EnumHashTableEntries(pHeader, pHashTableEntry, &pEntryHandle->hash_entry_idx, &pHashEntry); + pEntryHandle->hash_entry_idx++) { const entry_url *pUrlEntry; const entry_header *pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); @@ -3998,7 +3997,7 @@ static BOOL FindNextUrlCacheEntryInternal( /* increment the current index so that next time the function * is called the next entry is returned */ - pEntryHandle->dwHashEntryIndex++; + pEntryHandle->hash_entry_idx++; cache_container_unlock_index(pContainer, pHeader); return TRUE; } @@ -4046,18 +4045,18 @@ BOOL WINAPI FindNextUrlCacheEntryW( */ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle) { - URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; + find_handle *pEntryHandle = (find_handle*)hEnumHandle; TRACE("(%p)\n", hEnumHandle); - if (!pEntryHandle || pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (!pEntryHandle || pEntryHandle->magic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - pEntryHandle->dwMagic = 0; - heap_free(pEntryHandle->lpszUrlSearchPattern); + pEntryHandle->magic = 0; + heap_free(pEntryHandle->url_search_pattern); heap_free(pEntryHandle); return TRUE; }

1 0

Piotr Caban : wininet: Rename HASH_CACHEFILE_ENTRY to entry_hash_table.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: d7ab4d74fecfc10b7a07b20ebb43d1a4418e3ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ab4d74fecfc10b7a07b20eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:29 2013 +0100 wininet: Rename HASH_CACHEFILE_ENTRY to entry_hash_table. --- dlls/wininet/urlcache.c | 208 +++++++++++++++++++++++----------------------- 1 files changed, 104 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ab4d74fecfc10b7a07b…

1 0

Andrew Eikum : winmm: Shutdown the devices thread when all devices are closed.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 2d76befbddc798f02812fe48a12ab2b80d25181b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d76befbddc798f02812fe48a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 25 14:46:41 2013 -0500 winmm: Shutdown the devices thread when all devices are closed. --- dlls/winmm/waveform.c | 190 ++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d76befbddc798f02812f…

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_GetHlink().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: ba40bbfcbf41d1e7f96e96493334f7ba75a696c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40bbfcbf41d1e7f96e96493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:44:31 2013 +0400 hlink: Implement IHlinkBrowseContext_GetHlink(). --- dlls/hlink/browse_ctx.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/hlink/tests/browse_ctx.c | 7 +++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 0bfc061..48a20cb 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -234,20 +234,43 @@ static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, return E_NOTIMPL; } -static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, - ULONG uHLID, IHlink** ppihl) +static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, IHlink **ret) { - HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + struct list *entry; - TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl); + TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - if(uHLID != HLID_CURRENT) { - FIXME("Only HLID_CURRENT implemented, given: %x\n", uHLID); - return E_NOTIMPL; + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&This->links, &This->current->entry); + break; + case HLID_NEXT: + entry = list_next(&This->links, &This->current->entry); + break; + case HLID_CURRENT: + entry = &This->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&This->links); + break; + case HLID_STACKTOP: + entry = list_head(&This->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; } - *ppihl = This->current->link; - IHlink_AddRef(*ppihl); + if (!entry) + return E_FAIL; + + link = LIST_ENTRY(entry, struct link_entry, entry); + + *ret = link->link; + IHlink_AddRef(*ret); return S_OK; } diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index df801ab..40d132b 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -56,6 +56,13 @@ static void test_SetInitialHlink(void) hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + /* there's only one */ + hres = IHlinkBrowseContext_GetHlink(bc, HLID_PREVIOUS, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetHlink(bc, HLID_NEXT, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres);

1 0

Piotr Caban : wininet: Rename URLCACHE_HEADER to urlcache_header.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 39daf43ce388393f02fda2fb732a99b9de4e4dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=39daf43ce388393f02fda2fb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:52:40 2013 +0100 wininet: Rename URLCACHE_HEADER to urlcache_header. --- dlls/wininet/urlcache.c | 259 +++++++++++++++++++++++------------------------ 1 files changed, 128 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39daf43ce388393f02fda…

1 0

Piotr Caban : msvcp80: Fixed typo in spec file.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: cd8571af529fad961e1cfd6a22d2884b9f8caa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8571af529fad961e1cfd6a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 09:59:10 2013 +0100 msvcp80: Fixed typo in spec file. --- dlls/msvcp80/msvcp80.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 9d34087..e9a5b6a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3739,7 +3739,7 @@ @ cdecl -arch=win32 ?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) msvcp90.?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@0(a)Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V32@@Z(ptr ptr ptr) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) msvcp90.?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z

1 0

Nikolay Sivov : hlink: Add link stack to browser context.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: a083415dbca079152013a4341e5e3c11417b4a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a083415dbca079152013a4341… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 22:29:07 2013 +0400 hlink: Add link stack to browser context. --- dlls/hlink/browse_ctx.c | 59 ++++++++++++++++++++++++++++------------ dlls/hlink/tests/browse_ctx.c | 6 ++++ 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 0995493..0bfc061 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -21,15 +21,23 @@ #include "hlink_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); +struct link_entry +{ + struct list entry; + IHlink *link; +}; + typedef struct { IHlinkBrowseContext IHlinkBrowseContext_iface; LONG ref; HLBWINFO* BrowseWindowInfo; - IHlink* CurrentPage; + struct link_entry *current; + struct list links; } HlinkBCImpl; static inline HlinkBCImpl *impl_from_IHlinkBrowseContext(IHlinkBrowseContext *iface) @@ -68,18 +76,26 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); - if (refCount) - return refCount; + TRACE("(%p)->(count=%u)\n", This, ref + 1); - TRACE("-- destroying IHlinkBrowseContext (%p)\n", This); - heap_free(This->BrowseWindowInfo); - if (This->CurrentPage) - IHlink_Release(This->CurrentPage); - heap_free(This); - return 0; + if (!ref) + { + struct link_entry *link, *link2; + + LIST_FOR_EACH_ENTRY_SAFE(link, link2, &This->links, struct link_entry, entry) + { + list_remove(&link->entry); + IHlink_Release(link->link); + heap_free(link); + } + + heap_free(This->BrowseWindowInfo); + heap_free(This); + } + + return ref; } static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, @@ -165,17 +181,22 @@ static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { - HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(%p %s %s)\n", This, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); - FIXME("(%p)->(%p %s %s)\n", This, pimkTarget, - debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); + if (!list_empty(&This->links)) + return CO_E_ALREADYINITIALIZED; - if (This->CurrentPage) - IHlink_Release(This->CurrentPage); + link = heap_alloc(sizeof(struct link_entry)); + if (!link) return E_OUTOFMEMORY; HlinkCreateFromMoniker(pimkTarget, pwzLocation, pwzFriendlyName, NULL, - 0, NULL, &IID_IHlink, (LPVOID*) &This->CurrentPage); + 0, NULL, &IID_IHlink, (void**)&link->link); + list_add_head(&This->links, &link->entry); + This->current = LIST_ENTRY(list_head(&This->links), struct link_entry, entry); return S_OK; } @@ -225,7 +246,7 @@ static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, return E_NOTIMPL; } - *ppihl = This->CurrentPage; + *ppihl = This->current->link; IHlink_AddRef(*ppihl); return S_OK; @@ -289,6 +310,8 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** hl->ref = 1; hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; + list_init(&hl->links); + hl->current = NULL; *ppv = hl; return S_OK; diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index e9293d1..df801ab 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -50,6 +50,12 @@ static void test_SetInitialHlink(void) hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); + ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres);

1 0

Nikolay Sivov : xmllite: Partially implement value normalization for CDATA sections.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 2bdaffd879439a04827a8ffae6496d76fefcbfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdaffd879439a04827a8ffae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 24 00:04:12 2013 +0400 xmllite: Partially implement value normalization for CDATA sections. --- dlls/xmllite/reader.c | 6 ++++++ dlls/xmllite/tests/reader.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e8f97f0..3d0b4a8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1835,6 +1835,12 @@ static HRESULT reader_parse_cdata(xmlreader *reader) } else { + /* Value normalization is not fully implemented, rules are: + + - single '\r' -> '\n'; + - sequence '\r\n' -> '\n', in this case value length changes; + */ + if (*ptr == '\r') *ptr = '\n'; reader_skipn(reader, 1); ptr++; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 520ce71..fad3d41 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -771,6 +771,7 @@ struct test_entry { const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ + int todo : 1; }; static struct test_entry comment_tests[] = { @@ -1317,6 +1318,9 @@ static void test_readvaluechunk(void) static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1383,9 +1387,20 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } free_str(str_exp); }

1 0

Daniel Jelinski : wined3d: Add NVidia GeForce 315M.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: d8a86da66eae4245b529ac042d76179fdf221b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a86da66eae4245b529ac042… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 17 16:57:49 2013 +0100 wined3d: Add NVidia GeForce 315M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4093f7a..60a4b2d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1097,6 +1097,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1559,6 +1560,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ {"320M", CARD_NVIDIA_GEFORCE_320M}, /* Geforce 300 - midend mobile */ + {"315M", CARD_NVIDIA_GEFORCE_315M}, /* Geforce 300 - midend mobile */ {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b81e018..e9a593d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1392,6 +1392,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_315M = 0x0a7a, CARD_NVIDIA_GEFORCE_320M = 0x08a3, CARD_NVIDIA_GEFORCE_GT320M = 0x0a2d, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35,

1 0

Nikolay Sivov : hlink: Remove useless initializers.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 3e3027761c3de5654ea015dbc9bbaf90ac3f6cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3027761c3de5654ea015dbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 21:53:14 2013 +0400 hlink: Remove useless initializers. --- dlls/hlink/browse_ctx.c | 2 +- dlls/hlink/extserv.c | 2 +- dlls/hlink/hlink_main.c | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 4e91398..0995493 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -116,7 +116,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, DWORD dwRegister) { - HRESULT r = S_OK; + HRESULT r; IRunningObjectTable *ROT; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 670bac2..3a97fa9 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -235,7 +235,7 @@ static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) { - int len = 0; + int len; heap_free(This->headers); This->headers = NULL; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1890fd5..5adbe9d 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -75,7 +75,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, @@ -107,7 +107,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r = S_OK; + HRESULT r; WCHAR *hash, *tgt; const WCHAR *loc; @@ -176,15 +176,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) { - HRESULT r = S_OK; - TRACE("%p %s %p\n", piunkOuter, debugstr_guid(riid), ppvObj); - - r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); - - TRACE("returning %i\n",r); - - return r; + return CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); } /*********************************************************************** @@ -213,7 +206,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) { - HRESULT r = S_OK; + HRESULT r; TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);

1 0

Nikolay Sivov : hlink: Implement HlinkUpdateStackItem().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: c5a73badaddd5a09acaf3b71e695221de8f38d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a73badaddd5a09acaf3b71e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 23 11:03:35 2013 +0400 hlink: Implement HlinkUpdateStackItem(). --- dlls/hlink/hlink_main.c | 19 +++++++-- dlls/hlink/tests/hlink.c | 96 ++++++++++++++++++++++++++++++++++++++++++++- include/hlink.idl | 1 + 3 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3bf9d27..1890fd5 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -366,12 +366,21 @@ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTra /*********************************************************************** * HlinkUpdateStackItem (HLINK.@) */ -HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, - ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), - debugstr_w(pwzFriendlyName)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p %p 0x%x %p %s %s)\n", frame, bc, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!frame && !bc) return E_INVALIDARG; + + if (frame) + hr = IHlinkFrame_UpdateHlink(frame, hlid, target, location, friendly_name); + else + hr = IHlinkBrowseContext_UpdateHlink(bc, hlid, target, location, friendly_name); + + return hr; } /*********************************************************************** diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 544cc4a..91f7c4a 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -68,12 +68,15 @@ DEFINE_EXPECT(Save); DEFINE_EXPECT(HBC_QueryInterface_IHlinkHistory); DEFINE_EXPECT(HBC_GetObject); +DEFINE_EXPECT(HBC_UpdateHlink); DEFINE_EXPECT(HT_SetBrowseContext); DEFINE_EXPECT(HT_GetBrowseContext); DEFINE_EXPECT(HT_Navigate); DEFINE_EXPECT(HT_GetFriendlyName); +DEFINE_EXPECT(HLF_UpdateHlink); + DEFINE_GUID(IID_IHlinkHistory,0x79eac9c8,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); static const char *debugstr_guid(REFIID riid) @@ -885,10 +888,10 @@ static HRESULT WINAPI HlinkBrowseContext_OnNavigateHlink(IHlinkBrowseContext *if } static HRESULT WINAPI HlinkBrowseContext_UpdateHlink(IHlinkBrowseContext *iface, ULONG uHLID, - IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) + IMoniker *pimkTarget, LPCWSTR location, LPCWSTR friendly_name) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(HBC_UpdateHlink); + return S_OK; } static HRESULT WINAPI HlinkBrowseContext_EnumNavigationStack(IHlinkBrowseContext *iface, @@ -2194,6 +2197,92 @@ static void test_Hlink_Navigate(void) _bctx = NULL; } +static HRESULT WINAPI hlinkframe_QueryInterface(IHlinkFrame *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkFrame)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hlinkframe_AddRef(IHlinkFrame *iface) +{ + return 2; +} + +static ULONG WINAPI hlinkframe_Release(IHlinkFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI hlinkframe_SetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext *bc) +{ + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_GetBrowseContext(IHlinkFrame *iface, IHlinkBrowseContext **bc) +{ + *bc = NULL; + ok(0, "unexpected %p\n", bc); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *bsc, IHlink *navigate) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name, + DWORD reserved) +{ + ok(0, "unexpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI hlinkframe_UpdateHlink(IHlinkFrame *iface, ULONG uHLID, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) +{ + CHECK_EXPECT(HLF_UpdateHlink); + return S_OK; +} + +static IHlinkFrameVtbl hlinkframevtbl = { + hlinkframe_QueryInterface, + hlinkframe_AddRef, + hlinkframe_Release, + hlinkframe_SetBrowseContext, + hlinkframe_GetBrowseContext, + hlinkframe_Navigate, + hlinkframe_OnNavigate, + hlinkframe_UpdateHlink +}; + +static IHlinkFrame testframe = { &hlinkframevtbl }; + +static void test_HlinkUpdateStackItem(void) +{ + static const WCHAR location[] = {'l','o','c','a','t','i','o','n',0}; + HRESULT hr; + + hr = HlinkUpdateStackItem(NULL, NULL, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + SET_EXPECT(HBC_UpdateHlink); + hr = HlinkUpdateStackItem(NULL, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HBC_UpdateHlink); + + SET_EXPECT(HLF_UpdateHlink); + hr = HlinkUpdateStackItem(&testframe, &HlinkBrowseContext, HLID_CURRENT, &Moniker, location, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(HLF_UpdateHlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2213,6 +2302,7 @@ START_TEST(hlink) test_HlinkClone(); test_StdHlink(); test_Hlink_Navigate(); + test_HlinkUpdateStackItem(); CoUninitialize(); } diff --git a/include/hlink.idl b/include/hlink.idl index af3f8f5..e735987 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -37,6 +37,7 @@ cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") +cpp_quote("HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame*, IHlinkBrowseContext*, ULONG, IMoniker*, LPCWSTR, LPCWSTR);") typedef enum _HLSR_NOREDEF10 { HLSR_HOME,

1 0

Ken Thomases : winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: e633f79f610516e78f7958b2946cb96bac327fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e633f79f610516e78f7958b29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:41:07 2013 -0500 winemac: Implement GetDeviceGammaRamp() and SetDeviceGammaRamp(). --- dlls/winemac.drv/display.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/gdi.c | 4 +- dlls/winemac.drv/macdrv.h | 2 + 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f152cc8..85c903d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -24,6 +24,7 @@ #include "macdrv.h" #include "winuser.h" #include "winreg.h" +#include "ddrawi.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -599,6 +600,91 @@ failed: /*********************************************************************** + * GetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + BOOL ret = FALSE; + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + uint32_t mac_entries; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + CGError err; + int win_entry; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + mac_entries = CGDisplayGammaTableCapacity(displays[0].displayID); + red = HeapAlloc(GetProcessHeap(), 0, mac_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + mac_entries; + blue = green + mac_entries; + + err = CGGetDisplayTransferByTable(displays[0].displayID, mac_entries, red, green, + blue, &mac_entries); + if (err != kCGErrorSuccess) + { + WARN("failed to get Mac gamma table: %d\n", err); + goto done; + } + + if (mac_entries == win_entries) + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + r->red[win_entry] = red[win_entry] * 65535 + 0.5; + r->green[win_entry] = green[win_entry] * 65535 + 0.5; + r->blue[win_entry] = blue[win_entry] * 65535 + 0.5; + } + } + else + { + for (win_entry = 0; win_entry < win_entries; win_entry++) + { + double mac_pos = win_entry * (mac_entries - 1) / (double)(win_entries - 1); + int mac_entry = mac_pos; + double red_value, green_value, blue_value; + + if (mac_entry == mac_entries - 1) + { + red_value = red[mac_entry]; + green_value = green[mac_entry]; + blue_value = blue[mac_entry]; + } + else + { + double distance = mac_pos - mac_entry; + + red_value = red[mac_entry] * (1 - distance) + red[mac_entry + 1] * distance; + green_value = green[mac_entry] * (1 - distance) + green[mac_entry + 1] * distance; + blue_value = blue[mac_entry] * (1 - distance) + blue[mac_entry + 1] * distance; + } + + r->red[win_entry] = red_value * 65535 + 0.5; + r->green[win_entry] = green_value * 65535 + 0.5; + r->blue[win_entry] = blue_value * 65535 + 0.5; + } + } + + ret = TRUE; + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return ret; +} + + +/*********************************************************************** * GetMonitorInfo (MACDRV.@) */ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) @@ -650,6 +736,51 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) /*********************************************************************** + * SetDeviceGammaRamp (MACDRV.@) + */ +BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +{ + DDGAMMARAMP *r = ramp; + struct macdrv_display *displays; + int num_displays; + int win_entries = sizeof(r->red) / sizeof(r->red[0]); + CGGammaValue *red, *green, *blue; + int i; + CGError err = kCGErrorFailure; + + TRACE("dev %p ramp %p\n", dev, ramp); + + if (macdrv_get_displays(&displays, &num_displays)) + { + WARN("failed to get Mac displays\n"); + return FALSE; + } + + red = HeapAlloc(GetProcessHeap(), 0, win_entries * sizeof(red[0]) * 3); + if (!red) + goto done; + green = red + win_entries; + blue = green + win_entries; + + for (i = 0; i < win_entries; i++) + { + red[i] = r->red[i] / 65535.0; + green[i] = r->green[i] / 65535.0; + blue[i] = r->blue[i] / 65535.0; + } + + err = CGSetDisplayTransferByTable(displays[0].displayID, win_entries, red, green, blue); + if (err != kCGErrorSuccess) + WARN("failed to set display gamma table: %d\n", err); + +done: + HeapFree(GetProcessHeap(), 0, red); + macdrv_free_displays(displays); + return (err == kCGErrorSuccess); +} + + +/*********************************************************************** * macdrv_displays_changed * * Handler for DISPLAYS_CHANGED events. diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 2a9a019..e05f9ab 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -461,7 +461,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ macdrv_GetDeviceCaps, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ + macdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetGlyphIndices */ @@ -522,7 +522,7 @@ static const struct gdi_dc_funcs macdrv_funcs = NULL, /* pSetDCPenColor */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d4cbe1d..aeeee2d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -71,6 +71,8 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; +extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; +extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; /**************************************************************************

1 0

Carlo Bramini : inetcpl.cpl: Minor fix, remove useless code.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: fd7f0517c79af5c60e52182cf12a6390264ad009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7f0517c79af5c60e52182cf… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Mar 16 19:53:40 2013 +0100 inetcpl.cpl: Minor fix, remove useless code. --- dlls/inetcpl.cpl/security.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 8f46b79..48c4876 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -134,8 +134,7 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - len = lstrlenW(name); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); TRACE("new title: %s\n", debugstr_w(name));

1 0

Nikolay Sivov : msxml3: Embed user/password in uri used to create a moniker .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 448e939ebe3faeec2f837b1c44a14c58e8ba93c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448e939ebe3faeec2f837b1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 18 12:44:44 2013 +0400 msxml3: Embed user/password in uri used to create a moniker. --- dlls/msxml3/httprequest.c | 61 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c67177b..681ccab 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -619,8 +619,27 @@ static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, HWND *hwnd, LPWSTR *username, LPWSTR *password) { BindStatusCallback *This = impl_from_IAuthenticate(iface); - FIXME("(%p)->(%p %p %p)\n", This, hwnd, username, password); - return E_NOTIMPL; + httprequest *request = This->request; + + TRACE("(%p)->(%p %p %p)\n", This, hwnd, username, password); + + if (request->user && *request->user) + { + if (hwnd) *hwnd = NULL; + *username = CoTaskMemAlloc(SysStringByteLen(request->user)+sizeof(WCHAR)); + *password = CoTaskMemAlloc(SysStringByteLen(request->password)+sizeof(WCHAR)); + if (!*username || !*password) + { + CoTaskMemFree(*username); + CoTaskMemFree(*password); + return E_OUTOFMEMORY; + } + + memcpy(*username, request->user, SysStringByteLen(request->user)+sizeof(WCHAR)); + memcpy(*password, request->password, SysStringByteLen(request->password)+sizeof(WCHAR)); + } + + return S_OK; } static const IAuthenticateVtbl AuthenticateVtbl = { @@ -882,12 +901,6 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, return hr; } - This->uri = uri; - - VariantInit(&is_async); - hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&is_async); - VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR); if (hr == S_OK) @@ -898,6 +911,38 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, if (hr == S_OK) This->password = V_BSTR(&str); + /* add authentication info */ + if (This->user && *This->user) + { + IUriBuilder *builder; + + hr = CreateIUriBuilder(uri, 0, 0, &builder); + if (hr == S_OK) + { + IUri *full_uri; + + IUriBuilder_SetUserName(builder, This->user); + IUriBuilder_SetPassword(builder, This->password); + hr = IUriBuilder_CreateUri(builder, -1, 0, 0, &full_uri); + if (hr == S_OK) + { + IUri_Release(uri); + uri = full_uri; + } + else + WARN("failed to create modified uri, 0x%08x\n", hr); + IUriBuilder_Release(builder); + } + else + WARN("IUriBuilder creation failed, 0x%08x\n", hr); + } + + This->uri = uri; + + VariantInit(&is_async); + hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&is_async); + httprequest_setreadystate(This, READYSTATE_LOADING); return S_OK;

1 0

Francois Gouget : testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: b779cb2c5f1d15a485afbe8df970e84ed132f94e URL: http://source.winehq.org/git/tools.git/?a=commit;h=b779cb2c5f1d15a485afbe8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:50:19 2013 +0100 testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already. This avoids confusion in case a server was started manually for testing. --- testbot/scripts/initd | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index fe670ed..7e25f7d 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -106,9 +106,14 @@ then fi log_failure_msg "The WineTestBot server is running but not responding" exit 1 - elif [ "$status" = 4 ]; then - log_failure_msg "could not access PID file for the WineTestBot server" + elif [ "$status" = 4 ] + then + log_failure_msg "Could not access PID file for the WineTestBot server" exit $status + elif $PING -q + then + log_success_msg "A WineTestBot server was started manually already" + exit 0 else log_failure_msg "The WineTestBot server is not running" exit $status

1 0

Francois Gouget : testbot: Keep track of the revert processes and handle server restarts more gracefully .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 2ecbb72c59e04b0b079267db948b83581db2b1d0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ecbb72c59e04b0b079267db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:48 2013 +0100 testbot: Keep track of the revert processes and handle server restarts more gracefully. On startup the WineTestBot server now: * Detects tasks that are still running and lets them complete. * Cleans up and requeues the running tasks that died. * Lets VMs that are currently reverting complete their revert. * Leaves the idle powered on VMs and those used by running tasks as it. * Shuts down any other active VM and marks them as dirty. This makes it possible to kill and restart a WineTestBot server without impacting the running tasks. Also, should the server reboot unexpectedly, the tasks that were running will be restarted. --- testbot/bin/Engine.pl | 149 +++++++++++++++++++++++++++++++----- testbot/bin/RevertVM.pl | 2 + testbot/ddl/update21.sql | 5 + testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 20 +++++ testbot/lib/WineTestBot/Jobs.pm | 25 ++++-- testbot/lib/WineTestBot/Steps.pm | 23 ++++-- testbot/lib/WineTestBot/Tasks.pm | 2 + testbot/lib/WineTestBot/VMs.pm | 19 +++++ testbot/web/admin/VMDetails.pl | 9 ++ 10 files changed, 221 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2ecbb72c59e04b0b0792…

1 0

Francois Gouget : testbot: Tweak ScheduleJobs() to filter out disabled VMs as we won't be running jobs on them.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: tools Branch: master Commit: 14e9dd49121ac3d6cba423c1b2bd8c41a4ce3668 URL: http://source.winehq.org/git/tools.git/?a=commit;h=14e9dd49121ac3d6cba423c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 26 11:47:35 2013 +0100 testbot: Tweak ScheduleJobs() to filter out disabled VMs as we won't be running jobs on them. --- testbot/lib/WineTestBot/Jobs.pm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c73dea1..61ef113 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -531,7 +531,10 @@ sub ScheduleJobs() # we should check if there are VMs to revert my %Hosts; - foreach my $VM (@{CreateVMs()->GetItems()}) + my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); + $VMs->FilterEnabledStatus(); + foreach my $VM (@{$VMs->GetItems()}) { my $Host = $VM->GetHost(); $Hosts{$Host}->{$VM->VirtURI} = 1;

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 26, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

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

March 25, 2013

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

1 0

Qian Hong : atl100/tests: Added class name test for AtlAxWinInit.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c02bf8817e04cee335003527668ed954d24e1def URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02bf8817e04cee3350035276… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:11:55 2013 +0800 atl100/tests: Added class name test for AtlAxWinInit. --- dlls/atl100/tests/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/Makefile.in b/dlls/atl100/tests/Makefile.in index 0b8353e..7ca6123 100644 --- a/dlls/atl100/tests/Makefile.in +++ b/dlls/atl100/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = atl100.dll -IMPORTS = uuid atl100 oleaut32 ole32 advapi32 +IMPORTS = uuid atl100 oleaut32 ole32 advapi32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_100 C_SRCS = \ diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7c3703..40d8583 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -22,6 +22,10 @@ #define COBJMACROS #define CONST_VTABLE +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + #include <atlbase.h> #include <mshtml.h> @@ -562,6 +566,30 @@ static void test_source_iface(void) ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); } +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; + static const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); + todo_wine ok(ret, "AtlAxWin100 has not registered\n"); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); + todo_wine ok(ret, "AtlAxWinLic100 has not registered\n"); +} + START_TEST(atl) { CoInitialize(NULL); @@ -571,6 +599,7 @@ START_TEST(atl) test_typelib(); test_cp(); test_source_iface(); + test_ax_win(); CoUninitialize(); }

1 0

Huw Davies : riched20: Always write out the color table.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a20d42de1565caf43b5693c6d455c9373a34029b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d42de1565caf43b5693c6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:56 2013 +0000 riched20: Always write out the color table. --- dlls/riched20/writer.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index cd2362e..440cb1b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -297,20 +297,15 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; - /* Output colors table if not empty */ - if (pStream->nColorTblLen > 1) { - if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) - return FALSE; - for (i = 1; i < pStream->nColorTblLen; i++) { - if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", - pStream->colortbl[i] & 0xFF, - (pStream->colortbl[i] >> 8) & 0xFF, - (pStream->colortbl[i] >> 16) & 0xFF)) - return FALSE; - } - if (!ME_StreamOutPrint(pStream, "}")) + /* Output the color table */ + if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ + for (i = 1; i < pStream->nColorTblLen; i++) + { + if (!ME_StreamOutPrint(pStream, "\\red%u\\green%u\\blue%u;", pStream->colortbl[i] & 0xFF, + (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } + if (!ME_StreamOutPrint(pStream, "}")) return FALSE; return TRUE; }

1 0

Huw Davies : riched20: Set the bidi base embedding level.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c409fc13fda7da2b60cd5ab04ad64bf21a0b5806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c409fc13fda7da2b60cd5ab04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 25 11:05:55 2013 +0000 riched20: Set the bidi base embedding level. --- dlls/riched20/editor.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a19ceec..f490799 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -840,6 +840,14 @@ void ME_RTFParAttrHook(RTF_Info *info) } break; } + case rtfRTLPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = PFE_RTLPARA; + break; + case rtfLTRPar: + fmt.dwMask = PFM_RTLPARA; + fmt.wEffects = 0; + break; } if (fmt.dwMask) { RTFFlushOutputBuffer(info);

1 0

Dmitry Timoshkov : ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c09c82b25a3c95e79f23f22571fe9a63b38b824c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09c82b25a3c95e79f23f2257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 22 14:59:50 2013 +0900 ws2_32: Make _is_blocking() return server error code, so that callers can act appropriately. --- dlls/ws2_32/socket.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f9e8a6c..a6a1b4c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -803,19 +803,19 @@ static void _enable_event( HANDLE s, unsigned int event, SERVER_END_REQ; } -static int _is_blocking(SOCKET s) +static NTSTATUS _is_blocking(SOCKET s, BOOL *ret) { - int ret; + NTSTATUS status; SERVER_START_REQ( get_socket_event ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->service = FALSE; req->c_event = 0; - wine_server_call( req ); - ret = (reply->state & FD_WINE_NONBLOCKING) == 0; + status = wine_server_call( req ); + *ret = (reply->state & FD_WINE_NONBLOCKING) == 0; } SERVER_END_REQ; - return ret; + return status; } static unsigned int _get_sock_mask(SOCKET s) @@ -835,9 +835,10 @@ static unsigned int _get_sock_mask(SOCKET s) static void _sync_sock_state(SOCKET s) { + BOOL dummy; /* do a dummy wineserver request in order to let the wineserver run through its select loop once */ - (void)_is_blocking(s); + (void)_is_blocking(s, &dummy); } static int _get_sock_error(SOCKET s, unsigned int bit) @@ -1950,7 +1951,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, BOOL is_blocking; TRACE("socket %04lx\n", s ); - is_blocking = _is_blocking(s); + status = _is_blocking(s, &is_blocking); + if (status) + { + set_error(status); + return INVALID_SOCKET; + } do { /* try accepting first (if there is a deferred connection) */ @@ -2341,6 +2347,8 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { + NTSTATUS status; + BOOL is_blocking; int ret = do_connect(fd, name, namelen); if (ret == 0) goto connect_success; @@ -2351,7 +2359,14 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); - if (_is_blocking(s)) + status = _is_blocking( s, &is_blocking ); + if (status) + { + release_sock_fd( s, fd ); + set_error( status ); + return SOCKET_ERROR; + } + if (is_blocking) { int result; /* block here */ @@ -3965,6 +3980,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; DWORD bytes_sent; + BOOL is_blocking; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -4063,7 +4079,13 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return 0; } - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ @@ -5858,6 +5880,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct ws2_async *wsa; + BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -5961,7 +5984,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (n != -1) break; - if ( _is_blocking(s) ) + if ((err = _is_blocking( s, &is_blocking ))) + { + err = NtStatusToWSAError( err ); + goto error; + } + + if ( is_blocking ) { struct pollfd pfd; int timeout = GET_RCVTIMEO(fd);

1 0

Lucas Zawacki : dinput: Initialize all axis (from 0 to ABS_MAX) with -1.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 45a19b0c9b32b9a02be11b597a7db5341b310474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a19b0c9b32b9a02be11b597… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Mar 20 19:35:08 2013 -0300 dinput: Initialize all axis (from 0 to ABS_MAX) with -1. --- dlls/dinput/joystick_linuxinput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0a044a5..5ed9bde 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -445,9 +445,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); /* Count number of available axes - supported Axis & POVs */ - for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++) + for (i = 0; i < ABS_MAX; i++) { - if (test_bit(newDevice->joydev->absbits, i)) + if (i < WINE_JOYSTICK_MAX_AXES && + test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx;

1 0

Piotr Caban : msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6eeb000c90f640489964fdb764fe27271e0f67d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eeb000c90f640489964fdb76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 20 10:40:45 2013 +0100 msvcrt: Fixed fgetwc behavior on multibyte characters and Unicode files. --- dlls/msvcrt/file.c | 80 ++++++++++++++++++++++---------------------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6e8b324..28dd132 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3205,60 +3205,50 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) /********************************************************************* * fgetwc (MSVCRT.@) - * - * In MSVCRT__O_TEXT mode, multibyte characters are read from the file, dropping - * the CR from CR/LF combinations */ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { - int c; + MSVCRT_wint_t ret; + int ch; - MSVCRT__lock_file(file); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) - { - MSVCRT_wchar_t wc; - unsigned int i; - int j; - char *chp, *wcp; - wcp = (char *)&wc; - for(i=0; i<sizeof(wc); i++) - { - if (file->_cnt>0) - { - file->_cnt--; - chp = file->_ptr++; - wcp[i] = *chp; - } - else - { - j = MSVCRT__filbuf(file); - if(file->_cnt<=0) - { - file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - file->_cnt = 0; + MSVCRT__lock_file(file); - MSVCRT__unlock_file(file); - return MSVCRT_WEOF; - } - wcp[i] = j; + if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) + || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + char *p; + + for(p=(char*)&ret; (MSVCRT_wint_t*)p<&ret+1; p++) { + ch = MSVCRT_fgetc(file); + if(ch == MSVCRT_EOF) { + ret = MSVCRT_WEOF; + break; + } + *p = (char)ch; + } + }else { + char mbs[MSVCRT_MB_LEN_MAX]; + int len = 0; + + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[0] = (char)ch; + if(MSVCRT_isleadbyte((unsigned char)mbs[0])) { + ch = MSVCRT_fgetc(file); + if(ch != MSVCRT_EOF) { + mbs[1] = (char)ch; + len = 2; + } + }else { + len = 1; + } } - } - MSVCRT__unlock_file(file); - return wc; - } - - c = MSVCRT_fgetc(file); - if ((get_locinfo()->mb_cur_max > 1) && MSVCRT_isleadbyte(c)) - { - FIXME("Treat Multibyte characters\n"); + if(!len || MSVCRT_mbtowc(&ret, mbs, len)==-1) + ret = MSVCRT_WEOF; } - MSVCRT__unlock_file(file); - if (c == MSVCRT_EOF) - return MSVCRT_WEOF; - else - return (MSVCRT_wint_t)c; + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e2ff7a0..3bbbe93 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -945,6 +945,7 @@ int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); +int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *);

1 0

Qian Hong : atl: Don't forward AtlAxWinInit to atl100.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6b616f3ea8386d301eaa03caf103879c3a186e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b616f3ea8386d301eaa03caf… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:16:20 2013 +0800 atl: Don't forward AtlAxWinInit to atl100. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl/tests/atl_ax.c | 21 ++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 1a167a7..5b31804 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -33,7 +33,7 @@ 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2a96369..cc3cce1 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -584,3 +584,51 @@ DWORD WINAPI AtlGetVersion(void *pReserved) { return _ATL_VER; } + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 4555bd6..ea9ce32 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -35,6 +35,7 @@ #include <olectl.h> #include <ocidl.h> #include <exdisp.h> +#include <atlbase.h> static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); @@ -114,6 +115,24 @@ static void test_AtlAxAttachControl(void) DestroyWindow(hwnd); } +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin, &wcex); + ok(ret, "AtlAxWin has not registered\n"); + ok(wcex.style == CS_GLOBALCLASS, "wcex.style %08x\n", wcex.style); +} + START_TEST(atl_ax) { init_function_pointers(); @@ -128,5 +147,7 @@ START_TEST(atl_ax) else win_skip("AtlAxAttachControl is not available\n"); + test_ax_win(); + CoUninitialize(); }

1 0

Qian Hong : atl80: Don't forward AtlAxWinInit to atl100.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: cd321cbea80d37521a1c0b23042bda0784025a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd321cbea80d37521a1c0b230… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:15:46 2013 +0800 atl80: Don't forward AtlAxWinInit to atl100. --- configure | 1 + configure.ac | 1 + dlls/atl80/Makefile.in | 2 +- dlls/atl80/atl80.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/atl80/atl80.spec | 2 +- dlls/atl80/tests/Makefile.in | 8 +++++ dlls/atl80/tests/atl.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 139 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5d292dd..5a45d6d 100755 --- a/configure +++ b/configure @@ -15682,6 +15682,7 @@ wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 implib wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 implib,po diff --git a/configure.ac b/configure.ac index 895596a..34341c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2565,6 +2565,7 @@ WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[implib]) WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[implib,po]) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 71cb651..5cf626e 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 +IMPORTS = atl100 oleaut32 user32 ole32 EXTRADEFS = -D_ATL_VER=_ATL_VER_80 diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 2cee94c..b5d571b 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -16,8 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdio.h> + #define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" #include "atlbase.h" #include "wine/debug.h" @@ -90,3 +97,56 @@ DWORD WINAPI AtlGetVersion(void *pReserved) { return _ATL_VER; } + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic80; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index dbd38aa..f8d409c 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -27,7 +27,7 @@ 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW diff --git a/dlls/atl80/tests/Makefile.in b/dlls/atl80/tests/Makefile.in new file mode 100644 index 0000000..c4d9222 --- /dev/null +++ b/dlls/atl80/tests/Makefile.in @@ -0,0 +1,8 @@ +TESTDLL = atl80.dll +IMPORTS = uuid atl80 oleaut32 ole32 advapi32 user32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_80 + +C_SRCS = \ + atl.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/atl80/tests/atl.c b/dlls/atl80/tests/atl.c new file mode 100644 index 0000000..b88177d --- /dev/null +++ b/dlls/atl80/tests/atl.c @@ -0,0 +1,67 @@ +/* + * Copyright 2013 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +#include <atlbase.h> +#include <mshtml.h> + +#include <wine/test.h> + +static void test_ax_win(void) +{ + BOOL ret; + WNDCLASSEXW wcex; + static const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; + static const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; + static HMODULE hinstance = 0; + + ret = AtlAxWinInit(); + ok(ret, "AtlAxWinInit failed\n"); + + hinstance = GetModuleHandleA(NULL); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWin80, &wcex); + ok(ret, "AtlAxWin80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); + + memset(&wcex, 0, sizeof(wcex)); + wcex.cbSize = sizeof(wcex); + ret = GetClassInfoExW(hinstance, AtlAxWinLic80, &wcex); + ok(ret, "AtlAxWinLic80 has not registered\n"); + ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); +} + +START_TEST(atl) +{ + CoInitialize(NULL); + + test_ax_win(); + + CoUninitialize(); +}

1 0

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

March 25, 2013

Module: wine Branch: master Commit: ef601fcb7ee71f35c310cb767bd90ae25ea372a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef601fcb7ee71f35c310cb767… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 15 22:13:06 2013 +0800 atl100: Fixed register class names in AtlAxWinInit. --- dlls/atl100/atl_ax.c | 9 +++++++-- dlls/atl100/tests/atl.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 4874d39..cdefbea 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,7 +86,8 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; + const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; FIXME("semi-stub\n"); @@ -105,7 +106,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin; + wcex.lpszClassName = AtlAxWin100; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic100; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 40d8583..76fa9c4 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -582,12 +582,12 @@ static void test_ax_win(void) memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWin100, &wcex); - todo_wine ok(ret, "AtlAxWin100 has not registered\n"); + ok(ret, "AtlAxWin100 has not registered\n"); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); ret = GetClassInfoExW(hinstance, AtlAxWinLic100, &wcex); - todo_wine ok(ret, "AtlAxWinLic100 has not registered\n"); + ok(ret, "AtlAxWinLic100 has not registered\n"); } START_TEST(atl)

1 0

Jimmy Rentz : advapi32: Fix segfault in OpenService.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c61df085432c5abe855c8df6043e46af1bf678ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61df085432c5abe855c8df60… Author: Jimmy Rentz <rentzjam(a)gmail.com> Date: Fri Mar 15 22:18:44 2013 -0400 advapi32: Fix segfault in OpenService. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4c694b1..b591449 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -950,7 +950,7 @@ DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __ENDTRY if (err != ERROR_SUCCESS) - handle = 0; + *handle = 0; TRACE("returning %p\n", *handle); return err;

1 0

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

March 25, 2013

Module: wine Branch: master Commit: 79632a2212cdcb5b0bb62b18547d57adeb069eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=79632a2212cdcb5b0bb62b185… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 25 12:34:49 2013 +0100 vbscript: Added IMatch interface to Match2 object. --- dlls/vbscript/tests/vbscript.c | 4 ++ dlls/vbscript/vbregexp.c | 87 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index f37c7cb..9e86a5f 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -875,6 +875,10 @@ static void test_RegExp(void) ok(hres == S_OK, "QueryInterface(IID_IMatch2) returned %x\n", hres); IDispatch_Release(disp); + hres = IMatch2_QueryInterface(match, &IID_IMatch, (void**)&unk); + ok(hres == S_OK, "QueryInterface(IID_IMatch) returned %x\n", hres); + IUnknown_Release(unk); + hres = IMatch2_get_Value(match, NULL); ok(hres == E_POINTER, "get_Value returned %x, expected E_POINTER\n", hres); diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index b464232..ada364f 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -91,6 +91,7 @@ struct SubMatches { typedef struct Match2 { IMatch2 IMatch2_iface; + IMatch IMatch_iface; LONG ref; @@ -354,6 +355,9 @@ static HRESULT WINAPI Match2_QueryInterface( }else if(IsEqualGUID(riid, &IID_IMatch2)) { TRACE("(%p)->(IID_IMatch2 %p)\n", This, ppv); *ppv = &This->IMatch2_iface; + }else if(IsEqualGUID(riid, &IID_IMatch)) { + TRACE("(%p)->(IID_IMatch %p)\n", This, ppv); + *ppv = &This->IMatch_iface; }else if(IsEqualGUID(riid, &IID_IDispatchEx)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = NULL; @@ -510,6 +514,88 @@ static const IMatch2Vtbl Match2Vtbl = { Match2_get_SubMatches }; +static inline Match2 *impl_from_IMatch(IMatch *iface) +{ + return CONTAINING_RECORD(iface, Match2, IMatch_iface); +} + +static HRESULT WINAPI Match_QueryInterface(IMatch *iface, REFIID riid, void **ppv) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_QueryInterface(&This->IMatch2_iface, riid, ppv); +} + +static ULONG WINAPI Match_AddRef(IMatch *iface) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_AddRef(&This->IMatch2_iface); +} + +static ULONG WINAPI Match_Release(IMatch *iface) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_Release(&This->IMatch2_iface); +} + +static HRESULT WINAPI Match_GetTypeInfoCount(IMatch *iface, UINT *pctinfo) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetTypeInfoCount(&This->IMatch2_iface, pctinfo); +} + +static HRESULT WINAPI Match_GetTypeInfo(IMatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetTypeInfo(&This->IMatch2_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI Match_GetIDsOfNames(IMatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_GetIDsOfNames(&This->IMatch2_iface, riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI Match_Invoke(IMatch *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_Invoke(&This->IMatch2_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Match_get_Value(IMatch *iface, BSTR *pValue) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_Value(&This->IMatch2_iface, pValue); +} + +static HRESULT WINAPI Match_get_FirstIndex(IMatch *iface, LONG *pFirstIndex) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_FirstIndex(&This->IMatch2_iface, pFirstIndex); +} + +static HRESULT WINAPI Match_get_Length(IMatch *iface, LONG *pLength) +{ + Match2 *This = impl_from_IMatch(iface); + return IMatch2_get_Length(&This->IMatch2_iface, pLength); +} + +static IMatchVtbl MatchVtbl = { + Match_QueryInterface, + Match_AddRef, + Match_Release, + Match_GetTypeInfoCount, + Match_GetTypeInfo, + Match_GetIDsOfNames, + Match_Invoke, + Match_get_Value, + Match_get_FirstIndex, + Match_get_Length +}; + static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) { Match2 *ret; @@ -533,6 +619,7 @@ static HRESULT create_match2(DWORD pos, match_state_t **result, IMatch2 **match) *result = NULL; ret->IMatch2_iface.lpVtbl = &Match2Vtbl; + ret->IMatch_iface.lpVtbl = &MatchVtbl; ret->ref = 1; *match = &ret->IMatch2_iface;

1 0

Hans Leidekker : rpcrt4: Use the right port for https connections.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9967aed09db32909ce7116e7cad804bec8998dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9967aed09db32909ce7116e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 13:26:03 2013 +0100 rpcrt4: Use the right port for https connections. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index fc81bbe..6adc289 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2066,7 +2066,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) LPWSTR password = NULL; LPWSTR servername = NULL; const WCHAR *option; - INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER; /* use default port */ + INTERNET_PORT port; if (httpc->common.QOS && (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP)) @@ -2163,6 +2163,11 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); } + port = (httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL)) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; + httpc->session = InternetConnectW(httpc->app_info, servername, port, user, password, INTERNET_SERVICE_HTTP, 0, 0);

1 0

André Hentschel : ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: df7f4fb72031154751f4f70fb4d54e2467cef4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7f4fb72031154751f4f70fb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:20:28 2013 +0100 ntdll: Add stubs for RtlAddFunctionTable and RtlDeleteFunctionTable on ARM. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm.c | 20 ++++++++++++++++++++ include/winnt.h | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 93bfb77..a07a9ff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1028,11 +1028,11 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 83e9260..d67c85e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -409,7 +409,7 @@ # @ stub RtlAddAuditAccessObjectAce # @ stub RtlAddCompoundAce # @ stub RtlAddRange -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredExceptionHandler(long ptr) @@ -515,7 +515,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stub RtlDeleteElementGenericTable @ stub RtlDeleteElementGenericTableAvl -@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ce6a6b6..f9cde38 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -913,6 +913,26 @@ void __wine_enter_vm86( CONTEXT *context ) MESSAGE("vm86 mode not supported on this platform\n"); } + +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD addr ) +{ + FIXME( "%p %u %x: stub\n", table, count, addr ); + return TRUE; +} + + +/********************************************************************** + * RtlDeleteFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) +{ + FIXME( "%p: stub\n", table ); + return TRUE; +} + /*********************************************************************** * RtlUnwind (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 447e727..a40ff75 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1708,6 +1708,9 @@ typedef struct _CONTEXT { ULONG Cpsr; } CONTEXT; +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); + #endif /* __arm__ */ #ifdef __aarch64__

1 0

André Hentschel : winedump: Recognize IMAGE_DEBUG_TYPE_CLSID.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 5d712e7ea08fed6e0a926458d9870422b0121d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d712e7ea08fed6e0a926458d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:16:20 2013 +0100 winedump: Recognize IMAGE_DEBUG_TYPE_CLSID. --- include/winnt.h | 1 + tools/winedump/pe.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b701de3..447e727 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3436,6 +3436,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC 8 #define IMAGE_DEBUG_TYPE_BORLAND 9 #define IMAGE_DEBUG_TYPE_RESERVED10 10 +#define IMAGE_DEBUG_TYPE_CLSID 11 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index b6c8a34..bf29082 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -871,6 +871,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_OMAP_FROM_SRC:str = "OMAP_FROM_SRC"; break; case IMAGE_DEBUG_TYPE_BORLAND: str = "BORLAND"; break; case IMAGE_DEBUG_TYPE_RESERVED10: str = "RESERVED10"; break; + case IMAGE_DEBUG_TYPE_CLSID: str = "CLSID"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); @@ -915,6 +916,8 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) break; case IMAGE_DEBUG_TYPE_RESERVED10: break; + case IMAGE_DEBUG_TYPE_CLSID: + break; } printf("\n"); }

1 0

Andrew Eikum : riched20: EM_FINDTEXT implementation should match richedit character type.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 3f02c241631ee2fff6bfbb2b075187479e4ad4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f02c241631ee2fff6bfbb2b0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 22 11:34:42 2013 -0500 riched20: EM_FINDTEXT implementation should match richedit character type. --- dlls/riched20/editor.c | 42 ++++++++----- dlls/riched20/tests/editor.c | 137 ++++++++++++++++++++++++++++++------------ 2 files changed, 125 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f02c241631ee2fff6bfb…

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::name tests.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9fa1570fe67b067a83417e08807612612b8edce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa1570fe67b067a83417e088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 18 14:06:29 2013 +0100 mshtml: Added IHTMLButtonElement::name tests. --- dlls/mshtml/tests/dom.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2e4e3d8..54bb68c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -913,6 +913,17 @@ static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) return ret; } +#define get_button_iface(u) _get_button_iface(__LINE__,u) +static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) +{ + IHTMLButtonElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLButtonElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5348,6 +5359,45 @@ static void test_defaults(IHTMLDocument2 *doc) test_doc_title(doc, ""); } +#define test_button_name(a,b) _test_button_name(__LINE__,a,b) +static void _test_button_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLButtonElement_get_name(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name = %s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLButtonElement_Release(button); +} + +#define set_button_name(a,b) _set_button_name(__LINE__,a,b) +static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLButtonElement_put_name(button, str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLButtonElement_Release(button); + + _test_button_name(line, elem, name); +} + +static void test_button_elem(IHTMLElement *elem) +{ + test_button_name(elem, NULL); + set_button_name(elem, "button name"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -6097,6 +6147,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "btnid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_button_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "objid"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Ken Thomases : winemac: Implement rudimentary support for system tray icons as Mac status items.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 9714e6ee6388f5715301f44495aca4ca84e87873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9714e6ee6388f5715301f4449… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:54 2013 -0500 winemac: Implement rudimentary support for system tray icons as Mac status items. --- dlls/winemac.drv/Makefile.in | 2 + dlls/winemac.drv/cocoa_status_item.m | 175 +++++++++++++++++ dlls/winemac.drv/event.c | 5 + dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/macdrv.h | 3 + dlls/winemac.drv/macdrv_cocoa.h | 13 ++ dlls/winemac.drv/systray.c | 358 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 3 + 8 files changed, 560 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9714e6ee6388f5715301f…

1 0

Ken Thomases : winemac: Set application Dock icon from first icon resource in process's .exe file.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: b1de532393bf2b1f3b78cfb2d6f2b7b420341755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1de532393bf2b1f3b78cfb2d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:49 2013 -0500 winemac: Set application Dock icon from first icon resource in process's .exe file. --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 60 +++++++++- dlls/winemac.drv/image.c | 274 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 15 ++ 6 files changed, 352 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1de532393bf2b1f3b78c…

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: a0a12d7b7c939dcb4740ce7fb0221457225c6c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a12d7b7c939dcb4740ce7fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:38:42 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp100/locale.c | 878 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp100/msvcp100.spec | 128 ++++---- dlls/msvcp60/ios.c | 9 - dlls/msvcp60/locale.c | 796 ++++++++++++++++++++++++++++++++++++++- dlls/msvcp60/msvcp60.spec | 72 ++-- dlls/msvcp70/msvcp70.spec | 108 +++--- dlls/msvcp71/locale.c | 698 ++++++++++++++++++++++++++++++++++- dlls/msvcp71/msvcp71.spec | 108 +++--- dlls/msvcp80/msvcp80.spec | 116 +++--- 9 files changed, 2623 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a12d7b7c939dcb4740c…

1 0

Aric Stewart : usp10: Correct access to -1 index of array.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: e909665db34b44c127c5ecefdfbd2991af5d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e909665db34b44c127c5ecefd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 18 11:21:15 2013 -0500 usp10: Correct access to -1 index of array. Issue found by Phil Krylov. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index bc48ecd..878c39f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1341,7 +1341,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (original == Script_Punctuation2) break; } - if (scriptInformation[scripts[j]].props.fComplex || asian) + if (j >= 0 && (scriptInformation[scripts[j]].props.fComplex || asian)) scripts[i] = scripts[j]; } }

1 0

André Hentschel : winedump: Dump exception info on ARM .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 18c95cf165a09ee0fe77f431ec31a5b101affd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c95cf165a09ee0fe77f431e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 23 17:17:45 2013 +0100 winedump: Dump exception info on ARM. --- tools/winedump/main.c | 2 +- tools/winedump/pe.c | 82 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 4186044..dbc2d67 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -228,7 +228,7 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turns on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, + {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr, reloc, except)"}, {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index bf29082..2029ef2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -547,16 +547,35 @@ static void dump_dir_exported_functions(void) } -struct runtime_function +struct runtime_function_x86_64 { DWORD BeginAddress; DWORD EndAddress; DWORD UnwindData; }; +struct runtime_function_armnt +{ + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD Ret : 2; + DWORD H : 1; + DWORD Reg : 3; + DWORD R : 1; + DWORD L : 1; + DWORD C : 1; + DWORD StackAdjust : 10; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +}; + union handler_data { - struct runtime_function chain; + struct runtime_function_x86_64 chain; DWORD handler; }; @@ -567,7 +586,7 @@ struct opcode BYTE info : 4; }; -struct unwind_info +struct unwind_info_x86_64 { BYTE version : 3; BYTE flags : 5; @@ -579,6 +598,14 @@ struct unwind_info /* followed by union handler_data */ }; +struct unwind_info_armnt +{ + WORD function_length; + WORD unknown1 : 7; + WORD count : 5; + WORD unknown2 : 4; +}; + #define UWOP_PUSH_NONVOL 0 #define UWOP_ALLOC_LARGE 1 #define UWOP_ALLOC_SMALL 2 @@ -593,20 +620,20 @@ struct unwind_info #define UNW_FLAG_UHANDLER 2 #define UNW_FLAG_CHAININFO 4 -static void dump_x86_64_unwind_info( const struct runtime_function *function ) +static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *function ) { static const char * const reg_names[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; const union handler_data *handler_data; - const struct unwind_info *info; + const struct unwind_info_x86_64 *info; unsigned int i, count; printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); if (function->UnwindData & 1) { - const struct runtime_function *next = RVA( function->UnwindData & ~1, sizeof(*next) ); + const struct runtime_function_x86_64 *next = RVA( function->UnwindData & ~1, sizeof(*next) ); printf( " -> function %08x-%08x\n", next->BeginAddress, next->EndAddress ); return; } @@ -698,19 +725,56 @@ static void dump_x86_64_unwind_info( const struct runtime_function *function ) (ULONG)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); } +static void dump_armnt_unwind_info( const struct runtime_function_armnt *function ) +{ + const struct unwind_info_armnt *info; + if (function->u.s.Flag) + { + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + function->u.s.FunctionLength * 2 ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", function->u.s.FunctionLength ); + printf( " Ret %x\n", function->u.s.Ret ); + printf( " H %x\n", function->u.s.H ); + printf( " Reg %x\n", function->u.s.Reg ); + printf( " R %x\n", function->u.s.R ); + printf( " L %x\n", function->u.s.L ); + printf( " C %x\n", function->u.s.C ); + printf( " StackAdjust %x\n", function->u.s.StackAdjust ); + return; + } + + info = RVA( function->u.UnwindData, sizeof(*info) ); + + printf( "\nFunction %08x-%08x:\n", function->BeginAddress & ~1, + (function->BeginAddress & ~1) + info->function_length * 2 ); + printf( " unwind info at %08x\n", function->u.UnwindData ); + printf( " Flag %x\n", function->u.s.Flag ); + printf( " FunctionLength %x\n", info->function_length ); + printf( " Unknown1 %x\n", info->unknown1 ); + printf( " Count %x\n", info->count ); + printf( " Unknown2 %x\n", info->unknown2 ); +} + static void dump_dir_exceptions(void) { unsigned int i, size = 0; - const struct runtime_function *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); + const void *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); const IMAGE_FILE_HEADER *file_header = &PE_nt_headers->FileHeader; if (!funcs) return; if (file_header->Machine == IMAGE_FILE_MACHINE_AMD64) { - size /= sizeof(*funcs); + size /= sizeof(struct runtime_function_x86_64); + printf( "Exception info (%u functions):\n", size ); + for (i = 0; i < size; i++) dump_x86_64_unwind_info( (struct runtime_function_x86_64*)funcs + i ); + } + else if (file_header->Machine == IMAGE_FILE_MACHINE_ARMNT) + { + size /= sizeof(struct runtime_function_armnt); printf( "Exception info (%u functions):\n", size ); - for (i = 0; i < size; i++) dump_x86_64_unwind_info( funcs + i ); + for (i = 0; i < size; i++) dump_armnt_unwind_info( (struct runtime_function_armnt*)funcs + i ); } else printf( "Exception information not supported for %s binaries\n", get_machine_str(file_header->Machine));

1 0

Marcus Meissner : strmbase: Fixed user-after-free (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 2ba014bf40d98dd1a1b97ab19e60311be7839214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba014bf40d98dd1a1b97ab19… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:13 2013 +0100 strmbase: Fixed user-after-free (Coverity). --- dlls/strmbase/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0e014b0..df72d99 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -343,8 +343,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); - CoTaskMemFree(This); IUnknown_Release(This->seekthru_unk); + CoTaskMemFree(This); return 0; }

1 0

Marcus Meissner : urlmon: Pass up error on error condition (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 542fe17a050b4493aa2c1ff6017b46f82b762340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542fe17a050b4493aa2c1ff60… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 23 11:14:04 2013 +0100 urlmon: Pass up error on error condition (Coverity). --- dlls/urlmon/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 5598780..2682465 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -78,7 +78,7 @@ static HRESULT start_downloading(Protocol *protocol) if(FAILED(hres)) { protocol_close_connection(protocol); report_result(protocol, hres); - return S_OK; + return hres; } if(protocol->bindf & BINDF_NEEDFILE) {

1 0

Phil Krylov : usp10: Support GPOS extension lookup subtables.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: c9cbde73c014554eb43cc24564f59973e3b55bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cbde73c014554eb43cc2456… Author: Phil Krylov <phil.krylov(a)gmail.com> Date: Fri Mar 8 20:24:59 2013 +0400 usp10: Support GPOS extension lookup subtables. --- dlls/usp10/opentype.c | 93 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a48a607..166d823 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -479,6 +479,12 @@ typedef struct { GPOS_PosLookupRecord PosLookupRecord[1]; } GPOS_ChainContextPosFormat3_4; +typedef struct { + WORD PosFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GPOS_ExtensionPosFormat1; + /********** * CMAP **********/ @@ -1166,6 +1172,25 @@ static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *Va if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); } +static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 9) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + return (const BYTE *)look + offset; +} + static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { @@ -1175,9 +1200,8 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_SinglePosFormat1 *spf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); + const GPOS_SinglePosFormat1 *spf1 = (const GPOS_SinglePosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); @@ -1253,9 +1277,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_PairPosFormat1 *ppf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); + const GPOS_PairPosFormat1 *ppf1 = (const GPOS_PairPosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; @@ -1292,7 +1315,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN } else if (GET_BE_WORD(ppf1->PosFormat) == 2) { - const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)ppf1; int index; WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); @@ -1339,13 +1362,11 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_CursivePosFormat1 *cpf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + const GPOS_CursivePosFormat1 *cpf1 = (const GPOS_CursivePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(cpf1->PosFormat) == 1) { int index_exit, index_entry; - offset = GET_BE_WORD( cpf1->Coverage ); + WORD offset = GET_BE_WORD( cpf1->Coverage ); index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) { @@ -1389,10 +1410,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkBasePosFormat1 *mbpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mbpf1 = (const GPOS_MarkBasePosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkBasePosFormat1 *mbpf1 = (const GPOS_MarkBasePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mbpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mbpf1->MarkCoverage); @@ -1466,10 +1484,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkLigPosFormat1 *mlpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkLigPosFormat1 *mlpf1 = (const GPOS_MarkLigPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mlpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mlpf1->MarkCoverage); @@ -1560,10 +1575,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkMarkPosFormat1 *mmpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkMarkPosFormat1 *mmpf1 = (const GPOS_MarkMarkPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mmpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mmpf1->Mark1Coverage); @@ -1590,7 +1602,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return FALSE; } mr = &ma->MarkRecord[mark_index]; @@ -1631,13 +1643,10 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { int offset; - const GPOS_ChainContextPosFormat3_1 *ccpf3; + const GPOS_ChainContextPosFormat3_1 *ccpf3 = (GPOS_ChainContextPosFormat3_1 *)GPOS_get_subtable(look, j); int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); - if (GET_BE_WORD(ccpf3->PosFormat) == 1) { FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); @@ -1723,11 +1732,33 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + WORD type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 9) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + else + { + WARN("lookup type is Extension Positioning but no extension subtable exists\n"); + } + } + switch (type) { case 1: { @@ -1849,7 +1880,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); } default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return glyph_index+1; }

1 0

Ken Thomases : winemac: Allow Command-[Shift-] Tab to switch apps even when the displays are captured.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 6ee486644a4313366fa7c95b93d371ef3e04255a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee486644a4313366fa7c95b9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:59 2013 -0500 winemac: Allow Command-[Shift-]Tab to switch apps even when the displays are captured. --- dlls/winemac.drv/cocoa_app.m | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index a417674..b14c550 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -672,6 +672,49 @@ int macdrv_err_on; [self setApplicationIconImage:nsimage]; } + - (void) handleCommandTab + { + if ([self isActive]) + { + NSRunningApplication* thisApp = [NSRunningApplication currentApplication]; + NSRunningApplication* app; + NSRunningApplication* otherValidApp = nil; + + if ([originalDisplayModes count]) + { + CGRestorePermanentDisplayConfiguration(); + CGReleaseAllDisplays(); + [originalDisplayModes removeAllObjects]; + } + + for (app in [[NSWorkspace sharedWorkspace] runningApplications]) + { + if (![app isEqual:thisApp] && !app.terminated && + app.activationPolicy == NSApplicationActivationPolicyRegular) + { + if (!app.hidden) + { + // There's another visible app. Just hide ourselves and let + // the system activate the other app. + [self hide:self]; + return; + } + + if (!otherValidApp) + otherValidApp = app; + } + } + + // Didn't find a visible GUI app. Try the Finder or, if that's not + // running, the first hidden GUI app. If even that doesn't work, we + // just fail to switch and remain the active app. + app = [[NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.finder"] lastObject]; + if (!app) app = otherValidApp; + [app unhide]; + [app activateWithOptions:0]; + } + } + /* * ---------- Cursor clipping methods ---------- * @@ -1084,6 +1127,19 @@ int macdrv_err_on; // Make sure next mouse move event starts over from an absolute baseline. forceNextMouseMoveAbsolute = TRUE; } + else if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + { + NSUInteger modifiers = [anEvent modifierFlags]; + if ((modifiers & NSCommandKeyMask) && + !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + { + // Command-Tab and Command-Shift-Tab would normally be intercepted + // by the system to switch applications. If we're seeing it, it's + // presumably because we've captured the displays, preventing + // normal application switching. Do it manually. + [self handleCommandTab]; + } + } }

1 0