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

Jacek Caban : jscript: Raise the stack depth limit.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: e7d265f4b93fe424d6e3c52003fbcb3ebd301f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d265f4b93fe424d6e3c520… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 18:19:33 2021 +0100 jscript: Raise the stack depth limit. Previous limit was roughly similar to IE8. Later IE versions allow much larger stacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b6930a25b65..18dc4c3f139 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -54,7 +54,7 @@ typedef struct { } u; } exprval_t; -static const size_t stack_size = 0x4000; +static const size_t stack_size = 0x40000; static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) {

1 0

Rémi Bernon : windows.media.speech: Add stub dll.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 3c502f40c483f81e19b503efce3ef8da63421737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c502f40c483f81e19b503ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:08 2021 +0100 windows.media.speech: Add stub dll. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/combase/tests/roapi.c | 4 +- dlls/windows.media.speech/Makefile.in | 9 ++ dlls/windows.media.speech/classes.idl | 19 +++ dlls/windows.media.speech/main.c | 159 +++++++++++++++++++++ .../windows.media.speech/windows.media.speech.spec | 3 + 7 files changed, 195 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a2277f9720d..4d85a6e9523 100755 --- a/configure +++ b/configure @@ -1659,6 +1659,7 @@ enable_wevtapi enable_wevtsvc enable_wiaservc enable_wimgapi +enable_windows_media_speech enable_windowscodecs enable_windowscodecsext enable_winealsa_drv @@ -21122,6 +21123,7 @@ wine_fn_config_makefile dlls/win32s16.dll16 enable_win16 wine_fn_config_makefile dlls/win87em.dll16 enable_win16 wine_fn_config_makefile dlls/winaspi.dll16 enable_win16 wine_fn_config_makefile dlls/windebug.dll16 enable_win16 +wine_fn_config_makefile dlls/windows.media.speech enable_windows_media_speech wine_fn_config_makefile dlls/windowscodecs enable_windowscodecs wine_fn_config_makefile dlls/windowscodecs/tests enable_tests wine_fn_config_makefile dlls/windowscodecsext enable_windowscodecsext diff --git a/configure.ac b/configure.ac index 1ca832102d8..9d8488113a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3801,6 +3801,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 6180ad24d68..b9cb476aafe 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -82,7 +82,7 @@ static void test_ActivationFactories(void) ok(hr == S_OK, "got %08x\n", hr); hr = pRoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); todo_wine ok(hr == S_OK, "got %08x\n", hr); @@ -90,7 +90,7 @@ static void test_ActivationFactories(void) IActivationFactory_Release(factory); hr = pRoActivateInstance(str2, &inspect); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); hr = pRoActivateInstance(str, &inspect); todo_wine ok(hr == S_OK, "got %08x\n", hr); diff --git a/dlls/windows.media.speech/Makefile.in b/dlls/windows.media.speech/Makefile.in new file mode 100644 index 00000000000..2c55daa04be --- /dev/null +++ b/dlls/windows.media.speech/Makefile.in @@ -0,0 +1,9 @@ +MODULE = windows.media.speech.dll +IMPORTS = combase uuid + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.media.speech/classes.idl b/dlls/windows.media.speech/classes.idl new file mode 100644 index 00000000000..6c141bf4768 --- /dev/null +++ b/dlls/windows.media.speech/classes.idl @@ -0,0 +1,19 @@ +/* + * 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 + */ + +#pragma makedep register + +#include "windows.media.speechsynthesis.idl" diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c new file mode 100644 index 00000000000..a6b4fb2ff0a --- /dev/null +++ b/dlls/windows.media.speech/main.c @@ -0,0 +1,159 @@ +/* WinRT Windows.Media.Speech implementation + * + * Copyright 2021 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 <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#include "windows.foundation.h" +#include "windows.media.speechsynthesis.h" + +WINE_DEFAULT_DEBUG_CHANNEL(speech); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_speech +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_speech *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_speech_Release( + IActivationFactory *iface) +{ + struct windows_media_speech *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_speech_QueryInterface, + windows_media_speech_AddRef, + windows_media_speech_Release, + /* IInspectable methods */ + windows_media_speech_GetIids, + windows_media_speech_GetRuntimeClassName, + windows_media_speech_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_speech_ActivateInstance, +}; + +static struct windows_media_speech windows_media_speech = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_speech.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.media.speech/windows.media.speech.spec b/dlls/windows.media.speech/windows.media.speech.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.speech/windows.media.speech.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheet object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: f35737a0885f4acd349f85b129aa39dd01a9bd85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35737a0885f4acd349f85b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:13 2021 +0100 mshtml: Initialize HTMLStyleSheet object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 7 ++++--- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54273f5a6e0..ad3ce941002 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1733,8 +1733,8 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR if(bstrHref && *bstrHref) { FIXME("semi-stub for href %s\n", debugstr_w(bstrHref)); - *ppnewStyleSheet = HTMLStyleSheet_Create(NULL); - return S_OK; + return create_style_sheet(NULL, dispex_compat_mode(&This->doc_node->node.event_target.dispex), + ppnewStyleSheet); } hres = create_element(This->doc_node, L"style", &elem); diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 14fd8bc8f53..0cb6bac0710 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -198,10 +198,11 @@ static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, assert(nsres == NS_OK); if(ss) { - This->style_sheet = HTMLStyleSheet_Create(ss); + HRESULT hres = create_style_sheet(ss, dispex_compat_mode(&This->element.node.event_target.dispex), + &This->style_sheet); nsIDOMStyleSheet_Release(ss); - if(!This->style_sheet) - return E_OUTOFMEMORY; + if(FAILED(hres)) + return hres; } } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index a4e3254100b..8d535a657a9 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -517,7 +517,9 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection switch(V_VT(pvarIndex)) { case VT_I4: { nsIDOMStyleSheet *nsstylesheet; + IHTMLStyleSheet *stylesheet; nsresult nsres; + HRESULT hres; TRACE("index=%d\n", V_I4(pvarIndex)); @@ -528,9 +530,12 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection return E_INVALIDARG; } - V_VT(pvarResult) = VT_DISPATCH; - V_DISPATCH(pvarResult) = (IDispatch*)HTMLStyleSheet_Create(nsstylesheet); + hres = create_style_sheet(nsstylesheet, dispex_compat_mode(&This->dispex), &stylesheet); + if(FAILED(hres)) + return hres; + V_VT(pvarResult) = VT_DISPATCH; + V_DISPATCH(pvarResult) = (IDispatch*)stylesheet; return S_OK; } @@ -938,23 +943,28 @@ static dispex_static_data_t HTMLStyleSheet_dispex = { HTMLStyleSheet_iface_tids }; -IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet *nsstylesheet) +HRESULT create_style_sheet(nsIDOMStyleSheet *nsstylesheet, compat_mode_t compat_mode, IHTMLStyleSheet **ret) { - HTMLStyleSheet *ret = heap_alloc(sizeof(HTMLStyleSheet)); + HTMLStyleSheet *style_sheet; nsresult nsres; - ret->IHTMLStyleSheet_iface.lpVtbl = &HTMLStyleSheetVtbl; - ret->ref = 1; - ret->nsstylesheet = NULL; + if(!(style_sheet = heap_alloc(sizeof(HTMLStyleSheet)))) + return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheet_iface, &HTMLStyleSheet_dispex); + style_sheet->IHTMLStyleSheet_iface.lpVtbl = &HTMLStyleSheetVtbl; + style_sheet->ref = 1; + style_sheet->nsstylesheet = NULL; + + init_dispex_with_compat_mode(&style_sheet->dispex, (IUnknown*)&style_sheet->IHTMLStyleSheet_iface, + &HTMLStyleSheet_dispex, compat_mode); if(nsstylesheet) { nsres = nsIDOMStyleSheet_QueryInterface(nsstylesheet, &IID_nsIDOMCSSStyleSheet, - (void**)&ret->nsstylesheet); + (void**)&style_sheet->nsstylesheet); if(NS_FAILED(nsres)) ERR("Could not get nsICSSStyleSheet interface: %08x\n", nsres); } - return &ret->IHTMLStyleSheet_iface; + *ret = &style_sheet->IHTMLStyleSheet_iface; + return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index be19d98637f..735f9279b04 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1019,7 +1019,7 @@ HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; -IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; +HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize HTMLNamespaceCollection object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 51e348e919b63a9ebfefcfd0d9d80374e86444ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=51e348e919b63a9ebfefcfd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:04 2021 +0100 mshtml: Initialize HTMLNamespaceCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4e56d548f47..54273f5a6e0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2637,7 +2637,8 @@ static HRESULT WINAPI HTMLDocument4_get_namespaces(IHTMLDocument4 *iface, IDispa if(!This->doc_node->namespaces) { HRESULT hres; - hres = create_namespace_collection(&This->doc_node->namespaces); + hres = create_namespace_collection(dispex_compat_mode(&This->doc_node->node.event_target.dispex), + &This->doc_node->namespaces); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 03aa7e33b16..be19d98637f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -915,7 +915,7 @@ HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(compat_mode_t,IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; -HRESULT create_namespace_collection(IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; +HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e43328bf5b2..e55753a83d9 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2330,7 +2330,7 @@ static dispex_static_data_t HTMLNamespaceCollection_dispex = { HTMLNamespaceCollection_iface_tids }; -HRESULT create_namespace_collection(IHTMLNamespaceCollection **ret) +HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCollection **ret) { HTMLNamespaceCollection *namespaces; @@ -2339,7 +2339,8 @@ HRESULT create_namespace_collection(IHTMLNamespaceCollection **ret) namespaces->IHTMLNamespaceCollection_iface.lpVtbl = &HTMLNamespaceCollectionVtbl; namespaces->ref = 1; - init_dispex(&namespaces->dispex, (IUnknown*)&namespaces->IHTMLNamespaceCollection_iface, &HTMLNamespaceCollection_dispex); + init_dispex_with_compat_mode(&namespaces->dispex, (IUnknown*)&namespaces->IHTMLNamespaceCollection_iface, + &HTMLNamespaceCollection_dispex, compat_mode); *ret = &namespaces->IHTMLNamespaceCollection_iface; return S_OK; }

