From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 14 +++++++------- dlls/mshtml/tests/documentmode.js | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 25cc0e1ce84..7ccc7fb163f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -461,6 +461,7 @@ typedef struct { X(Navigator) \ X(Node) \ X(PageTransitionEvent) \ + X(PerformanceNavigation) \ X(PerformanceTiming) \ X(PluginArray) \ X(ProgressEvent) \ diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 681f1926bfa..35357f32312 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1642,15 +1642,15 @@ static const dispex_static_data_vtbl_t HTMLPerformanceNavigation_dispex_vtbl = { .unlink = HTMLPerformanceNavigation_unlink };
-static const tid_t HTMLPerformanceNavigation_iface_tids[] = { +static const tid_t PerformanceNavigation_iface_tids[] = { IHTMLPerformanceNavigation_tid, 0 }; -static dispex_static_data_t HTMLPerformanceNavigation_dispex = { - "PerformanceNavigation", - &HTMLPerformanceNavigation_dispex_vtbl, - IHTMLPerformanceNavigation_tid, - HTMLPerformanceNavigation_iface_tids +dispex_static_data_t PerformanceNavigation_dispex = { + .id = PROT_PerformanceNavigation, + .vtbl = &HTMLPerformanceNavigation_dispex_vtbl, + .disp_tid = IHTMLPerformanceNavigation_tid, + .iface_tids = PerformanceNavigation_iface_tids, };
typedef struct { @@ -1687,7 +1687,7 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface, navigation->window = This->window; IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface);
- init_dispatch(&navigation->dispex, &HTMLPerformanceNavigation_dispex, This->window, + init_dispatch(&navigation->dispex, &PerformanceNavigation_dispex, This->window, dispex_compat_mode(&This->dispex));
This->navigation = &navigation->IHTMLPerformanceNavigation_iface; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 8c425db8e34..a5743717060 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -3275,4 +3275,6 @@ sync_test("prototypes", function() { } check(performance.timing, PerformanceTiming.prototype, "timing"); check(PerformanceTiming.prototype, Object.prototype, "timing prototype"); + check(performance.navigation, PerformanceNavigation.prototype, "navigation"); + check(PerformanceNavigation.prototype, Object.prototype, "navigation prototype"); });