September 2023 - Wine-Commits

Rémi Bernon : dmime/tests: Test band track and DMUS_PATCH_PMSG.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 4ea18f87cc2e4184a30d0ee01885811b3d9deb5f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ea18f87cc2e4184a30d0ee0188581… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 19:16:35 2023 +0200 dmime/tests: Test band track and DMUS_PATCH_PMSG. --- dlls/dmime/tests/dmime.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+)

1 0

Rémi Bernon : dmime/tests: Add some DMUS_NOTIFICATION_PMSG tests.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: b1bf0f0296da6b1df5b5f58c9b232db730d93464 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bf0f0296da6b1df5b5f58c9b232d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 15:43:03 2023 +0200 dmime/tests: Add some DMUS_NOTIFICATION_PMSG tests. --- dlls/dmime/tests/dmime.c | 284 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 277 insertions(+), 7 deletions(-)

1 0

Piotr Caban : msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 3b155ea637c024096ee8300b4667503b97a219ba URL: https://gitlab.winehq.org/wine/wine/-/commit/3b155ea637c024096ee8300b466750… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 20 19:00:39 2023 +0200 msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions. --- dlls/msvcp90/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6be2bad1a38..6f2288bce1c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -516,8 +516,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor { const char *locale = NULL; - /* This function is probably modifying more global objects */ - FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + TRACE("(%p %d %s)\n", locinfo, category, locstr); if(!locstr) _Xruntime_error("bad locale name"); @@ -622,8 +621,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con { const char *locale = NULL; - /* This function is probably modifying more global objects */ - FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + TRACE("(%p %d %s)\n", locinfo, category, locstr); if(!locstr) _Xruntime_error("bad locale name");

1 0

