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

Francois Gouget : winetest/gather: Remove an unused variable.
by Alexandre Julliard 08 Apr '21

08 Apr '21

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 : testbot/LogUtils: Add a timeout error if the task timed out.
by Alexandre Julliard 08 Apr '21

08 Apr '21

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 08 Apr '21

08 Apr '21

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 08 Apr '21

08 Apr '21

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 08 Apr '21

08 Apr '21

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

Francois Gouget : winetest/cron: Parameterize when to delete/archive old data.
by Alexandre Julliard 08 Apr '21

08 Apr '21

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/cron: Optionally purge the really old test results.
by Alexandre Julliard 08 Apr '21

08 Apr '21

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

Vijay Kiran Kamuju : dhtmled.ocx: Add IServiceProvider stub interface.
by Alexandre Julliard 07 Apr '21

07 Apr '21

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

Vijay Kiran Kamuju : dhtmled.ocx: Add IPersistStorage stub interface.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 166697189d2e1ec620aa7e8c084f62bf5b53b94f URL: https://source.winehq.org/git/wine.git/?a=commit;h=166697189d2e1ec620aa7e8c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:19 2021 +0200 dhtmled.ocx: Add IPersistStorage 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 | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index e92e96f4050..b96630c73e5 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; + IPersistStorage IPersistStorage_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; IViewObjectEx IViewObjectEx_iface; @@ -59,6 +60,11 @@ static inline DHTMLEditImpl *impl_from_IProvideClassInfo2(IProvideClassInfo2 *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IProvideClassInfo2_iface); } +static inline DHTMLEditImpl *impl_from_IPersistStorage(IPersistStorage *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStorage_iface); +} + static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) { return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); @@ -133,6 +139,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IProvideClassInfo2_iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_IPersistStorage)) + { + dhtml_edit_addref(This); + *out = &This->IPersistStorage_iface; + return S_OK; + } else if (IsEqualGUID(iid, &IID_IPersistStreamInit)) { dhtml_edit_addref(This); @@ -928,6 +940,76 @@ static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { ProvideClassInfo2_GetGUID }; +static HRESULT WINAPI PersistStorage_QueryInterface(IPersistStorage *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IPersistStorage(iface), iid, out); +} + +static ULONG WINAPI PersistStorage_AddRef(IPersistStorage *iface) +{ + return dhtml_edit_addref(impl_from_IPersistStorage(iface)); +} + +static ULONG WINAPI PersistStorage_Release(IPersistStorage *iface) +{ + return dhtml_edit_release(impl_from_IPersistStorage(iface)); +} + +static HRESULT WINAPI PersistStorage_GetClassID(IPersistStorage *iface, CLSID *clsid) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_IsDirty(IPersistStorage *iface) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_InitNew(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, storage); + return S_OK; +} + +static HRESULT WINAPI PersistStorage_Load(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, storage); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_Save(IPersistStorage *iface, LPSTORAGE storage, BOOL sameasld) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p, %u) stub\n", This, storage, sameasld); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_SaveCompleted(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p)\n", This, storage); + return E_NOTIMPL; +} + +static const IPersistStorageVtbl PersistStorageVtbl = +{ + PersistStorage_QueryInterface, + PersistStorage_AddRef, + PersistStorage_Release, + PersistStorage_GetClassID, + PersistStorage_IsDirty, + PersistStorage_InitNew, + PersistStorage_Load, + PersistStorage_Save, + PersistStorage_SaveCompleted +}; + static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID iid, void **out) { return dhtml_edit_qi(impl_from_IPersistStreamInit(iface), iid, out); @@ -1563,6 +1645,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + This->IPersistStorage_iface.lpVtbl = &PersistStorageVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl;

1 0

Akihiro Sagawa : gdi32/tests: Remove unreliable height tests.
by Alexandre Julliard 07 Apr '21

07 Apr '21

Module: wine Branch: master Commit: 67093e3b4a25a96a600e785b559ec8a24a9ddcd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67093e3b4a25a96a600e785b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:17 2021 +0900 gdi32/tests: Remove unreliable height tests. 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/tests/font.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 461eecf8038..d5ae526d536 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2874,7 +2874,6 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D const NEWTEXTMETRICA *ntm = (const NEWTEXTMETRICA *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); - ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; @@ -2897,7 +2896,6 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, const NEWTEXTMETRICW *ntm = (const NEWTEXTMETRICW *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); - ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1;

1 0