mshtml: Implement pageshow event.

dlls/mshtml/htmlevent.c

@@ -68,6 +68,7 @@ typedef enum {
     EVENT_TYPE_MOUSE,
     EVENT_TYPE_FOCUS,
     EVENT_TYPE_UIEVENT,
+    EVENT_TYPE_PAGETRANSITION,
     EVENT_TYPE_MESSAGE,
     EVENT_TYPE_PROGRESS,
     EVENT_TYPE_STORAGE,
@@ -82,6 +83,7 @@ static const WCHAR *event_types[] = {
     L"MouseEvent",
     L"Event", /* FIXME */
     L"UIEvent",
+    L"Event", /* FIXME */
     L"MessageEvent",
     L"ProgressEvent",
     L"StorageEvent",
@@ -182,6 +184,8 @@ static const event_info_t event_info[] = {
         EVENT_FIXME},
     {L"msthumbnailclick",  EVENT_TYPE_MOUSE,     DISPID_EVPROP_ONMSTHUMBNAILCLICK,
         EVENT_FIXME},
+    {L"pageshow",          EVENT_TYPE_PAGETRANSITION, DISPID_EVPROP_ONPAGESHOW,
+        0},
     {L"paste",             EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE,
         EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
     {L"progress",          EVENT_TYPE_PROGRESS,  DISPID_EVPROP_PROGRESS,
@@ -2211,6 +2215,98 @@ static void DOMKeyboardEvent_destroy(DOMEvent *event)
 
 typedef struct {
     DOMEvent event;
+    IWinePageTransitionEvent IWinePageTransitionEvent_iface;
+} DOMPageTransitionEvent;
+
+static inline DOMPageTransitionEvent *impl_from_IWinePageTransitionEvent(IWinePageTransitionEvent *iface)
+{
+    return CONTAINING_RECORD(iface, DOMPageTransitionEvent, IWinePageTransitionEvent_iface);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_QueryInterface(IWinePageTransitionEvent *iface, REFIID riid, void **ppv)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDOMEvent_QueryInterface(&This->event.IDOMEvent_iface, riid, ppv);
+}
+
+static ULONG WINAPI DOMPageTransitionEvent_AddRef(IWinePageTransitionEvent *iface)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDOMEvent_AddRef(&This->event.IDOMEvent_iface);
+}
+
+static ULONG WINAPI DOMPageTransitionEvent_Release(IWinePageTransitionEvent *iface)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDOMEvent_Release(&This->event.IDOMEvent_iface);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_GetTypeInfoCount(IWinePageTransitionEvent *iface, UINT *pctinfo)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDispatchEx_GetTypeInfoCount(&This->event.dispex.IDispatchEx_iface, pctinfo);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_GetTypeInfo(IWinePageTransitionEvent *iface, UINT iTInfo,
+                                                   LCID lcid, ITypeInfo **ppTInfo)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDispatchEx_GetTypeInfo(&This->event.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_GetIDsOfNames(IWinePageTransitionEvent *iface, REFIID riid,
+        LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDispatchEx_GetIDsOfNames(&This->event.dispex.IDispatchEx_iface, riid, rgszNames, cNames,
+            lcid, rgDispId);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_Invoke(IWinePageTransitionEvent *iface, DISPID dispIdMember,
+        REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
+        EXCEPINFO *pExcepInfo, UINT *puArgErr)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+    return IDispatchEx_Invoke(&This->event.dispex.IDispatchEx_iface, dispIdMember, riid, lcid,
+            wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+}
+
+static HRESULT WINAPI DOMPageTransitionEvent_get_persisted(IWinePageTransitionEvent *iface, VARIANT_BOOL *p)
+{
+    DOMPageTransitionEvent *This = impl_from_IWinePageTransitionEvent(iface);
+
+    FIXME("(%p)->(%p): always returning FALSE\n", This, p);
+
+    *p = VARIANT_FALSE;
+    return S_OK;
+}
+
+static const IWinePageTransitionEventVtbl DOMPageTransitionEventVtbl = {
+    DOMPageTransitionEvent_QueryInterface,
+    DOMPageTransitionEvent_AddRef,
+    DOMPageTransitionEvent_Release,
+    DOMPageTransitionEvent_GetTypeInfoCount,
+    DOMPageTransitionEvent_GetTypeInfo,
+    DOMPageTransitionEvent_GetIDsOfNames,
+    DOMPageTransitionEvent_Invoke,
+    DOMPageTransitionEvent_get_persisted
+};
+
+static DOMPageTransitionEvent *DOMPageTransitionEvent_from_DOMEvent(DOMEvent *event)
+{
+    return CONTAINING_RECORD(event, DOMPageTransitionEvent, event);
+}
+
+static void *DOMPageTransitionEvent_query_interface(DOMEvent *event, REFIID riid)
+{
+    DOMPageTransitionEvent *page_transition_event = DOMPageTransitionEvent_from_DOMEvent(event);
+    if(IsEqualGUID(&IID_IWinePageTransitionEvent, riid))
+        return &page_transition_event->IWinePageTransitionEvent_iface;
+    return NULL;
+}
+
+typedef struct {
+    DOMEvent event;
     IDOMCustomEvent IDOMCustomEvent_iface;
     VARIANT detail;
 } DOMCustomEvent;
@@ -2837,6 +2933,20 @@ static dispex_static_data_t DOMKeyboardEvent_dispex = {
     DOMKeyboardEvent_iface_tids
 };
 
+static void DOMPageTransitionEvent_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
+{
+    if(mode >= COMPAT_MODE_IE11)
+        dispex_info_add_interface(info, IWinePageTransitionEvent_tid, NULL);
+}
+
+dispex_static_data_t DOMPageTransitionEvent_dispex = {
+    L"PageTransitionEvent",
+    NULL,
+    DispDOMEvent_tid,
+    DOMEvent_iface_tids,
+    DOMPageTransitionEvent_init_dispex_info
+};
+
 static const tid_t DOMCustomEvent_iface_tids[] = {
     IDOMEvent_tid,
     IDOMCustomEvent_tid,
@@ -2961,6 +3071,15 @@ static DOMEvent *keyboard_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_
     return &keyboard_event->ui_event.event;
 }
 
+static DOMEvent *page_transition_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
+{
+    DOMPageTransitionEvent *page_transition_event = event_ctor(sizeof(DOMCustomEvent), &DOMPageTransitionEvent_dispex,
+            DOMPageTransitionEvent_query_interface, NULL, nsevent, event_id, compat_mode);
+    if(!page_transition_event) return NULL;
+    page_transition_event->IWinePageTransitionEvent_iface.lpVtbl = &DOMPageTransitionEventVtbl;
+    return &page_transition_event->event;
+}
+
 static DOMEvent *custom_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t event_id, compat_mode_t compat_mode)
 {
     DOMCustomEvent *custom_event = event_ctor(sizeof(DOMCustomEvent), &DOMCustomEvent_dispex,
@@ -3015,6 +3134,7 @@ static const struct {
     [EVENT_TYPE_CLIPBOARD]      = { NULL,                         generic_event_ctor },
     [EVENT_TYPE_FOCUS]          = { NULL,                         generic_event_ctor },
     [EVENT_TYPE_DRAG]           = { NULL,                         generic_event_ctor },
+    [EVENT_TYPE_PAGETRANSITION] = { NULL,                         page_transition_event_ctor },
     [EVENT_TYPE_CUSTOM]         = { &IID_nsIDOMCustomEvent,       custom_event_ctor },
     [EVENT_TYPE_PROGRESS]       = { &IID_nsIDOMProgressEvent,     progress_event_ctor },
     [EVENT_TYPE_MESSAGE]        = { NULL,                         message_event_ctor },

dlls/mshtml/htmlevent.h

@@ -51,6 +51,7 @@ typedef enum {
     EVENTID_MOUSEUP,
     EVENTID_MOUSEWHEEL,
     EVENTID_MSTHUMBNAILCLICK,
+    EVENTID_PAGESHOW,
     EVENTID_PASTE,
     EVENTID_PROGRESS,
     EVENTID_READYSTATECHANGE,

dlls/mshtml/mshtml_private.h

@@ -288,6 +288,7 @@ typedef struct EventTarget EventTarget;
     XIID(IWineHTMLElementPrivate) \
     XIID(IWineHTMLWindowPrivate) \
     XIID(IWineHTMLWindowCompatPrivate) \
+    XIID(IWinePageTransitionEvent) \
     XIID(IWineXMLHttpRequestPrivate) \
     XIID(IWineMSHTMLConsole) \
     XIID(IWineMSHTMLMediaQueryList)

dlls/mshtml/mshtml_private_iface.idl

@@ -162,6 +162,20 @@ interface IWineDOMTokenList : IDispatch
     HRESULT toString([retval, out] BSTR *String);
 }
 
+[
+    odl,
+    oleautomation,
+    dual,
+    hidden,
+    uuid(25508c5d-6a54-6888-8f41-75ff3ae8706b)
+]
+interface IWinePageTransitionEvent : IDispatch
+{
+    [propget, id(1)]
+    HRESULT persisted([retval, out] VARIANT_BOOL *ret);
+}
+
+
 const long DISPID_IWINEXMLHTTPREQUESTPRIVATE_RESPONSE = 1;
 const long DISPID_IWINEXMLHTTPREQUESTPRIVATE_RESPONSETYPE = 2;
 const long DISPID_IWINEXMLHTTPREQUESTPRIVATE_UPLOAD = 3;

dlls/mshtml/nsevents.c

@@ -56,6 +56,7 @@ typedef struct {
 static nsresult NSAPI handle_blur(nsIDOMEventListener*,nsIDOMEvent*);
 static nsresult NSAPI handle_focus(nsIDOMEventListener*,nsIDOMEvent*);
 static nsresult NSAPI handle_keypress(nsIDOMEventListener*,nsIDOMEvent*);
+static nsresult NSAPI handle_pageshow(nsIDOMEventListener*,nsIDOMEvent*);
 static nsresult NSAPI handle_load(nsIDOMEventListener*,nsIDOMEvent*);
 
 enum doc_event_listener_flags {
@@ -71,6 +72,7 @@ static const struct {
     { EVENTID_BLUR,         0,                  EVENTLISTENER_VTBL(handle_blur) },
     { EVENTID_FOCUS,        0,                  EVENTLISTENER_VTBL(handle_focus) },
     { EVENTID_KEYPRESS,     BUBBLES,            EVENTLISTENER_VTBL(handle_keypress) },
+    { EVENTID_PAGESHOW,     OVERRIDE,           EVENTLISTENER_VTBL(handle_pageshow), },
     { EVENTID_LOAD,         OVERRIDE,           EVENTLISTENER_VTBL(handle_load), },
 };
 
@@ -208,6 +210,26 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface,
     return NS_OK;
 }
 
+static nsresult NSAPI handle_pageshow(nsIDOMEventListener *iface, nsIDOMEvent *nsevent)
+{
+    nsEventListener *This = impl_from_nsIDOMEventListener(iface);
+    HTMLDocumentNode *doc = This->This->doc;
+    HTMLInnerWindow *window;
+    DOMEvent *event;
+    HRESULT hres;
+
+    if(!doc || !(window = doc->window) || !doc->dom_document || doc->document_mode < COMPAT_MODE_IE11)
+        return NS_OK;
+
+    hres = create_document_event(doc, EVENTID_PAGESHOW, &event);
+    if(SUCCEEDED(hres)) {
+        dispatch_event(&window->event_target, event);
+        IDOMEvent_Release(&event->IDOMEvent_iface);
+    }
+
+    return NS_OK;
+}
+
 static void handle_docobj_load(HTMLDocumentObj *doc)
 {
     IOleCommandTarget *olecmd = NULL;

dlls/mshtml/tests/documentmode.js

@@ -19,10 +19,27 @@
 var compat_version;
 var tests = [];
 
+var pageshow_fired = false;
 if(window.addEventListener) {
+    window.addEventListener("pageshow", function(e) {
+        pageshow_fired = true;
+
+        var r = Object.prototype.toString.call(e);
+        todo_wine.
+        ok(r === "[object PageTransitionEvent]", "pageshow toString = " + r);
+        ok("persisted" in e, "'persisted' not in pageshow event");
+        ok(document.readyState === "complete", "pageshow readyState = " + document.readyState);
+    }, true);
+
     document.addEventListener("visibilitychange", function() { ok(false, "visibilitychange fired"); });
 }
 
+sync_test("page transition events", function() {
+    if(document.documentMode < 11)
+        ok(pageshow_fired === false, "pageshow fired");
+    else
+        ok(pageshow_fired === true, "pageshow not fired");
+});
 
 sync_test("builtin_toString", function() {
     var tags = [