Gabriel Ivăncescu : mshtml: Don't check for doc_node from the doc obj when it can't be NULL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9a0d0e861609798fdde3cb67b8f4edda4288d879
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9a0d0e861609798fdde3cb67b8f4edd...

Author: Gabriel Ivăncescu 
Date:   Fri Nov 25 19:10:04 2022 +0200

mshtml: Don't check for doc_node from the doc obj when it can't be NULL.

Signed-off-by: Gabriel Ivăncescu

---

dlls/mshtml/olecmd.c  |  4 ----
 dlls/mshtml/oleobj.c  | 16 ++++++++--------
 dlls/mshtml/persist.c |  8 --------
 dlls/mshtml/view.c    |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index ac5a22ef16a..5767751ac14 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -991,8 +991,6 @@ static HRESULT WINAPI DocObjOleCommandTarget_QueryStatus(IOleCommandTarget *ifac
 {
     HTMLDocumentObj *This = HTMLDocumentObj_from_IOleCommandTarget(iface);

-    if(!This->doc_node)
-        return E_UNEXPECTED;
     return IOleCommandTarget_QueryStatus(&This->doc_node->IOleCommandTarget_iface,
                                          pguidCmdGroup, cCmds, prgCmds, pCmdText);
 }
@@ -1002,8 +1000,6 @@ static HRESULT WINAPI DocObjOleCommandTarget_Exec(IOleCommandTarget *iface, cons
 {
     HTMLDocumentObj *This = HTMLDocumentObj_from_IOleCommandTarget(iface);

-    if(!This->doc_node)
-        return E_UNEXPECTED;
     return IOleCommandTarget_Exec(&This->doc_node->IOleCommandTarget_iface,
                                   pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
 }
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index cc2d6aaf5e5..e6f5239538c 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -2169,37 +2169,37 @@ static HRESULT WINAPI DocObj##iface##_Invoke(I##iface *_0, DISPID dispIdMember,
 #define HTMLDOCUMENTOBJ_FWD_TO_NODE_0(iface, method) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface); \
 }

#define HTMLDOCUMENTOBJ_FWD_TO_NODE_1(iface, method, a) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0, a _1) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1); \
 }

#define HTMLDOCUMENTOBJ_FWD_TO_NODE_2(iface, method, a,b) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0, a _1, b _2) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2); \
 }

#define HTMLDOCUMENTOBJ_FWD_TO_NODE_3(iface, method, a,b,c) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0, a _1, b _2, c _3) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3); \
 }

#define HTMLDOCUMENTOBJ_FWD_TO_NODE_4(iface, method, a,b,c,d) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0, a _1, b _2, c _3, d _4) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3, _4) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3, _4); \
 }

#define HTMLDOCUMENTOBJ_FWD_TO_NODE_5(iface, method, a,b,c,d,e) static HRESULT WINAPI DocObj##iface##_##method(I##iface *_0, a _1, b _2, c _3, d _4, e _5) \
 { \
     HTMLDocumentObj *This = CONTAINING_RECORD(_0, HTMLDocumentObj, I##iface##_iface); \
-    return This->doc_node ? This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3, _4, _5) : E_UNEXPECTED; \
+    return This->doc_node->I##iface##_iface.lpVtbl->method(&This->doc_node->I##iface##_iface, _1, _2, _3, _4, _5); \
 }

/**********************************************************
@@ -3618,7 +3618,7 @@ static void HTMLDocumentObj_on_advise(IUnknown *iface, cp_static_data_t *cp)
 {
     HTMLDocumentObj *This = impl_from_IUnknown(iface);

-    if(This->window && This->doc_node)
+    if(This->window)
         update_doc_cp_events(This->doc_node, cp);
 }

@@ -3704,7 +3704,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
     doc->window = doc->nscontainer->content_window;
     IHTMLWindow2_AddRef(&doc->window->base.IHTMLWindow2_iface);

-    if(!doc->doc_node && doc->window->base.inner_window->doc) {
+    if(!doc->doc_node) {
         doc->doc_node = doc->window->base.inner_window->doc;
         IHTMLDOMNode_AddRef(&doc->doc_node->node.IHTMLDOMNode_iface);
     }
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index ff5f7ecf0e2..581a25c4e2e 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -1008,10 +1008,6 @@ static HRESULT WINAPI DocObjPersistFile_Save(IPersistFile *iface, LPCOLESTR pszF
 {
     HTMLDocumentObj *This = HTMLDocumentObj_from_IPersistFile(iface);

-    if(!This->doc_node) {
-        FIXME("No doc_node\n");
-        return E_UNEXPECTED;
-    }
     return IPersistFile_Save(&This->doc_node->IPersistFile_iface, pszFileName, fRemember);
 }

@@ -1202,10 +1198,6 @@ static HRESULT WINAPI DocObjPersistStreamInit_Save(IPersistStreamInit *iface, IS
 {
     HTMLDocumentObj *This = HTMLDocumentObj_from_IPersistStreamInit(iface);

-    if(!This->doc_node) {
-        FIXME("No doc_node\n");
-        return E_UNEXPECTED;
-    }
     return IPersistStreamInit_Save(&This->doc_node->IPersistStreamInit_iface, pStm, fClearDirty);
 }

diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index deaf7d38be9..6b7ecb0bc27 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -446,7 +446,7 @@ static void send_unload_events_impl(HTMLInnerWindow *window)

static void send_unload_events(HTMLDocumentObj *doc)
 {
-    if(!doc->doc_node || !doc->window || !doc->doc_node->content_ready)
+    if(!doc->window || !doc->doc_node->content_ready)
         return;

send_unload_events_impl(doc->window->base.inner_window);