[PATCH 01/10] mshtml: Add support for screen prototype objects.

[Jacek Caban]

From: Jacek Caban

---
 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 b98671188be..405f16184f9 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -466,6 +466,7 @@ typedef struct {
     X(SVGTSpanElement)                     \
     X(SVGTextContentElement)               \
     X(SVGTextPositioningElement)           \
+    X(Screen)                              \
     X(Storage)                             \
     X(StorageEvent)                        \
     X(StyleSheet)                          \
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index 043709d6de8..7b63ff85ff3 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -416,15 +416,15 @@ static const dispex_static_data_vtbl_t HTMLScreen_dispex_vtbl = {
     .destructor       = HTMLScreen_destructor,
 };

-static const tid_t HTMLScreen_iface_tids[] = {
+static const tid_t Screen_iface_tids[] = {
     IHTMLScreen_tid,
     0
 };
-static dispex_static_data_t HTMLScreen_dispex = {
-    "Screen",
-    &HTMLScreen_dispex_vtbl,
-    DispHTMLScreen_tid,
-    HTMLScreen_iface_tids
+dispex_static_data_t Screen_dispex = {
+    .id         = PROT_Screen,
+    .vtbl       = &HTMLScreen_dispex_vtbl,
+    .disp_tid   = DispHTMLScreen_tid,
+    .iface_tids = Screen_iface_tids,
 };

HRESULT create_html_screen(HTMLInnerWindow *window, IHTMLScreen **ret)
@@ -437,7 +437,7 @@ HRESULT create_html_screen(HTMLInnerWindow *window, IHTMLScreen **ret)

screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl;

-    init_dispatch(&screen->dispex, &HTMLScreen_dispex, window,
+    init_dispatch(&screen->dispex, &Screen_dispex, window,
                   dispex_compat_mode(&window->event_target.dispex));

*ret = &screen->IHTMLScreen_iface;
diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js
index 18749938658..0232e41e843 100644
--- a/dlls/mshtml/tests/documentmode.js
+++ b/dlls/mshtml/tests/documentmode.js
@@ -3263,4 +3263,6 @@ sync_test("prototypes", function() {
     }
     check(document.createEvent("StorageEvent"), StorageEvent.prototype, "storage event");
     check(StorageEvent.prototype, Event.prototype, "storage event prototype");
+    check(screen, Screen.prototype, "screen");
+    check(Screen.prototype, Object.prototype, "screen prototype");
 });