April 2021 - Wine-Commits - list.winehq.org

Francois Gouget : winetest/cron: Parameterize when to delete/archive old data.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 858019cb9d9a507d82f6ac56b11542cfa894a55e URL: https://source.winehq.org/git/tools.git/?a=commit;h=858019cb9d9a507d82f6ac5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 15:29:26 2021 +0200 winetest/cron: Parameterize when to delete/archive old data. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 6119013..df27116 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -17,6 +17,12 @@ # Cron job for generating winetest reports. Use it like # */5 * * * * winetest.cron WORKDIR +# Leave empty to disable the corresponding task +build_compress=120 # days before compressing old-data builds +winetest_expire=120 # days before deleting winetest binaries +queue_expire=30 # days before deleting queued reports + + name0=`basename "$0"` tools=`dirname "$0"` case "$tools" in @@ -36,9 +42,6 @@ cleanup() rm -f "$lock" } -# expiration age (in days) before results get archived -expire=120 - if [ ! -f "$lock" ] then touch "$lock" @@ -69,27 +72,34 @@ then [ -n "$refresh_index" ] && "$tools/build-index" [ -n "$refresh_errors" ] && "$tools/build-errors" - # archive old results - ( + # compress old build reports + if [ -n "$build_compress" ] + then ( set -e cd old-data - dir=`find . -maxdepth 1 -mtime "+$expire" -type d -print -quit` + dir=`find . -maxdepth 1 -mtime "+$build_compress" -type d -print -quit` test -n "$dir" tar cfj "$dir.tar.bz2" "$dir" touch -r "$dir" "$dir.tar.bz2" rm -rf "$dir" - ) + fi ) - # remove old test builds - ( + # remove old winetest binaries + if [ -n "$winetest_expire" ] + then ( set -e mkdir -p builds cd builds - find . -mtime "+$expire" -name "winetest*.exe" -print0 | \ + find . -mtime "+$winetest_expire" -name "winetest*.exe" -print0 | \ xargs -0 rm -f - ) + fi ) - # remove old queue files - find queue -maxdepth 1 -mtime +30 -name "err*" -print0 | xargs -0 rm -rf - find queue -maxdepth 1 -mtime +30 -name "CGI*" -print0 | xargs -0 rm -f + # remove old queued files + if [ -n "$queue_expire" ] + then + find queue -maxdepth 1 -mtime +$queue_expire -name "err*" -print0 | \ + xargs -0 rm -rf + find queue -maxdepth 1 -mtime +$queue_expire -name "CGI*" -print0 | \ + xargs -0 rm -f + fi fi

1 0

