mshtml: Get rid of handle_edit_load.

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

mshtml: Get rid of handle_edit_load.
496abd05 · Jacek Caban · Alexandre Julliard · 34c84fd1 · 496abd05 · 496abd05
Commit 496abd05 authored Mar 12, 2019 by Jacek Caban Committed by Alexandre Julliard Mar 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

editor.c dlls/mshtml/editor.c +0 -5

mshtml_private.h dlls/mshtml/mshtml_private.h +1 -2

nsembed.c dlls/mshtml/nsembed.c +1 -1

nsevents.c dlls/mshtml/nsevents.c +1 -1

No files found.
--- a/dlls/mshtml/editor.c
+++ b/dlls/mshtml/editor.c
@@ -488,11 +488,6 @@ void handle_edit_event(HTMLDocumentNode *doc, nsIDOMEvent *event)
    nsIDOMKeyEvent_Release(key_event);
 }

-void handle_edit_load(HTMLDocument *This)
-{
-    get_editor_controller(This->doc_obj->nscontainer);
-}
-
 static void set_ns_fontname(HTMLDocumentNode *doc, const char *fontname)
 {
    nsICommandParams *nsparam = create_nscommand_params();

--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -962,7 +962,7 @@ HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSP

 nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN;
 HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN;
-void get_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN;
+void setup_editor_controller(GeckoBrowser*) DECLSPEC_HIDDEN;
 nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN;
 nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN;
 nsIXMLHttpRequest *create_nsxhr(nsIDOMWindow *nswindow) DECLSPEC_HIDDEN;
@@ -1140,7 +1140,6 @@ 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;
 HRESULT editor_exec_paste(HTMLDocumentNode*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN;
-void handle_edit_load(HTMLDocument*) DECLSPEC_HIDDEN;
 HRESULT browser_is_dirty(GeckoBrowser*) DECLSPEC_HIDDEN;
 void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN;


--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -1068,7 +1068,7 @@ HRESULT nsnode_to_nsstring(nsIDOMNode *nsnode, nsAString *str)
    return hres;
 }

-void get_editor_controller(GeckoBrowser *This)
+void setup_editor_controller(GeckoBrowser *This)
 {
    nsIEditingSession *editing_session = NULL;
    nsIControllerContext *ctrlctx;

--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -197,7 +197,7 @@ static void handle_docobj_load(HTMLDocumentObj *doc)
    }

    if(doc->nscontainer->usermode == EDITMODE)
-        handle_edit_load(&doc->basedoc);
+        setup_editor_controller(doc->nscontainer);

    if(doc->client) {
        hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd);