Gabriel Ivăncescu : mshtml: Expose window.performance in all modes.
Alexandre Julliard
julliard at winehq.org
Thu Oct 7 16:21:23 CDT 2021
Module: wine
Branch: master
Commit: 14c190fc14183f35d218cd87ee186fd3a1b5bcac
URL: https://source.winehq.org/git/wine.git/?a=commit;h=14c190fc14183f35d218cd87ee186fd3a1b5bcac
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Thu Oct 7 16:52:36 2021 +0300
mshtml: Expose window.performance in all modes.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlwindow.c | 93 ++++++++++++++++++++++++++++++++++++
dlls/mshtml/mshtml_private.h | 2 +
dlls/mshtml/mshtml_private_iface.idl | 18 +++++++
dlls/mshtml/tests/documentmode.js | 3 +-
4 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 2d4cf68447e..0b25e71063d 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -191,6 +191,8 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii
*ppv = &This->IProvideMultipleClassInfo_iface;
}else if(IsEqualGUID(&IID_IWineHTMLWindowPrivate, riid)) {
*ppv = &This->IWineHTMLWindowPrivate_iface;
+ }else if(IsEqualGUID(&IID_IWineHTMLWindowCompatPrivate, riid)) {
+ *ppv = &This->IWineHTMLWindowCompatPrivate_iface;
}else if(IsEqualGUID(&IID_IMarshal, riid)) {
*ppv = NULL;
FIXME("(%p)->(IID_IMarshal %p)\n", This, ppv);
@@ -3145,6 +3147,94 @@ static const IWineHTMLWindowPrivateVtbl WineHTMLWindowPrivateVtbl = {
window_private_get_console,
};
+static inline HTMLWindow *impl_from_IWineHTMLWindowCompatPrivateVtbl(IWineHTMLWindowCompatPrivate *iface)
+{
+ return CONTAINING_RECORD(iface, HTMLWindow, IWineHTMLWindowCompatPrivate_iface);
+}
+
+static HRESULT WINAPI window_compat_private_QueryInterface(IWineHTMLWindowCompatPrivate *iface,
+ REFIID riid, void **ppv)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv);
+}
+
+static ULONG WINAPI window_compat_private_AddRef(IWineHTMLWindowCompatPrivate *iface)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface);
+}
+
+static ULONG WINAPI window_compat_private_Release(IWineHTMLWindowCompatPrivate *iface)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IHTMLWindow2_Release(&This->IHTMLWindow2_iface);
+}
+
+static HRESULT WINAPI window_compat_private_GetTypeInfoCount(IWineHTMLWindowCompatPrivate *iface, UINT *pctinfo)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo);
+}
+
+static HRESULT WINAPI window_compat_private_GetTypeInfo(IWineHTMLWindowCompatPrivate *iface, UINT iTInfo,
+ LCID lcid, ITypeInfo **ppTInfo)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo);
+}
+
+static HRESULT WINAPI window_compat_private_GetIDsOfNames(IWineHTMLWindowCompatPrivate *iface, REFIID riid,
+ LPOLESTR *rgszNames, UINT cNames,
+ LCID lcid, DISPID *rgDispId)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid,
+ rgDispId);
+}
+
+static HRESULT WINAPI window_compat_private_Invoke(IWineHTMLWindowCompatPrivate *iface, DISPID dispIdMember,
+ REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
+ VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags,
+ pDispParams, pVarResult, pExcepInfo, puArgErr);
+}
+
+static HRESULT WINAPI window_compat_private_put_performance(IWineHTMLWindowCompatPrivate *iface, VARIANT v)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IHTMLWindow7_put_performance(&This->IHTMLWindow7_iface, v);
+}
+
+static HRESULT WINAPI window_compat_private_get_performance(IWineHTMLWindowCompatPrivate *iface, VARIANT *p)
+{
+ HTMLWindow *This = impl_from_IWineHTMLWindowCompatPrivateVtbl(iface);
+
+ return IHTMLWindow7_get_performance(&This->IHTMLWindow7_iface, p);
+}
+
+static const IWineHTMLWindowCompatPrivateVtbl WineHTMLWindowCompatPrivateVtbl = {
+ window_compat_private_QueryInterface,
+ window_compat_private_AddRef,
+ window_compat_private_Release,
+ window_compat_private_GetTypeInfoCount,
+ window_compat_private_GetTypeInfo,
+ window_compat_private_GetIDsOfNames,
+ window_compat_private_Invoke,
+ window_compat_private_put_performance,
+ window_compat_private_get_performance,
+};
+
static inline HTMLWindow *impl_from_IDispatchEx(IDispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLWindow, IDispatchEx_iface);
@@ -3649,6 +3739,8 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa
{
if(compat_mode >= COMPAT_MODE_IE9)
dispex_info_add_interface(info, IHTMLWindow7_tid, NULL);
+ else
+ dispex_info_add_interface(info, IWineHTMLWindowCompatPrivate_tid, NULL);
if(compat_mode >= COMPAT_MODE_IE10)
dispex_info_add_interface(info, IWineHTMLWindowPrivate_tid, NULL);
@@ -3715,6 +3807,7 @@ static void *alloc_window(size_t size)
window->IObjectIdentity_iface.lpVtbl = &ObjectIdentityVtbl;
window->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl;
window->IWineHTMLWindowPrivate_iface.lpVtbl = &WineHTMLWindowPrivateVtbl;
+ window->IWineHTMLWindowCompatPrivate_iface.lpVtbl = &WineHTMLWindowCompatPrivateVtbl;
window->ref = 1;
return window;
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 6ee510572e6..5cf53bb48c9 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -276,6 +276,7 @@ typedef struct EventTarget EventTarget;
XIID(IWineDOMTokenList) \
XIID(IWineHTMLElementPrivate) \
XIID(IWineHTMLWindowPrivate) \
+ XIID(IWineHTMLWindowCompatPrivate) \
XIID(IWineMSHTMLConsole)
typedef enum {
@@ -496,6 +497,7 @@ struct HTMLWindow {
IObjectIdentity IObjectIdentity_iface;
IProvideMultipleClassInfo IProvideMultipleClassInfo_iface;
IWineHTMLWindowPrivate IWineHTMLWindowPrivate_iface;
+ IWineHTMLWindowCompatPrivate IWineHTMLWindowCompatPrivate_iface;
IWineMSHTMLConsole *console;
diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl
index 5755afdfe5c..b9039c956db 100644
--- a/dlls/mshtml/mshtml_private_iface.idl
+++ b/dlls/mshtml/mshtml_private_iface.idl
@@ -18,6 +18,8 @@
#pragma makedep typelib
+#include <mshtmdid.h>
+
import "ocidl.idl";
[
@@ -89,6 +91,22 @@ interface IWineHTMLWindowPrivate : IDispatch
HRESULT console([retval, out] IDispatch **console);
}
+[
+ odl,
+ oleautomation,
+ dual,
+ hidden,
+ uuid(1b5939fc-8f84-43f3-8d89-f9a92069fad6)
+]
+interface IWineHTMLWindowCompatPrivate : IDispatch
+{
+ [propput, id(DISPID_IHTMLWINDOW7_PERFORMANCE)]
+ HRESULT performance([in] VARIANT v);
+
+ [propget, id(DISPID_IHTMLWINDOW7_PERFORMANCE)]
+ HRESULT performance([out, retval] VARIANT *p);
+}
+
[
odl,
oleautomation,
diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index c3364727ce9..d3d36ee8c3a 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -354,8 +354,7 @@ sync_test("window_props", function() {
test_exposed("requestAnimationFrame", v >= 10);
test_exposed("Map", v >= 11);
test_exposed("Set", v >= 11);
- if(v >= 9) /* FIXME: native exposes it in all compat modes */
- test_exposed("performance", true);
+ test_exposed("performance", true);
test_exposed("console", v >= 10);
});
More information about the wine-cvs
mailing list