Rémi Bernon : dmime/tests: Test wave segments and DMUS_WAVE_PMSG.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: c04e686ad5801b581b43ca58926692075eb39e89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c04e686ad5801b581b43ca58926692… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 17:28:30 2023 +0200 dmime/tests: Test wave segments and DMUS_WAVE_PMSG. --- dlls/dmime/tests/Makefile.in | 2 + dlls/dmime/tests/dmime.c | 168 +++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/resource.rc | 23 ++++++ dlls/dmime/tests/test.wav | Bin 0 -> 4488 bytes 4 files changed, 193 insertions(+) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f4c47038e54..2491f9ff1b8 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = user32 ole32 dsound C_SRCS = \ dmime.c \ performance.c + +RC_SRCS = resource.rc diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e011488d126..e76949e71c7 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -55,6 +55,28 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO } } +static void load_resource(const WCHAR *name, WCHAR *filename) +{ + static WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(path), path); + GetTempFileNameW(path, name, 0, filename); + + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %lu\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, name, (const WCHAR *)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleW(NULL ), res )); + WriteFile(file, ptr, SizeofResource(GetModuleHandleW(NULL ), res ), &written, NULL); + ok(written == SizeofResource(GetModuleHandleW(NULL ), res ), "couldn't write resource\n"); + CloseHandle(file); +} + struct test_tool { IDirectMusicTool IDirectMusicTool_iface; @@ -2244,6 +2266,151 @@ static void test_notification_pmsg(void) IDirectMusicTool_Release(tool); } +static void test_wave_pmsg(void) +{ + static const DWORD message_types[] = + { + DMUS_PMSGT_DIRTY, + DMUS_PMSGT_WAVE, + }; + IDirectMusicPerformance *performance; + IDirectMusicSegment *segment; + IDirectMusicLoader8 *loader; + IDirectMusicGraph *graph; + WCHAR test_wav[MAX_PATH]; + IDirectMusicTool *tool; + DMUS_WAVE_PMSG *wave; + MUSIC_TIME length; + DMUS_PMSG *msg; + HRESULT hr; + DWORD ret; + + hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance, (void **)&performance); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void **)&graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_SetGraph(performance, graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicGraph_Release(graph); + + hr = IDirectMusicPerformance8_InitAudio((IDirectMusicPerformance8 *)performance, NULL, NULL, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + + load_resource(L"test.wav", test_wav); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader8, (void **)&loader); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicLoader8_LoadObjectFromFile(loader, &CLSID_DirectMusicSegment, + &IID_IDirectMusicSegment, test_wav, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicLoader8_Release(loader); + + + length = 0xdeadbeef; + hr = IDirectMusicSegment_GetLength(segment, &length); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(length == 1, "got %lu\n", length); + + + /* without Download, no DMUS_PMSGT_WAVE is sent */ + + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 100, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + ok(!msg, "got %p\n", msg); + + + /* a single DMUS_PMSGT_WAVE message is sent with punkUser set */ + + hr = IDirectMusicSegment8_Download((IDirectMusicSegment8 *)segment, (IUnknown *)performance); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); + ok(!!wave->punkUser, "got %p\n", wave->punkUser); + ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); + ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); + ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); + ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); + ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); + ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 100, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + ok(!msg, "got %p\n", msg); + + + IDirectMusicSegment_Release(segment); + + + hr = IDirectMusicPerformance_CloseDown(performance); + ok(hr == S_OK, "got %#lx\n", hr); + + IDirectMusicPerformance_Release(performance); + IDirectMusicTool_Release(tool); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -2272,6 +2439,7 @@ START_TEST(dmime) test_performance_time(); test_performance_pmsg(); test_notification_pmsg(); + test_wave_pmsg(); CoUninitialize(); } diff --git a/dlls/dmime/tests/resource.rc b/dlls/dmime/tests/resource.rc new file mode 100644 index 00000000000..d49b647b934 --- /dev/null +++ b/dlls/dmime/tests/resource.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Rémi Bernon 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 "windef.h" + +/* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ +/* @makedep: test.wav */ +test.wav RCDATA test.wav diff --git a/dlls/dmime/tests/test.wav b/dlls/dmime/tests/test.wav new file mode 100644 index 00000000000..51d23936196 Binary files /dev/null and b/dlls/dmime/tests/test.wav differ

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's invoke for all nodes.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 5b59ba0cc1384b99aa734ab0deb2c964fdd1f280 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b59ba0cc1384b99aa734ab0deb2c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's invoke for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 13 ------------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 6 +++--- dlls/mshtml/htmlframe.c | 12 ++++++------ dlls/mshtml/htmlobject.c | 6 +++--- dlls/mshtml/htmlselect.c | 11 +++-------- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 15 insertions(+), 36 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the event_target vtbl's handle_event for all nodes.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: ee80f1a07854479c443e6b409e9c759dcfae1410 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee80f1a07854479c443e6b409e9c75… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:31 2023 +0300 mshtml: Use the event_target vtbl's handle_event for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 13 ++++--------- dlls/mshtml/htmlarea.c | 13 ++++--------- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlelem.c | 16 +++++----------- dlls/mshtml/htmlevent.c | 5 ++--- dlls/mshtml/htmlevent.h | 5 ++--- dlls/mshtml/htmlform.c | 13 ++++--------- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlobject.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 2 +- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/svg.c | 4 ++++ 22 files changed, 49 insertions(+), 70 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's get_name for all nodes.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 85750f0963548bbd0e2671045c7e747288206f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/85750f0963548bbd0e2671045c7e74… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's get_name for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 11 ----------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 6 +++--- dlls/mshtml/htmlframe.c | 12 ++++++------ dlls/mshtml/htmlobject.c | 6 +++--- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ed8d3923854..8fdce41df99 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6886,17 +6886,6 @@ void HTMLElement_destructor(DispatchEx *dispex) HTMLDOMNode_destructor(&This->node.event_target.dispex); } -HRESULT HTMLElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) -{ - HTMLElement *This = impl_from_DispatchEx(dispex); - - if(This->node.vtbl->get_name) - return This->node.vtbl->get_name(&This->node, id, name); - - ERR("(%p): element has no get_name method\n", This); - return DISP_E_MEMBERNOTFOUND; -} - HRESULT HTMLElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e6031168ac8..cf17dc9943c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -145,7 +145,6 @@ ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*); IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*); #define HTMLELEMENT_DISPEX_VTBL_ENTRIES \ - .get_name = HTMLElement_get_name, \ .invoke = HTMLElement_invoke, \ .populate_props = HTMLElement_populate_props diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b5159ef4888..7f1986b839f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -902,9 +902,9 @@ static HRESULT HTMLFormElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD g return hres; } -static HRESULT HTMLFormElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFormElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + HTMLFormElement *This = impl_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; nsIDOMHTMLCollection *elements; nsresult nsres; @@ -967,7 +967,6 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLFormElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .get_name = HTMLFormElement_dispex_get_name, .invoke = HTMLFormElement_invoke, }; @@ -979,6 +978,7 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = { .traverse = HTMLFormElement_traverse, .unlink = HTMLFormElement_unlink, .get_dispid = HTMLFormElement_get_dispid, + .get_name = HTMLFormElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 77185dea6ef..f122066af9c 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -974,9 +974,9 @@ static HRESULT HTMLFrameElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); } -static HRESULT HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFrameElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + HTMLFrameElement *This = frame_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; if(!This->framebase.content_window || @@ -1009,7 +1009,6 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLFrameElement_get_document, .get_readystate = HTMLFrameElement_get_readystate, - .get_name = HTMLFrameElement_get_name, .invoke = HTMLFrameElement_invoke, .bind_to_tree = HTMLFrameElement_bind_to_tree, }; @@ -1022,6 +1021,7 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = { .traverse = HTMLFrameElement_traverse, .unlink = HTMLFrameElement_unlink, .get_dispid = HTMLFrameElement_get_dispid, + .get_name = HTMLFrameElement_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; @@ -1564,9 +1564,9 @@ static HRESULT HTMLIFrame_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); } -static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLIFrame_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + HTMLIFrame *This = iframe_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; if(!This->framebase.content_window || @@ -1599,7 +1599,6 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLIFrame_get_document, .get_readystate = HTMLIFrame_get_readystate, - .get_name = HTMLIFrame_get_name, .invoke = HTMLIFrame_invoke, .bind_to_tree = HTMLIFrame_bind_to_tree, }; @@ -1612,6 +1611,7 @@ static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = { .traverse = HTMLIFrame_traverse, .unlink = HTMLIFrame_unlink, .get_dispid = HTMLIFrame_get_dispid, + .get_name = HTMLIFrame_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 3a8dbdb1f02..bff2fc64bb8 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -719,9 +719,9 @@ static HRESULT HTMLObjectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return get_plugin_dispid(&This->plugin_container, name, dispid); } -static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLObjectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + HTMLObjectElement *This = impl_from_DispatchEx(dispex); FIXME("(%p)->(%lx %p)\n", This, id, name); @@ -745,7 +745,6 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_readystate = HTMLObjectElement_get_readystate, - .get_name = HTMLObjectElement_dispex_get_name, .invoke = HTMLObjectElement_invoke, }; @@ -757,6 +756,7 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = { .traverse = HTMLObjectElement_traverse, .unlink = HTMLObjectElement_unlink, .get_dispid = HTMLObjectElement_get_dispid, + .get_name = HTMLObjectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a9b53dfacee..20906c86037 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1373,7 +1373,7 @@ static HRESULT HTMLSelectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return S_OK; } -static HRESULT HTMLSelectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLSelectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { DWORD idx = id - DISPID_OPTIONCOL_0; WCHAR buf[11]; @@ -1427,7 +1427,6 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLSelectElementImpl_put_disabled, .get_disabled = HTMLSelectElementImpl_get_disabled, - .get_name = HTMLSelectElement_dispex_get_name, .invoke = HTMLSelectElement_invoke, }; @@ -1439,6 +1438,7 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = { .traverse = HTMLSelectElement_traverse, .unlink = HTMLSelectElement_unlink, .get_dispid = HTMLSelectElement_get_dispid, + .get_name = HTMLSelectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d08768fa012..0779db88dd8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -822,7 +822,6 @@ typedef struct { HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*); - HRESULT (*get_name)(HTMLDOMNode*,DISPID,BSTR*); HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*bind_to_tree)(HTMLDOMNode*); BOOL (*is_text_edit)(HTMLDOMNode*); @@ -1209,7 +1208,6 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t); void *HTMLElement_query_interface(DispatchEx*,REFIID); void HTMLElement_destructor(DispatchEx*); -HRESULT HTMLElement_get_name(DispatchEx*,DISPID,BSTR*); HRESULT HTMLElement_invoke(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT HTMLElement_populate_props(DispatchEx*); HRESULT HTMLElement_clone(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's destructor for all nodes.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 70dcbe73acb6357cf60aca21d6442459ebf91db0 URL: https://gitlab.winehq.org/wine/wine/-/commit/70dcbe73acb6357cf60aca21d64424… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's destructor for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmldoc.c | 23 ++++++++++------------- dlls/mshtml/htmlelem.c | 7 ++++--- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 14 +++++++------- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlnode.c | 2 -- dlls/mshtml/htmlobject.c | 10 +++++----- dlls/mshtml/htmlscript.c | 8 ++++---- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 13 ++++--------- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/svg.c | 8 ++++---- 23 files changed, 60 insertions(+), 71 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's get_dispid for all nodes.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: a5ab4baed7042f772f1e8931c2c39c4ef44f167d URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ab4baed7042f772f1e8931c2c39c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's get_dispid for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 10 ---------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 8 ++++---- dlls/mshtml/htmlframe.c | 16 ++++++++-------- dlls/mshtml/htmlobject.c | 8 ++++---- dlls/mshtml/htmlselect.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 19 insertions(+), 32 deletions(-)