Francois Gouget : winetest/gather: Remove an unused variable.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 625a72e173c98fa5457e01da14b491e931dfc0eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=625a72e173c98fa5457e01d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:23:28 2021 +0200 winetest/gather: Remove an unused variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 7c4984c..302def4 100755 --- a/winetest/gather +++ b/winetest/gather @@ -180,7 +180,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($update, $builddir, $usage); +my ($builddir, $usage); sub check_opt_val($$) { @@ -210,7 +210,6 @@ while (@ARGV) elsif ($arg eq "--update") { $builddir = check_opt_val($arg, $builddir); - $update = 1; } elsif ($arg eq "--help") {

1 0

Francois Gouget : winetest/cron: Optionally purge the really old test results.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 027d1b5c51d4c74db184090df4c15d0c21184b40 URL: https://source.winehq.org/git/tools.git/?a=commit;h=027d1b5c51d4c74db184090… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 15:29:45 2021 +0200 winetest/cron: Optionally purge the really old test results. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index df27116..d7f0344 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -19,6 +19,7 @@ # Leave empty to disable the corresponding task build_compress=120 # days before compressing old-data builds +build_expire= # days before deleting old-data builds winetest_expire=120 # days before deleting winetest binaries queue_expire=30 # days before deleting queued reports @@ -84,6 +85,15 @@ then rm -rf "$dir" fi ) + # remove old build reports + if [ -n "$build_expire" ] + then ( + set -e + cd old-data + find . -mtime "+$build_expire" -name "*.tar.*" -print0 | \ + xargs -0 rm -f + fi ) + # remove old winetest binaries if [ -n "$winetest_expire" ] then (

1 0

Francois Gouget : testbot/LogUtils: Add a timeout error if the task timed out.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 6be4865e9d78290bad907a65b03cc4c0924f513a URL: https://source.winehq.org/git/tools.git/?a=commit;h=6be4865e9d78290bad907a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:32:21 2021 +0200 testbot/LogUtils: Add a timeout error if the task timed out. This ensures that the report is flagged as failed even if the timeout happened at the task level. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5d2dc33..0b2edf7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -455,6 +455,10 @@ sub _CloseTestUnit($$$) { _AddExtra($LogInfo, "The report seems to have been truncated"); } + elsif ($Last and $LogInfo->{TaskTimedOut}) + { + _AddExtra($LogInfo, "$Cur->{Unit}: Timeout"); + } } }

1 0

Francois Gouget : winetest/dissect: Update the dll version error highlighting.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 90a052f049eb1d5ec1f0fa3a9ac6d5c614ef409e URL: https://source.winehq.org/git/tools.git/?a=commit;h=90a052f049eb1d5ec1f0fa3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:32:37 2021 +0200 winetest/dissect: Update the dll version error highlighting. Match all the 'dll is missing' errors. There should be no native dlls when running the tests in Wine so treat 'dlls is native' messages as errors. Also we don't get the load error 1157 anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48061 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2c89aba..c681c7d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -838,24 +838,28 @@ mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfile $box->{data} .= "<table class=\"output\">\n"; foreach my $dll (sort keys %dllinfo) { - if ($dllinfo{$dll}->{version} eq "dll is missing") + if ($dllinfo{$dll}->{version} =~ /^dll is missing/) { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); + my $reason = $dllinfo{$dll}->{version}; + $reason =~ s/dll is //; + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($reason); } elsif ($dllinfo{$dll}->{version} eq "skipped") { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "load error 1157") + elsif ($dllinfo{$dll}->{version} eq "dll is a stub") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">stub</td></tr>\n", escapeHTML($dll); } - elsif ($dllinfo{$dll}->{version} eq "dll is a stub") + elsif ($dllinfo{$dll}->{version} eq "dll is native") { - $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">dll is a stub</td></tr>\n", escapeHTML($dll); + # There should be no native dll in the Wine tests + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">native</td></tr>\n", escapeHTML($dll); } elsif ($dllinfo{$dll}->{version} =~ /^load error/) { + # Flag unknown errors $box->{data} .= sprintf "<tr><td>%s</td><td class=\"failed\">%s</td></tr>\n", escapeHTML($dll), escapeHTML($dllinfo{$dll}->{version}); }

1 0

Francois Gouget : testbot/WineRun*: Standardize the WrapUpAndExit() functions.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 84cb43cede00f1bc3d00964a4a457f69cb176bb3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84cb43cede00f1bc3d00964… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:38:24 2021 +0200 testbot/WineRun*: Standardize the WrapUpAndExit() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 7 +++---- testbot/bin/WineRunReconfig.pl | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 8a92f88..13f488b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -181,16 +181,15 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; my $VMResult = defined $Reason ? $Reason : $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -490,4 +489,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus, undef, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 49e7305..ec82849 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,9 +182,9 @@ sub LogTaskError($) print STDERR "$Name0:error: ", $ErrMessage; } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $Retry, $TimedOut, $Reason) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; my $VMResult = defined $Reason ? $Reason : @@ -192,7 +192,6 @@ sub WrapUpAndExit($;$$$) $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; - my $TestFailures; my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -567,4 +566,4 @@ if ($NewStatus eq 'completed') # In case of a regular build failure retrying is pointless. But in case of a # timeout the VM host may be less busy next time and since the snapshot is # unchanged we can retry. -WrapUpAndExit($NewStatus, $TaskTimedOut, $TaskTimedOut); +WrapUpAndExit($NewStatus, undef, $TaskTimedOut, $TaskTimedOut);

