wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Francois Gouget : testbot: Filter the jobs in GetStatistics().
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: tools Branch: master Commit: 8f4e6c03f9aae9312d18ce0347995442946fc355 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8f4e6c03f9aae9312d18ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:57:57 2022 +0200 testbot: Filter the jobs in GetStatistics(). This reduces the number of Tasks that need to be loaded from the database and processed in order to collect the statistics for short periods of time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index f757905..d395a12 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -31,6 +31,8 @@ our @EXPORT = qw(GetActivity GetStatistics); use List::Util qw(max); use Scalar::Util qw(weaken); +use ObjectModel::Collection; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -342,9 +344,12 @@ sub GetStatistics($;$) my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); - my @JobTimes; my $Jobs = CreateJobs(); my $Cutoff = $Seconds ? (time() - $Seconds) : 0; + $Jobs->AddFilter(FilterOr(FilterNull("Ended"), + FilterValue("Ended", ">=", [$Cutoff]))); + + my @JobTimes; foreach my $Job (@{$Jobs->GetItems()}) { my $CountsAsNew = ($Job->Submitted >= $Cutoff); @@ -372,6 +377,7 @@ sub GetStatistics($;$) $GlobalStats->{"newtasks.count"}++; $HostStats->{"newtasks.count"}++ if ($HostStats); } + # The Task may have ended much earlier than the Job next if (!$Task->Ended or $Task->Ended < $Cutoff); $GlobalStats->{"donetasks.count"}++; $HostStats->{"donetasks.count"}++ if ($HostStats);

1 0

Francois Gouget : testbot/web: Show all the job.time percentiles.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: tools Branch: master Commit: 892646b54fc9a747bedd992a9b816610fb01bfd1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=892646b54fc9a747bedd992… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:57:20 2022 +0200 testbot/web: Show all the job.time percentiles. And add a bar graph to give a better sense of how the job durations stack up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 13 +++++++++---- testbot/web/WineTestBot.css | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 7ef65b3..3c0fe99 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -223,10 +223,15 @@ sub GenerateBody($) _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs."); print "<tr><td class='StatSeparator'>Job times</td><td colspan='2'><hr></td></tr>\n"; - _GenGlobalLine($GlobalStats, "jobs.time.p10", "10%", "10% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.p50", "50%", "50% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.p90", "90%", "90% of the jobs completed within this time."); - _GenGlobalLine($GlobalStats, "jobs.time.max", "Max", "The slowest job took this long. Note that this is heavily influenced by test storms."); + my $Max = $GlobalStats->{"jobs.time.max"}; + for (my $Percentile = 10; $Percentile < 100; $Percentile += 10) + { + my $Bar = 100 * $GlobalStats->{"jobs.time.p$Percentile"} / $Max; + my $Space = 100 - $Bar; + _GenGlobalLine($GlobalStats, "jobs.time.p$Percentile", "$Percentile%", + "<div class='PercentBar' style='width: ${Bar}px;'> </div><div class='PercentSpace' style='width: ${Space}px;'></div> $Percentile% of the jobs completed within this time."); + } + _GenGlobalLine($GlobalStats, "jobs.time.max", "Max", "<div class='PercentBar' style='width: 100px;'> </div> Duration of the slowest job. Note that this is heavily influenced by test storms."); print "<tr><td class='StatSeparator'>Average times</td><td colspan='2'><hr></td></tr>\n"; _GenGlobalLine($GlobalStats, "jobs.time", "Job completion", "How long it takes to complete a regular job (excluding canceled ones). Note that this is heavily influenced by test storms."); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 301ba71..53c939e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -445,3 +445,5 @@ td.Record { text-align: center; } .Record.Record-miss { border-top: thick dashed #ff6600; } td.StatSeparator { color: #601919; font-weight: bold; } +.PercentBar { background-color: #601919; display: inline-block; } +.PercentSpace { display: inline-block; }

1 0