1 0

Zebediah Figura : d3d10core/tests: Test performing a full clear after a draw.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: ae1e5ec35c805a02a3e4ad3f1970ac8f1cb03c0b URL: https://gitlab.winehq.org/wine/wine/-/commit/ae1e5ec35c805a02a3e4ad3f1970ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 26 19:04:09 2023 -0500 d3d10core/tests: Test performing a full clear after a draw. --- dlls/d3d10core/tests/d3d10core.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 98673944237..b337c05f056 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19664,6 +19664,46 @@ static void test_layered_rtv_mismatch(void) release_test_context(&test_context); } +/* A regression test for a broken clear path in the Vulkan renderer. */ +static void test_clear_after_draw(void) +{ + static const struct vec4 black = {0.0f, 0.0f, 0.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + struct resource_readback rb; + ID3D10Device *device; + unsigned int colour; + + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 0.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f}, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + test_context.vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + clear_backbuffer_rtv(&test_context, &black); + draw_color_quad(&test_context, &green); + clear_backbuffer_rtv(&test_context, &red); + draw_color_quad(&test_context, &green); + + get_texture_readback(test_context.backbuffer, 0, &rb); + colour = get_readback_color(&rb, 160, 120); + ok(colour == 0xff0000ff, "Got unexpected colour 0x%08x.\n", colour); + colour = get_readback_color(&rb, 160, 360); + ok(colour == 0xff00ff00, "Got unexpected colour 0x%08x.\n", colour); + release_resource_readback(&rb); + + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19808,6 +19848,7 @@ START_TEST(d3d10core) queue_test(test_stencil_only_write_after_clear); queue_test(test_vertex_formats); queue_test(test_layered_rtv_mismatch); + queue_test(test_clear_after_draw); run_queued_tests();

1 0