Jacek Caban : mshtml: Move init_editor to HTMLDocumentNode.

Alexandre Julliard julliard at winehq.org
Tue Mar 12 16:56:16 CDT 2019


Module: wine
Branch: master
Commit: 3f79f129ff22a88c8340736020ec78190029d049
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3f79f129ff22a88c8340736020ec78190029d049

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Mar 12 16:11:58 2019 +0100

mshtml: Move init_editor to HTMLDocumentNode.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/editor.c         | 6 +++---
 dlls/mshtml/mshtml_private.h | 2 +-
 dlls/mshtml/mutation.c       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c
index 00f753c..ebb0f41 100644
--- a/dlls/mshtml/editor.c
+++ b/dlls/mshtml/editor.c
@@ -1181,11 +1181,11 @@ const cmdtable_t editmode_cmds[] = {
     {0,NULL,NULL}
 };
 
-void init_editor(HTMLDocument *This)
+void init_editor(HTMLDocumentNode *doc)
 {
-    update_doc(This->doc_obj, UPDATE_UI);
+    update_doc(doc->browser->doc, UPDATE_UI);
 
-    set_ns_fontname(This->doc_node, "Times New Roman");
+    set_ns_fontname(doc, "Times New Roman");
 }
 
 HRESULT browser_is_dirty(GeckoBrowser *browser)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index b53b1d0..7ead2ea 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -1135,7 +1135,7 @@ HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN;
 
 /* editor */
 HRESULT setup_edit_mode(HTMLDocumentObj*) DECLSPEC_HIDDEN;
-void init_editor(HTMLDocument*) DECLSPEC_HIDDEN;
+void init_editor(HTMLDocumentNode*) DECLSPEC_HIDDEN;
 void handle_edit_event(HTMLDocumentNode*,nsIDOMEvent*) DECLSPEC_HIDDEN;
 HRESULT editor_exec_copy(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN;
 HRESULT editor_exec_cut(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN;
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index 97541af..3a81274 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -263,7 +263,7 @@ static void parse_complete(HTMLDocumentObj *doc)
     TRACE("(%p)\n", doc);
 
     if(doc->nscontainer->usermode == EDITMODE)
-        init_editor(&doc->basedoc);
+        init_editor(doc->basedoc.doc_node);
 
     call_explorer_69(doc);
     if(doc->view_sink)




More information about the wine-cvs mailing list