[PATCH v3 6/8] mshtml: Use actual event type to create the event instead of the event id.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmlevent.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index cb2c6efb4c5..a7445a5edd0 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -2991,7 +2991,8 @@ static DOMEvent *storage_event_ctor(nsIDOMEvent *nsevent, eventid_t event_id, co
     return &storage_event->event;
 }

-static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, eventid_t event_id)
+static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, event_type_t event_type,
+        eventid_t event_id)
 {
     static const struct {
         REFIID iid;
@@ -3006,10 +3007,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev
     DOMEvent *event;
     unsigned i;

-    switch(event_id) {
-    case EVENTID_MESSAGE: return message_event_ctor(nsevent, event_id, compat_mode);
-    case EVENTID_STORAGECOMMIT:
-    case EVENTID_STORAGE: return storage_event_ctor(nsevent, event_id, compat_mode);
+    switch(event_type) {
+    case EVENT_TYPE_MESSAGE: return message_event_ctor(nsevent, event_id, compat_mode);
+    case EVENT_TYPE_STORAGE: return storage_event_ctor(nsevent, event_id, compat_mode);
     default: break;
     }

@@ -3047,7 +3047,7 @@ HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, compat_mode_t compat_mod
     }
     nsAString_Finish(&nsstr);

-    event = alloc_event(nsevent, compat_mode, event_id);
+    event = alloc_event(nsevent, compat_mode, event_info[event_id].type, event_id);
     if(!event)
         return E_OUTOFMEMORY;

@@ -3071,7 +3071,8 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM
         return E_FAIL;
     }

-    event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), EVENTID_LAST);
+    event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex),
+                        EVENT_TYPE_EVENT, EVENTID_LAST);
     nsIDOMEvent_Release(nsevent);
     if(!event)
         return E_OUTOFMEMORY;
@@ -3095,7 +3096,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven
         return E_FAIL;
     }

-    event = alloc_event(nsevent, doc->document_mode, event_id);
+    event = alloc_event(nsevent, doc->document_mode, event_info[event_id].type, event_id);
     if(!event)
         return E_OUTOFMEMORY;