1 0

Francois Gouget : testbot/WineRun*: Account for any task.log error.
by Alexandre Julliard April 8, 2021

April 8, 2021

Module: tools Branch: master Commit: 57f184fb49c3ff9bfb3573d13449c6b84514b5c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=57f184fb49c3ff9bfb3573d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 8 12:38:26 2021 +0200 testbot/WineRun*: Account for any task.log error. This ensures TestLauncher errors are accounted for in the task result. Builds are not expected to generate errors in task.log but if they do, they too should be accounted for. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 9 ++++++--- testbot/bin/WineRunReconfig.pl | 10 +++++++--- testbot/bin/WineRunTask.pl | 1 + testbot/bin/WineRunWineTest.pl | 11 ++++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 13f488b..8585882 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -385,7 +385,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); +my ($NewStatus, $ErrMessage, $TaskFailures, $TaskTimedOut, $TAError); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -407,12 +407,15 @@ Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # So forget any prior error... $NewStatus = "completed"; $TAError = $ErrMessage = undef; + # ...but keep keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif ($LogInfo->{Task} eq "badpatch") { @@ -489,4 +492,4 @@ $TA->Disconnect(); # Wrap up # -WrapUpAndExit($NewStatus, undef, undef, $TaskTimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, undef, $TaskTimedOut); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index ec82849..9bd9429 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -385,7 +385,7 @@ if (!$Pid) # log before giving up # -my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); +my ($NewStatus, $ErrMessage, $TaskFailures, $TaskTimedOut, $TAError); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { @@ -394,6 +394,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) { $ErrMessage = "The build timed out\n"; $NewStatus = "badbuild"; + $TaskFailures = 1; $TaskTimedOut = 1; } else @@ -408,12 +409,15 @@ Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. - # So forget any prior error. + # So forget any prior error... $NewStatus = "completed"; $TAError = $ErrMessage = undef; + # ...but keep keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif (defined $LogInfo->{BadLog}) { @@ -566,4 +570,4 @@ if ($NewStatus eq 'completed') # In case of a regular build failure retrying is pointless. But in case of a # timeout the VM host may be less busy next time and since the snapshot is # unchanged we can retry. -WrapUpAndExit($NewStatus, undef, $TaskTimedOut, $TaskTimedOut); +WrapUpAndExit($NewStatus, $TaskFailures, $TaskTimedOut, $TaskTimedOut); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index b1578ad..db274b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -534,6 +534,7 @@ Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; my $ErrMessage = CreateLogErrorsCache($LogInfo); LogTaskError("$ErrMessage\n") if (defined $ErrMessage); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3a267ac..c9a57bb 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -508,19 +508,24 @@ Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { my $LogInfo = ParseTaskLog("$TaskDir/task.log"); + $TaskFailures ||= $LogInfo->{ErrCount}; if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully # (with or without test failures). So clear any previous errors, including # $TaskFailures since there was not really a timeout after all. $NewStatus = "completed"; - $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; + $TAError = $ErrMessage = $PossibleCrash = undef; + # Reset the timeout error but keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif ($LogInfo->{Task} eq "badpatch") { # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; - $TaskFailures = $TAError = $ErrMessage = $PossibleCrash = undef; + $TAError = $ErrMessage = $PossibleCrash = undef; + # Reset the timeout error but keep the keep the task.log ones + $TaskFailures = $LogInfo->{ErrCount}; } elsif (defined $LogInfo->{BadLog}) { @@ -532,7 +537,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $NewStatus = "badbuild"; $TaskFailures = $PossibleCrash = undef; } - elsif (!$TaskTimedOut and !defined $TAError) + elsif (!$TaskTimedOut and !defined $TAError and !$LogInfo->{ErrCount}) { # Did WineTest.pl crash? $NewStatus = "boterror";

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IServiceProvider stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: f3e31f2bbbcb55bf2312a1287be8b241e1606957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e31f2bbbcb55bf2312a128… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:18 2021 +0200 dhtmled.ocx: Add IServiceProvider stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 036b21e791e..e92e96f4050 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -37,6 +37,7 @@ typedef struct IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; IConnectionPointContainer IConnectionPointContainer_iface; IDataObject IDataObject_iface; + IServiceProvider IServiceProvider_iface; IOleClientSite *client_site; SIZEL extent; @@ -93,6 +94,11 @@ static inline DHTMLEditImpl *impl_from_IDataObject(IDataObject *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IDataObject_iface); } +static inline DHTMLEditImpl *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IServiceProvider_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -173,6 +179,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IDataObject_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IServiceProvider)) + { + dhtml_edit_addref(This); + *out = &This->IServiceProvider_iface; + return S_OK; + } *out = NULL; @@ -1503,6 +1515,38 @@ static const IDataObjectVtbl DataObjectVtbl = { DataObject_EnumDAdvise }; +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID iid, + LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IServiceProvider(iface), iid, out); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return dhtml_edit_addref(impl_from_IServiceProvider(iface)); +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return dhtml_edit_release(impl_from_IServiceProvider(iface)); +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + DHTMLEditImpl *This = impl_from_IServiceProvider(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -1526,6 +1570,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleInPlaceActiveObject_iface.lpVtbl = &OleInPlaceActiveObjectVtbl; This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; This->IDataObject_iface.lpVtbl = &DataObjectVtbl; + This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; This->client_site = NULL; This->ref = 1;

1 0

Akihiro Sagawa : gdi32: Move otmEMSquare initialization to freetype_load_font.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 8f6f1c8f7aa2b848f0ebb15ec9e2b03854caf710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f6f1c8f7aa2b848f0ebb15e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:19 2021 +0900 gdi32: Move otmEMSquare initialization to freetype_load_font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2535faad03a..c66db289ab1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2496,6 +2496,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) TRACE( "height %d => ppem %d\n", font->lf.lfHeight, font->ppem ); height = font->ppem; font->ttc_item_offset = get_ttc_offset( ft_face, font->face_index ); + font->otm.otmEMSquare = ft_face->units_per_EM; } else { @@ -3946,7 +3947,6 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) font->otm.otmsCharSlopeRise = pHori->caret_Slope_Rise; font->otm.otmsCharSlopeRun = pHori->caret_Slope_Run; font->otm.otmItalicAngle = 0; /* POST table */ - font->otm.otmEMSquare = ft_face->units_per_EM; font->otm.otmAscent = SCALE_Y(pOS2->sTypoAscender); font->otm.otmDescent = SCALE_Y(pOS2->sTypoDescender); font->otm.otmLineGap = SCALE_Y(pOS2->sTypoLineGap);

