[PATCH 0/1] MR1634: mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID.

[Gabriel Ivăncescu]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1634

[PATCH 1/1] mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>

There is actually an "invalid" event type (sent on invalid input for example),
so this avoids confusion with it.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/mshtml/htmlevent.h | 2 +-
 dlls/mshtml/htmlimg.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 70dbb1890b4..54cc5b5932a 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -17,7 +17,7 @@
  */
 
 typedef enum {
-    EVENTID_INVALID = -1,
+    EVENTID_INVALID_ID = -1,
     EVENTID_DOMCONTENTLOADED,
     EVENTID_ABORT,
     EVENTID_AFTERPRINT,
diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c
index d8c377413f0..c0333cab858 100644
--- a/dlls/mshtml/htmlimg.c
+++ b/dlls/mshtml/htmlimg.c
@@ -301,7 +301,7 @@ static HRESULT WINAPI HTMLImgElement_put_src(IHTMLImgElement *iface, BSTR v)
         DOMEvent *event;
 
         /* Synchronously send load event if the image was completed immediately (such as from cache) */
-        This->skip_event = EVENTID_INVALID;
+        This->skip_event = EVENTID_INVALID_ID;
 
         nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete);
         if(NS_SUCCEEDED(nsres) && complete) {
@@ -707,7 +707,7 @@ static HRESULT HTMLImgElement_dispatch_nsevent_hook(HTMLDOMNode *iface, DOMEvent
     HTMLImg *This = impl_from_HTMLDOMNode(iface);
 
     if(event->event_id == This->skip_event) {
-        This->skip_event = EVENTID_INVALID;
+        This->skip_event = EVENTID_INVALID_ID;
         return S_OK;
     }
 
@@ -799,7 +799,7 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMElement *nselem, HTML
 
     ret->IHTMLImgElement_iface.lpVtbl = &HTMLImgElementVtbl;
     ret->element.node.vtbl = &HTMLImgElementImplVtbl;
-    ret->skip_event = EVENTID_INVALID;
+    ret->skip_event = EVENTID_INVALID_ID;
 
     HTMLElement_Init(&ret->element, doc, nselem, &HTMLImgElement_dispex);
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1634

[PATCH 0/1] MR1634: mshtml: Rename EVENTID_INVALID to EVENTID_INVALID_ID. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1634