1 0

Henri Verbeet : wined3d: Store the feature level in the wined3d_state structure.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 53fdee61082b10b850fcb14ccd02187eb684b007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53fdee61082b10b850fcb14c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:36 2021 +0100 wined3d: Store the feature level in the wined3d_state structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/wined3d/cs.c | 34 +++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 17 ++++++----------- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/stateblock.c | 13 +++++++++++-- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 15 +++++++++------ include/wine/wined3d.h | 2 +- 8 files changed, 63 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53fdee61082b10b850fc…

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetRulesCollection object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6c9c77fdf11a90a9b98998932bf33f0db35a2989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c9c77fdf11a90a9b9899893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:39 2021 +0100 mshtml: Initialize HTMLStyleSheetRulesCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 74f8fc9dace..271b6985d7a 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -381,21 +381,26 @@ static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { HTMLStyleSheetRulesCollection_iface_tids }; -static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsIDOMCSSRuleList *nslist) +static HRESULT create_style_sheet_rules_collection(nsIDOMCSSRuleList *nslist, compat_mode_t compat_mode, + IHTMLStyleSheetRulesCollection **ret) { - HTMLStyleSheetRulesCollection *ret; + HTMLStyleSheetRulesCollection *collection; - ret = heap_alloc(sizeof(*ret)); - ret->IHTMLStyleSheetRulesCollection_iface.lpVtbl = &HTMLStyleSheetRulesCollectionVtbl; - ret->ref = 1; - ret->nslist = nslist; + if(!(collection = heap_alloc(sizeof(*collection)))) + return E_OUTOFMEMORY; + + collection->IHTMLStyleSheetRulesCollection_iface.lpVtbl = &HTMLStyleSheetRulesCollectionVtbl; + collection->ref = 1; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetRulesCollection_iface, &HTMLStyleSheetRulesCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLStyleSheetRulesCollection_iface, + &HTMLStyleSheetRulesCollection_dispex, compat_mode); if(nslist) nsIDOMCSSRuleList_AddRef(nslist); - return &ret->IHTMLStyleSheetRulesCollection_iface; + *ret = &collection->IHTMLStyleSheetRulesCollection_iface; + return S_OK; } static inline HTMLStyleSheetsCollection *impl_from_IHTMLStyleSheetsCollection(IHTMLStyleSheetsCollection *iface) @@ -896,6 +901,7 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); nsIDOMCSSRuleList *nslist = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -905,8 +911,9 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, return E_FAIL; } - *p = HTMLStyleSheetRulesCollection_Create(nslist); - return S_OK; + hres = create_style_sheet_rules_collection(nslist, dispex_compat_mode(&This->dispex), p); + nsIDOMCSSRuleList_Release(nslist); + return hres; } static const IHTMLStyleSheetVtbl HTMLStyleSheetVtbl = {

1 0

Jacek Caban : mshtml: Initialize HTMLPerformance object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 19992377b01111fd9b92f03db2d4ae44b4abcc5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19992377b01111fd9b92f03d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:17:52 2021 +0100 mshtml: Initialize HTMLPerformance object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5d9a603e686..bc12d0decbc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * if(!This->performance_initialized) { IHTMLPerformance *performance; - hres = create_performance(&performance); + hres = create_performance(dispex_compat_mode(&This->event_target.dispex), &performance); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f870c05f2cb..03aa7e33b16 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -913,7 +913,7 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFact HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; -HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; +HRESULT create_performance(compat_mode_t,IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_namespace_collection(IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 624e66b4c95..ed65f18caaf 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2172,7 +2172,7 @@ static dispex_static_data_t HTMLPerformance_dispex = { HTMLPerformance_iface_tids }; -HRESULT create_performance(IHTMLPerformance **ret) +HRESULT create_performance(compat_mode_t compat_mode, IHTMLPerformance **ret) { HTMLPerformance *performance; @@ -2183,8 +2183,8 @@ HRESULT create_performance(IHTMLPerformance **ret) performance->IHTMLPerformance_iface.lpVtbl = &HTMLPerformanceVtbl; performance->ref = 1; - init_dispex(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, - &HTMLPerformance_dispex); + init_dispex_with_compat_mode(&performance->dispex, (IUnknown*)&performance->IHTMLPerformance_iface, + &HTMLPerformance_dispex, compat_mode); *ret = &performance->IHTMLPerformance_iface; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetRule object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 687c6685fce9ca47b5e18120340cb87f89e1fa37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=687c6685fce9ca47b5e18120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:31 2021 +0100 mshtml: Initialize HTMLStyleSheetRule object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b3ea09e8333..74f8fc9dace 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -207,29 +207,32 @@ static dispex_static_data_t HTMLStyleSheetRule_dispex = { HTMLStyleSheetRule_iface_tids }; -static IHTMLStyleSheetRule *HTMLStyleSheetRule_Create(nsIDOMCSSRule *nsstylesheetrule) +static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_mode_t compat_mode, + IHTMLStyleSheetRule **ret) { - HTMLStyleSheetRule *ret; + HTMLStyleSheetRule *rule; nsresult nsres; - if(!(ret = heap_alloc(sizeof(*ret)))) - return NULL; + if(!(rule = heap_alloc(sizeof(*rule)))) + return E_OUTOFMEMORY; - ret->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; - ret->ref = 1; - ret->nsstylesheetrule = NULL; + rule->IHTMLStyleSheetRule_iface.lpVtbl = &HTMLStyleSheetRuleVtbl; + rule->ref = 1; + rule->nsstylesheetrule = NULL; - init_dispex(&ret->dispex, (IUnknown *)&ret->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex); + init_dispex_with_compat_mode(&rule->dispex, (IUnknown *)&rule->IHTMLStyleSheetRule_iface, &HTMLStyleSheetRule_dispex, + compat_mode); if (nsstylesheetrule) { nsres = nsIDOMCSSRule_QueryInterface(nsstylesheetrule, &IID_nsIDOMCSSRule, - (void **)&ret->nsstylesheetrule); + (void **)&rule->nsstylesheetrule); if (NS_FAILED(nsres)) ERR("Could not get nsIDOMCSSRule interface: %08x\n", nsres); } - return &ret->IHTMLStyleSheetRule_iface; + *ret = &rule->IHTMLStyleSheetRule_iface; + return S_OK; } static inline HTMLStyleSheetRulesCollection *impl_from_IHTMLStyleSheetRulesCollection(IHTMLStyleSheetRulesCollection *iface) @@ -339,13 +342,13 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu } static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface, - LONG index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule) + LONG index, IHTMLStyleSheetRule **p) { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); nsIDOMCSSRule *nsstylesheetrule; nsresult nsres; - TRACE("(%p)->(%d %p)\n", This, index, ppHTMLStyleSheetRule); + TRACE("(%p)->(%d %p)\n", This, index, p); nsres = nsIDOMCSSRuleList_Item(This->nslist, index, &nsstylesheetrule); if(NS_FAILED(nsres)) @@ -353,8 +356,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol if(!nsstylesheetrule) return E_INVALIDARG; - *ppHTMLStyleSheetRule = HTMLStyleSheetRule_Create(nsstylesheetrule); - return *ppHTMLStyleSheetRule ? S_OK : E_OUTOFMEMORY; + return create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); } static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = {

1 0

Henri Verbeet : wined3d: Introduce wined3d_state_reset().
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 7dadbc586ec991eb7eab738e4c92a740596e32d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dadbc586ec991eb7eab738e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 16:11:35 2021 +0100 wined3d: Introduce wined3d_state_reset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 +---- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/wined3d_private.h | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6bb628b5d13..0d28cb7e0b1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2079,11 +2079,8 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { - struct wined3d_adapter *adapter = cs->c.device->adapter; - state_cleanup(&cs->state); - memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 289c5d941d6..4fb6063741a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1251,8 +1251,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -5754,8 +5753,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->adapter->adapter_ops->adapter_uninit_3d(device); - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86d8061d005..06c7d74d199 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3710,6 +3710,18 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, uint32_t flags) DECLSPEC_HIDDEN; +void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; + +static inline void wined3d_state_reset(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + uint32_t flags = state->flags; + + memset(state, 0, sizeof(*state)); + state_init(state, d3d_info, flags); +} + static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) { if (!state->depth_stencil_state) @@ -4639,10 +4651,6 @@ struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_li HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, const struct wined3d_light *params, struct wined3d_light_info **light_info) DECLSPEC_HIDDEN; -void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; -void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; - enum wined3d_cs_queue_id { WINED3D_CS_QUEUE_DEFAULT = 0,

1 0

Jacek Caban : mshtml: Initialize HTMLStyleSheetsCollection object with compat mode.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 23ce468b2ab60636aca66d0dca1b8ec976b6d3b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ce468b2ab60636aca66d0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 15 16:18:24 2021 +0100 mshtml: Initialize HTMLStyleSheetsCollection object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 9 +++++---- dlls/mshtml/htmlstylesheet.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ad3ce941002..ad326f858ee 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1647,6 +1647,7 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, HTMLDocument *This = impl_from_IHTMLDocument2(iface); nsIDOMStyleSheetList *nsstylelist; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -1660,13 +1661,13 @@ static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface, nsres = nsIDOMHTMLDocument_GetStyleSheets(This->doc_node->nsdoc, &nsstylelist); if(NS_FAILED(nsres)) { ERR("GetStyleSheets failed: %08x\n", nsres); - return E_FAIL; + return map_nsresult(nsres); } - *p = HTMLStyleSheetsCollection_Create(nsstylelist); + hres = create_style_sheet_collection(nsstylelist, + dispex_compat_mode(&This->doc_node->node.event_target.dispex), p); nsIDOMStyleSheetList_Release(nsstylelist); - - return S_OK; + return hres; } static HRESULT WINAPI HTMLDocument_put_onbeforeupdate(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 8d535a657a9..b3ea09e8333 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -573,21 +573,26 @@ static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { HTMLStyleSheetsCollection_iface_tids }; -IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList *nslist) +HRESULT create_style_sheet_collection(nsIDOMStyleSheetList *nslist, compat_mode_t compat_mode, + IHTMLStyleSheetsCollection **ret) { - HTMLStyleSheetsCollection *ret = heap_alloc(sizeof(HTMLStyleSheetsCollection)); + HTMLStyleSheetsCollection *collection; - ret->IHTMLStyleSheetsCollection_iface.lpVtbl = &HTMLStyleSheetsCollectionVtbl; - ret->ref = 1; + if(!(collection = heap_alloc(sizeof(HTMLStyleSheetsCollection)))) + return E_OUTOFMEMORY; + + collection->IHTMLStyleSheetsCollection_iface.lpVtbl = &HTMLStyleSheetsCollectionVtbl; + collection->ref = 1; if(nslist) nsIDOMStyleSheetList_AddRef(nslist); - ret->nslist = nslist; + collection->nslist = nslist; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheetsCollection_iface, - &HTMLStyleSheetsCollection_dispex); + init_dispex_with_compat_mode(&collection->dispex, (IUnknown*)&collection->IHTMLStyleSheetsCollection_iface, + &HTMLStyleSheetsCollection_dispex, compat_mode); - return &ret->IHTMLStyleSheetsCollection_iface; + *ret = &collection->IHTMLStyleSheetsCollection_iface; + return S_OK; } static inline HTMLStyleSheet *impl_from_IHTMLStyleSheet(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 735f9279b04..5fc049cf80f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1020,7 +1020,8 @@ HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; -IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT create_style_sheet_collection(nsIDOMStyleSheetList*,compat_mode_t, + IHTMLStyleSheetsCollection**) DECLSPEC_HIDDEN; HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN;

1 0