Francois Gouget : testbot: Collect some more job.time percentile values.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: tools Branch: master Commit: b1fd79ec9994e1ae70a1319275e9355a3e483900 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b1fd79ec9994e1ae70a1319… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 14 16:57:15 2022 +0200 testbot: Collect some more job.time percentile values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 53aff05..f757905 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -415,9 +415,11 @@ sub GetStatistics($;$) if ($JobCount) { @JobTimes = sort { $a <=> $b } @JobTimes; - $GlobalStats->{"jobs.time.p10"} = $JobTimes[int($JobCount * 0.1)]; - $GlobalStats->{"jobs.time.p50"} = $JobTimes[int($JobCount * 0.5)]; - $GlobalStats->{"jobs.time.p90"} = $JobTimes[int($JobCount * 0.9)]; + for (my $P = 10; $P < 100; $P += 10) + { + my $Name = sprintf("jobs.time.p%02d", $P); + $GlobalStats->{$Name} = $JobTimes[int($JobCount * $P / 100)]; + } @JobTimes = (); # free early }

1 0

Matteo Bruni : d3dxof/tests: Remove redundant skips after ok() calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 07f22e20d73ce0a3c758d331400e765795d675a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f22e20d73ce0a3c758d331… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 13 21:53:50 2022 +0200 d3dxof/tests: Remove redundant skips after ok() calls. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/tests/d3dxof.c | 60 ---------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index edb5d8547e6..820afd87426 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -418,11 +418,6 @@ static void test_refcount(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); @@ -490,11 +485,6 @@ static void test_CreateEnumObject(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -565,11 +555,6 @@ static void test_file_types(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, empty_txt_file, sizeof(empty_txt_file) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -639,11 +624,6 @@ static void test_templates(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); ok(hr == DXFILEERR_BADFILETYPE, "Unexpected hr %#lx.\n", hr); @@ -681,11 +661,6 @@ static void test_compressed_files(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, compressed_template, sizeof(compressed_template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -728,11 +703,6 @@ static void test_getname(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template, sizeof(template) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -816,11 +786,6 @@ static void test_syntax(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -929,11 +894,6 @@ static void test_syntax_semicolon_comma(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1029,11 +989,6 @@ static void test_complex_object(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1063,11 +1018,6 @@ static void test_standard_templates(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } hr = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); @@ -1088,11 +1038,6 @@ static void test_type_index_color(void) hr = pDirectXFileCreate(&dxfile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if (!dxfile) - { - skip("Couldn't create DirectXFile interface\n"); - return; - } /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ hr = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); @@ -1241,11 +1186,6 @@ static void test_dump(void) hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - if(!lpDirectXFile) - { - skip("Couldn't create DirectXFile interface\n"); - goto exit; - } hr = IDirectXFile_RegisterTemplates(lpDirectXFile, pvData, cbSize); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d3dxof/tests: Simplify refcount helper.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 24ccf11739dc0af0861a38da87e04730fba05c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ccf11739dc0af0861a38da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 09:21:47 2022 +0300 d3dxof/tests: Simplify refcount helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/tests/d3dxof.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 05f92bab8cb..edb5d8547e6 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -394,10 +394,11 @@ static void init_function_pointers(void) pDirectXFileCreate = (void *)GetProcAddress(hd3dxof, "DirectXFileCreate"); } -static ULONG getRefcount(IUnknown *iface) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } static void test_refcount(void) @@ -423,7 +424,7 @@ static void test_refcount(void) return; } - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); ok(ref == 2, "Unexpected refcount %ld.\n", ref); @@ -437,33 +438,33 @@ static void test_refcount(void) dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); /* Enum object gets references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Nothing changes for all other objects */ - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Enum object releases references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd);

1 0

Nikolay Sivov : d3dxof/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 360e989d4451d7e2edc8a69bbafbdfc0e52208d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360e989d4451d7e2edc8a69b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 09:21:46 2022 +0300 d3dxof/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/tests/Makefile.in | 1 - dlls/d3dxof/tests/d3dxof.c | 382 +++++++++++++++++++++--------------------- 2 files changed, 191 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=360e989d4451d7e2edc8…

1 0

Alistair Leslie-Hughes : msado15: Return valid object in Recordset::Clone.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 8fbc1c1a09c70e865db2d646283a96cba20cbe79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fbc1c1a09c70e865db2d646… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 8 17:33:15 2022 +1000 msado15: Return valid object in Recordset::Clone. This is just to stop a crash when Clone is called. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 3bbb4bd3300..766c17598ce 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1794,8 +1794,12 @@ static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT boo static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) { - FIXME( "%p, %d, %p\n", iface, lock_type, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %d, %p\n", recordset, lock_type, obj ); + + *obj = iface; + recordset_AddRef( iface ); + return S_OK; } static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values )

1 0

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLAttributeCollection.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 1c4e53dbcee28e3c5c400275a0195a0d143a0b14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4e53dbcee28e3c5c400275… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:58 2022 +0300 mshtml: Implement enumerator for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 133 ++++++++++++++++++++++------------- 2 files changed, 265 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c4e53dbcee28e3c5c40…

1 0

Gabriel Ivăncescu : mshtml: Move some static functions up.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 201cc01d72af9e619da997cb9dede9360138ede2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=201cc01d72af9e619da997cb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:57 2022 +0300 mshtml: Move some static functions up. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 176 ++++++++++++++++++++++++------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9ed22495058..ea5c65b515e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7578,6 +7578,94 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters return S_OK; } +static HRESULT get_attr_dispid_by_idx(HTMLAttributeCollection *This, LONG *idx, DISPID *dispid) +{ + IDispatchEx *dispex = &This->elem->node.event_target.dispex.IDispatchEx_iface; + DISPID id = DISPID_STARTENUM; + LONG len = -1; + HRESULT hres; + + FIXME("filter non-enumerable attributes out\n"); + + while(1) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); + if(FAILED(hres)) + return hres; + else if(hres == S_FALSE) + break; + + len++; + if(len == *idx) + break; + } + + if(dispid) { + *dispid = id; + return *idx==len ? S_OK : DISP_E_UNKNOWNNAME; + } + + *idx = len+1; + return S_OK; +} + +static inline HRESULT get_attr_dispid_by_name(HTMLAttributeCollection *This, BSTR name, DISPID *id) +{ + HRESULT hres; + + if(name[0]>='0' && name[0]<='9') { + WCHAR *end_ptr; + LONG idx; + + idx = wcstoul(name, &end_ptr, 10); + if(!*end_ptr) { + hres = get_attr_dispid_by_idx(This, &idx, id); + if(SUCCEEDED(hres)) + return hres; + } + } + + if(!This->elem) { + WARN("NULL elem\n"); + return E_UNEXPECTED; + } + + hres = IDispatchEx_GetDispID(&This->elem->node.event_target.dispex.IDispatchEx_iface, + name, fdexNameCaseInsensitive, id); + return hres; +} + +static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG *list_pos, HTMLDOMAttribute **attr) +{ + HTMLDOMAttribute *iter; + LONG pos = 0; + HRESULT hres; + + *attr = NULL; + LIST_FOR_EACH_ENTRY(iter, &This->attrs, HTMLDOMAttribute, entry) { + if(iter->dispid == id) { + *attr = iter; + break; + } + pos++; + } + + if(!*attr) { + if(!This->elem) { + WARN("NULL elem\n"); + return E_UNEXPECTED; + } + + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, dispex_compat_mode(&This->elem->node.event_target.dispex), attr); + if(FAILED(hres)) + return hres; + } + + IHTMLDOMAttribute_AddRef(&(*attr)->IHTMLDOMAttribute_iface); + if(list_pos) + *list_pos = pos; + return S_OK; +} + /* interface IHTMLAttributeCollection */ static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection(IHTMLAttributeCollection *iface) { @@ -7672,94 +7760,6 @@ static HRESULT WINAPI HTMLAttributeCollection_Invoke(IHTMLAttributeCollection *i wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } -static HRESULT get_attr_dispid_by_idx(HTMLAttributeCollection *This, LONG *idx, DISPID *dispid) -{ - IDispatchEx *dispex = &This->elem->node.event_target.dispex.IDispatchEx_iface; - DISPID id = DISPID_STARTENUM; - LONG len = -1; - HRESULT hres; - - FIXME("filter non-enumerable attributes out\n"); - - while(1) { - hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); - if(FAILED(hres)) - return hres; - else if(hres == S_FALSE) - break; - - len++; - if(len == *idx) - break; - } - - if(dispid) { - *dispid = id; - return *idx==len ? S_OK : DISP_E_UNKNOWNNAME; - } - - *idx = len+1; - return S_OK; -} - -static inline HRESULT get_attr_dispid_by_name(HTMLAttributeCollection *This, BSTR name, DISPID *id) -{ - HRESULT hres; - - if(name[0]>='0' && name[0]<='9') { - WCHAR *end_ptr; - LONG idx; - - idx = wcstoul(name, &end_ptr, 10); - if(!*end_ptr) { - hres = get_attr_dispid_by_idx(This, &idx, id); - if(SUCCEEDED(hres)) - return hres; - } - } - - if(!This->elem) { - WARN("NULL elem\n"); - return E_UNEXPECTED; - } - - hres = IDispatchEx_GetDispID(&This->elem->node.event_target.dispex.IDispatchEx_iface, - name, fdexNameCaseInsensitive, id); - return hres; -} - -static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG *list_pos, HTMLDOMAttribute **attr) -{ - HTMLDOMAttribute *iter; - LONG pos = 0; - HRESULT hres; - - *attr = NULL; - LIST_FOR_EACH_ENTRY(iter, &This->attrs, HTMLDOMAttribute, entry) { - if(iter->dispid == id) { - *attr = iter; - break; - } - pos++; - } - - if(!*attr) { - if(!This->elem) { - WARN("NULL elem\n"); - return E_UNEXPECTED; - } - - hres = HTMLDOMAttribute_Create(NULL, This->elem, id, dispex_compat_mode(&This->elem->node.event_target.dispex), attr); - if(FAILED(hres)) - return hres; - } - - IHTMLDOMAttribute_AddRef(&(*attr)->IHTMLDOMAttribute_iface); - if(list_pos) - *list_pos = pos; - return S_OK; -} - static HRESULT WINAPI HTMLAttributeCollection_get_length(IHTMLAttributeCollection *iface, LONG *p) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface);