1 0

Akihiro Sagawa : gdi32: Fix text metrics used in EnumFonts families.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 837c4f4b87b4a810e57d7e50af2023b38d03b5cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=837c4f4b87b4a810e57d7e50… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:21 2021 +0900 gdi32: Fix text metrics used in EnumFonts families. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index de50bf0de42..fd03580a754 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2685,7 +2685,9 @@ static UINT get_font_type( const NEWTEXTMETRICEXW *ntm ) static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, NEWTEXTMETRICEXW *ntm ) { struct gdi_font *font; - LOGFONTW lf = { .lfHeight = 100 }; + LOGFONTW lf = { .lfHeight = -4096 /* preferable EM Square size */ }; + + if (!face->scalable) lf.lfHeight = 0; if (!(font = create_gdi_font( face, NULL, &lf ))) return FALSE; @@ -2695,12 +2697,42 @@ static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, return FALSE; } + if (font->scalable && -lf.lfHeight % font->otm.otmEMSquare != 0) + { + /* reload with the original EM Square size */ + lf.lfHeight = -font->otm.otmEMSquare; + free_gdi_font( font ); + + if (!(font = create_gdi_font( face, NULL, &lf ))) return FALSE; + if (!font_funcs->load_font( font )) + { + free_gdi_font( font ); + return FALSE; + } + } + if (font_funcs->set_outline_text_metrics( font )) { - memcpy( &ntm->ntmTm, &font->otm.otmTextMetrics, sizeof(TEXTMETRICW) ); + static const DWORD ntm_ppem = 32; + +#define TM font->otm.otmTextMetrics +#define SCALE_NTM(value) (MulDiv( ntm->ntmTm.tmHeight, (value), TM.tmHeight )) + ntm->ntmTm.tmHeight = MulDiv( ntm_ppem, font->ntmCellHeight, font->otm.otmEMSquare ); + ntm->ntmTm.tmAscent = SCALE_NTM( TM.tmAscent ); + ntm->ntmTm.tmDescent = ntm->ntmTm.tmHeight - ntm->ntmTm.tmAscent; + ntm->ntmTm.tmInternalLeading = SCALE_NTM( TM.tmInternalLeading ); + ntm->ntmTm.tmExternalLeading = SCALE_NTM( TM.tmExternalLeading ); + ntm->ntmTm.tmAveCharWidth = SCALE_NTM( TM.tmAveCharWidth ); + ntm->ntmTm.tmMaxCharWidth = SCALE_NTM( TM.tmMaxCharWidth ); + + memcpy((char *)&ntm->ntmTm + offsetof( TEXTMETRICW, tmWeight ), + (const char *)&TM + offsetof( TEXTMETRICW, tmWeight ), + sizeof(TEXTMETRICW) - offsetof( TEXTMETRICW, tmWeight )); ntm->ntmTm.ntmSizeEM = font->otm.otmEMSquare; ntm->ntmTm.ntmCellHeight = font->ntmCellHeight; ntm->ntmTm.ntmAvgWidth = font->ntmAvgWidth; +#undef SCALE_NTM +#undef TM } else if (font_funcs->set_bitmap_text_metrics( font )) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d5ae526d536..ed0acf8243a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3923,6 +3923,25 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + /* NEWTEXTMETRIC's scaling method is different from TEXTMETRIC's */ +#define SCALE_NTM(value) (MulDiv(ntm->tmHeight, (value), cell_height)) + size = MulDiv(32, ntm->ntmCellHeight, ntm->ntmSizeEM); + ok(ntm->tmHeight == size, "%s: ntm->tmHeight %d != %d (%u/%u)\n", + font_name, ntm->tmHeight, size, ntm->ntmCellHeight, ntm->ntmSizeEM); + size = SCALE_NTM(ntm->ntmAvgWidth); + ok(ntm->tmAveCharWidth == size, "%s: ntm->tmAveCharWidth %d != %d (%u/%u,%d)\n", + font_name, ntm->tmAveCharWidth, size, ntm->ntmAvgWidth, cell_height, ntm->tmHeight); + size = SCALE_NTM(ascent); + ok(ntm->tmAscent == size, "%s: ntm->tmAscent %d != %d (%u/%u,%d)\n", + font_name, ntm->tmAscent, size, ascent, cell_height, ntm->tmHeight); + size = ntm->tmHeight - ntm->tmAscent; + ok(ntm->tmDescent == size, "%s: ntm->tmDescent %d != %d (%u/%u,%d)\n", + font_name, ntm->tmDescent, size, descent, cell_height, ntm->tmHeight); + size = SCALE_NTM(cell_height - ntm->ntmSizeEM); + ok(ntm->tmInternalLeading == size, "%s: ntm->tmInternalLeading %d != %d (%u/%u,%d)\n", + font_name, ntm->tmInternalLeading, size, cell_height - ntm->ntmSizeEM, cell_height, ntm->tmHeight); +#undef SCALE_NTM + version = GET_BE_WORD(tt_os2.version); os2_first_char = GET_BE_WORD(tt_os2.usFirstCharIndex);

1 0