1 0

Gabriel Ivăncescu : mshtml: Implement enumerator for HTMLSelectElement.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: ba828a3024aaa9fcf864782e590bbe94ea188cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba828a3024aaa9fcf864782e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 13 17:34:56 2022 +0300 mshtml: Implement enumerator for HTMLSelectElement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 39 +++++++++++- 2 files changed, 193 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 44981a51d3c..ae6543a3d13 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -674,6 +674,15 @@ struct HTMLSelectElement { nsIDOMHTMLSelectElement *nsselect; }; +typedef struct { + IEnumVARIANT IEnumVARIANT_iface; + + LONG ref; + + ULONG iter; + HTMLSelectElement *elem; +} HTMLSelectElementEnum; + static inline HTMLSelectElement *impl_from_IHTMLSelectElement(IHTMLSelectElement *iface) { return CONTAINING_RECORD(iface, HTMLSelectElement, IHTMLSelectElement_iface); @@ -714,6 +723,135 @@ static HRESULT htmlselect_item(HTMLSelectElement *This, int i, IDispatch **ret) return S_OK; } +static inline HTMLSelectElementEnum *impl_from_IEnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectElementEnum, IEnumVARIANT_iface); +} + +static HRESULT WINAPI HTMLSelectElementEnum_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IEnumVARIANT_iface; + }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLSelectElementEnum_AddRef(IEnumVARIANT *iface) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLSelectElementEnum_Release(IEnumVARIANT *iface) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IHTMLSelectElement_Release(&This->elem->IHTMLSelectElement_iface); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLSelectElementEnum_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + nsresult nsres; + HRESULT hres; + ULONG num, i; + UINT32 len; + + TRACE("(%p)->(%lu %p %p)\n", This, celt, rgVar, pCeltFetched); + + nsres = nsIDOMHTMLSelectElement_GetLength(This->elem->nsselect, &len); + if(NS_FAILED(nsres)) + return E_FAIL; + num = min(len - This->iter, celt); + + for(i = 0; i < num; i++) { + hres = htmlselect_item(This->elem, This->iter + i, &V_DISPATCH(&rgVar[i])); + if(FAILED(hres)) { + while(i--) + VariantClear(&rgVar[i]); + return hres; + } + V_VT(&rgVar[i]) = VT_DISPATCH; + } + + This->iter += num; + if(pCeltFetched) + *pCeltFetched = num; + return num == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI HTMLSelectElementEnum_Skip(IEnumVARIANT *iface, ULONG celt) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + nsresult nsres; + UINT32 len; + + TRACE("(%p)->(%lu)\n", This, celt); + + nsres = nsIDOMHTMLSelectElement_GetLength(This->elem->nsselect, &len); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(This->iter + celt > len) { + This->iter = len; + return S_FALSE; + } + + This->iter += celt; + return S_OK; +} + +static HRESULT WINAPI HTMLSelectElementEnum_Reset(IEnumVARIANT *iface) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + + TRACE("(%p)->()\n", This); + + This->iter = 0; + return S_OK; +} + +static HRESULT WINAPI HTMLSelectElementEnum_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + HTMLSelectElementEnum *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl HTMLSelectElementEnumVtbl = { + HTMLSelectElementEnum_QueryInterface, + HTMLSelectElementEnum_AddRef, + HTMLSelectElementEnum_Release, + HTMLSelectElementEnum_Next, + HTMLSelectElementEnum_Skip, + HTMLSelectElementEnum_Reset, + HTMLSelectElementEnum_Clone +}; + static HRESULT WINAPI HTMLSelectElement_QueryInterface(IHTMLSelectElement *iface, REFIID riid, void **ppv) { @@ -1117,8 +1255,23 @@ static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, LO static HRESULT WINAPI HTMLSelectElement_get__newEnum(IHTMLSelectElement *iface, IUnknown **p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLSelectElementEnum *ret; + + TRACE("(%p)->(%p)\n", This, p); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumVARIANT_iface.lpVtbl = &HTMLSelectElementEnumVtbl; + ret->ref = 1; + ret->iter = 0; + + HTMLSelectElement_AddRef(&This->IHTMLSelectElement_iface); + ret->elem = This; + + *p = (IUnknown*)&ret->IEnumVARIANT_iface; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_item(IHTMLSelectElement *iface, VARIANT name, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bd4b7724e89..0f5120a13ec 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5425,7 +5425,10 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) static void test_select_elem(IHTMLSelectElement *select) { IDispatch *disp, *disp2; - VARIANT name, index; + VARIANT name, index, v; + IEnumVARIANT *enum_var; + IUnknown *enum_unk; + ULONG fetched; HRESULT hres; test_select_type(select, L"select-one"); @@ -5495,6 +5498,40 @@ static void test_select_elem(IHTMLSelectElement *select) IDispatch_Release(disp2); IDispatch_Release(disp); + hres = IHTMLSelectElement_get__newEnum(select, &enum_unk); + ok(hres == S_OK, "_newEnum failed: %08lx\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &DIID_DispHTMLOptionElement, &CLSID_HTMLOptionElement, NULL); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_OK, "Next failed: %08lx\n", hres); + ok(fetched == 1, "fetched = %lu\n", fetched); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) == NULL\n"); + test_disp((IUnknown*)V_DISPATCH(&v), &DIID_DispHTMLOptionElement, &CLSID_HTMLOptionElement, NULL); + VariantClear(&v); + + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(fetched == 0, "fetched = %lu\n", fetched); + IEnumVARIANT_Release(enum_var); + test_select_multiple(select, VARIANT_FALSE); test_select_set_multiple(select, VARIANT_TRUE); test_select_remove(select);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022