March 2019 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Move user mode to GeckoBrowser.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: aa4d9190a0c219abc194b2fadae78731a6f1923f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4d9190a0c219abc194b2fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:10:24 2019 +0100 mshtml: Move user mode to GeckoBrowser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 22 +++++++++++----------- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsevents.c | 8 ++++---- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/oleobj.c | 8 ++++---- dlls/mshtml/persist.c | 6 +++--- dlls/mshtml/view.c | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa4d9190a0c219abc194…

1 0

Jacek Caban : mshtml: Pass document node to handle_edit_event.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 53e095c2e83f23602a177339a0617306084cbc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e095c2e83f23602a177339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:10:39 2019 +0100 mshtml: Pass document node to handle_edit_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 20 ++++++++++---------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsevents.c | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 9b1c616..a7943af 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -379,7 +379,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) set_dirty(This->doc_node->browser, VARIANT_TRUE); } -static void handle_arrow_key(HTMLDocument *This, nsIDOMEvent *event, nsIDOMKeyEvent *key_event, const char * const cmds[4]) +static void handle_arrow_key(HTMLDocumentNode *doc, nsIDOMEvent *event, nsIDOMKeyEvent *key_event, const char * const cmds[4]) { int i=0; cpp_bool b; @@ -393,12 +393,12 @@ static void handle_arrow_key(HTMLDocument *This, nsIDOMEvent *event, nsIDOMKeyEv i |= 2; if(cmds[i]) - do_ns_editor_command(This->doc_obj->nscontainer, cmds[i]); + do_ns_editor_command(doc->browser, cmds[i]); nsIDOMEvent_PreventDefault(event); } -void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) +void handle_edit_event(HTMLDocumentNode *doc, nsIDOMEvent *event) { nsIDOMKeyEvent *key_event; UINT32 code; @@ -417,7 +417,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("left\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_RIGHT: { @@ -429,7 +429,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("right\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_UP: { @@ -441,7 +441,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("up\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_DOWN: { @@ -453,7 +453,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("down\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_DELETE: { @@ -464,7 +464,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("delete\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_HOME: { @@ -476,7 +476,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("home\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } case DOM_VK_END: { @@ -488,7 +488,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) }; TRACE("end\n"); - handle_arrow_key(This, event, key_event, cmds); + handle_arrow_key(doc, event, key_event, cmds); break; } } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 57edb82..3577607 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1136,7 +1136,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 handle_edit_event(HTMLDocument*,nsIDOMEvent*) DECLSPEC_HIDDEN; +void handle_edit_event(HTMLDocumentNode*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index e1cd414..d25f18e 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -173,17 +173,15 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, { nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; - HTMLDocumentObj *doc_obj; if(!doc || !doc->browser) return NS_ERROR_FAILURE; - doc_obj = doc->basedoc.doc_obj; TRACE("(%p)->(%p)\n", doc, event); - update_doc(doc_obj, UPDATE_UI); + update_doc(doc->browser->doc, UPDATE_UI); if(doc->browser->usermode == EDITMODE) - handle_edit_event(&doc_obj->basedoc, event); + handle_edit_event(doc, event); return NS_OK; }

1 0

Jacek Caban : mshtml: Move IsDirty implementation to GeckoBrowser.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 1ea4924e4669e8ab01c77c2bb91d0c083f5c81ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ea4924e4669e8ab01c77c2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:10 2019 +0100 mshtml: Move IsDirty implementation to GeckoBrowser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 7 +++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/persist.c | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index a7943af..5f59284 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1223,15 +1223,14 @@ void init_editor(HTMLDocument *This) set_ns_fontname(This, "Times New Roman"); } -HRESULT editor_is_dirty(HTMLDocument *This) +HRESULT browser_is_dirty(GeckoBrowser *browser) { cpp_bool modified; - if(!This->doc_obj->nscontainer || !This->doc_obj->nscontainer->editor) + if(browser->usermode != EDITMODE || !browser->editor) return S_FALSE; - nsIEditor_GetDocumentModified(This->doc_obj->nscontainer->editor, &modified); - + nsIEditor_GetDocumentModified(browser->editor, &modified); return modified ? S_OK : S_FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3577607..9933a41 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1141,7 +1141,7 @@ HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; void handle_edit_load(HTMLDocument*) DECLSPEC_HIDDEN; -HRESULT editor_is_dirty(HTMLDocument*) DECLSPEC_HIDDEN; +HRESULT browser_is_dirty(GeckoBrowser*) DECLSPEC_HIDDEN; void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN; extern DWORD mshtml_tls DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index cd52ac9..a798650 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -884,10 +884,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) TRACE("(%p)\n", This); - if(This->doc_obj->nscontainer->usermode == EDITMODE) - return editor_is_dirty(This); - - return S_FALSE; + return browser_is_dirty(This->doc_obj->nscontainer); } static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *pStm)

1 0

Jacek Caban : mshtml: Move do_ns_command to HTMLDocumentNode.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: b384f5b3a4ad58f059a8dfbd8c89af843bf22a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b384f5b3a4ad58f059a8dfbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:10:56 2019 +0100 mshtml: Move do_ns_command to HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 26 +++++++++++--------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/olecmd.c | 23 +++++++++++++---------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 5f59284..2c9e01f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -174,7 +174,7 @@ static void set_ns_align(HTMLDocument *This, const char *align_str) nsparam = create_nscommand_params(); nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, align_str); - do_ns_command(This, NSCMD_ALIGN, nsparam); + do_ns_command(This->doc_node, NSCMD_ALIGN, nsparam); nsICommandParams_Release(nsparam); } @@ -506,7 +506,7 @@ static void set_ns_fontname(HTMLDocument *This, const char *fontname) nsICommandParams *nsparam = create_nscommand_params(); nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, fontname); - do_ns_command(This, NSCMD_FONTFACE, nsparam); + do_ns_command(This->doc_node, NSCMD_FONTFACE, nsparam); nsICommandParams_Release(nsparam); } @@ -591,7 +591,7 @@ static HRESULT exec_forecolor(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, V_I4(in)&0xff, (V_I4(in)>>8)&0xff, (V_I4(in)>>16)&0xff); nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, color_str); - do_ns_command(This, NSCMD_FONTCOLOR, nsparam); + do_ns_command(This->doc_node, NSCMD_FONTCOLOR, nsparam); nsICommandParams_Release(nsparam); }else { @@ -657,9 +657,7 @@ static HRESULT exec_bold(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI if(in || out) FIXME("unsupported args\n"); - if(This->doc_obj->nscontainer) - do_ns_command(This, NSCMD_BOLD, NULL); - + do_ns_command(This->doc_node, NSCMD_BOLD, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -671,9 +669,7 @@ static HRESULT exec_italic(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA if(in || out) FIXME("unsupported args\n"); - if(This->doc_obj->nscontainer) - do_ns_command(This, NSCMD_ITALIC, NULL); - + do_ns_command(This->doc_node, NSCMD_ITALIC, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -748,7 +744,7 @@ static HRESULT exec_underline(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_UNDERLINE, NULL); + do_ns_command(This->doc_node, NSCMD_UNDERLINE, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -760,7 +756,7 @@ static HRESULT exec_horizontalline(HTMLDocument *This, DWORD cmdexecopt, VARIANT if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_INSERTHR, NULL); + do_ns_command(This->doc_node, NSCMD_INSERTHR, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -772,7 +768,7 @@ static HRESULT exec_orderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_OL, NULL); + do_ns_command(This->doc_node, NSCMD_OL, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -784,7 +780,7 @@ static HRESULT exec_unorderlist(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_UL, NULL); + do_ns_command(This->doc_node, NSCMD_UL, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -796,7 +792,7 @@ static HRESULT exec_indent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VA if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_INDENT, NULL); + do_ns_command(This->doc_node, NSCMD_INDENT, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } @@ -808,7 +804,7 @@ static HRESULT exec_outdent(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, V if(in || out) FIXME("unsupported args\n"); - do_ns_command(This, NSCMD_OUTDENT, NULL); + do_ns_command(This->doc_node, NSCMD_OUTDENT, NULL); update_doc(This->doc_obj, UPDATE_UI); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9933a41..7bf3cb6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1121,7 +1121,7 @@ typedef struct { extern const cmdtable_t editmode_cmds[] DECLSPEC_HIDDEN; -void do_ns_command(HTMLDocument*,const char*,nsICommandParams*) DECLSPEC_HIDDEN; +void do_ns_command(HTMLDocumentNode*,const char*,nsICommandParams*) DECLSPEC_HIDDEN; /* timer */ #define UPDATE_UI 0x0001 diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 9c4aa67..8920a2f 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -40,23 +40,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_COPY "cmd_copy" #define NSCMD_SELECTALL "cmd_selectAll" -void do_ns_command(HTMLDocument *This, const char *cmd, nsICommandParams *nsparam) +void do_ns_command(HTMLDocumentNode *doc, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; nsresult nsres; - TRACE("(%p)\n", This); + TRACE("(%p)\n", doc); - if(!This->doc_obj || !This->doc_obj->nscontainer) + if(!doc->browser || !doc->window) return; - nsres = get_nsinterface((nsISupports*)This->doc_obj->nscontainer->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr); + nsres = get_nsinterface((nsISupports*)doc->browser->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr); if(NS_FAILED(nsres)) { ERR("Could not get nsICommandManager: %08x\n", nsres); return; } - nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, This->window->window_proxy); + nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, doc->window->base.outer_window->window_proxy); if(NS_FAILED(nsres)) ERR("DoCommand(%s) failed: %08x\n", debugstr_a(cmd), nsres); @@ -355,7 +355,7 @@ static HRESULT exec_copy(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, { TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); - do_ns_command(This, NSCMD_COPY, NULL); + do_ns_command(This->doc_node, NSCMD_COPY, NULL); return S_OK; } @@ -385,15 +385,18 @@ static HRESULT exec_rendo(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, static HRESULT exec_select_all(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *in, VARIANT *out) { + HTMLDocumentNode *doc = This->doc_node; + TRACE("(%p)\n", This); if(in || out) FIXME("unsupported args\n"); - if(This->doc_obj->nscontainer) - do_ns_command(This, NSCMD_SELECTALL, NULL); + if(!doc->browser) + return E_UNEXPECTED; - update_doc(This->doc_obj, UPDATE_UI); + do_ns_command(doc, NSCMD_SELECTALL, NULL); + update_doc(doc->browser->doc, UPDATE_UI); return S_OK; } @@ -586,7 +589,7 @@ static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i if(This->doc_node->browser->usermode == EDITMODE) return editor_exec_copy(This, cmdexecopt, in, out); - do_ns_command(This, NSCMD_COPY, NULL); + do_ns_command(This->doc_node, NSCMD_COPY, NULL); return S_OK; }

1 0

Jacek Caban : mshtml: Move cmdtable_t to HTMLDocumentNode.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 34c84fd1a0a3482f08eb28801a639c7847690010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c84fd1a0a3482f08eb2880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:33 2019 +0100 mshtml: Move cmdtable_t to HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 292 ++++++++++++++++++++----------------------- dlls/mshtml/mshtml_private.h | 10 +- dlls/mshtml/olecmd.c | 265 ++++++++++++++++++++------------------- 3 files changed, 274 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34c84fd1a0a3482f08eb…

1 0

Jacek Caban : mshtml: Get rid of handle_edit_load.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 496abd052edad4ba83274aa443c7e4a690ea8dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=496abd052edad4ba83274aa4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:41 2019 +0100 mshtml: Get rid of handle_edit_load. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 5 ----- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 87924c2..00f753c 100644 --- 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(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6600a1d..b53b1d0 100644 --- 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; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c07245d..956ba37 100644 --- 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; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d25f18e..4fc557d 100644 --- 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);

1 0

Jacek Caban : mshtml: Move init_editor to HTMLDocumentNode.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 3f79f129ff22a88c8340736020ec78190029d049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f79f129ff22a88c83407360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:11:58 2019 +0100 mshtml: Move init_editor to HTMLDocumentNode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Jacek Caban : mshtml: Move SetDesignMode call to create_document_node.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 0abe9939b8357db3612cd0eac2c526ac1e2f8223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0abe9939b8357db3612cd0ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 12 16:12:05 2019 +0100 mshtml: Move SetDesignMode call to create_document_node. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 13 +++++++++++++ dlls/mshtml/htmlwindow.c | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 22af107..01598e8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5202,6 +5202,19 @@ HRESULT create_document_node(nsIDOMHTMLDocument *nsdoc, GeckoBrowser *browser, H list_add_head(&browser->document_nodes, &doc->browser_entry); doc->browser = browser; + if(browser->usermode == EDITMODE) { + nsAString mode_str; + nsresult nsres; + + static const PRUnichar onW[] = {'o','n',0}; + + nsAString_InitDepend(&mode_str, onW); + nsres = nsIDOMHTMLDocument_SetDesignMode(doc->nsdoc, &mode_str); + nsAString_Finish(&mode_str); + if(NS_FAILED(nsres)) + ERR("SetDesignMode failed: %08x\n", nsres); + } + *ret = doc; return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index cd7d59c..8329a3e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3641,19 +3641,6 @@ HRESULT update_window_doc(HTMLInnerWindow *window) if(FAILED(hres)) return hres; - if(outer_window->browser->usermode == EDITMODE) { - nsAString mode_str; - nsresult nsres; - - static const PRUnichar onW[] = {'o','n',0}; - - nsAString_InitDepend(&mode_str, onW); - nsres = nsIDOMHTMLDocument_SetDesignMode(window->doc->nsdoc, &mode_str); - nsAString_Finish(&mode_str); - if(NS_FAILED(nsres)) - ERR("SetDesignMode failed: %08x\n", nsres); - } - if(window != outer_window->pending_window) { ERR("not current pending window\n"); return S_OK;

1 0

Fabian Maurer : comctl32/combo: Fix misleading indentation.
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: a51e20f5e075faa4f6809702323f88727308865c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a51e20f5e075faa4f6809702… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Mar 12 19:02:31 2019 +0100 comctl32/combo: Fix misleading indentation. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 12ea7bb..8a533e6 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1020,7 +1020,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) else { if (nItems > lphc->visibleItems) - nItems = lphc->visibleItems; + nItems = lphc->visibleItems; nDroppedHeight = nItems * nIHeight + COMBO_YBORDERSIZE(); } }

1 0

Michael Stefaniuc : windowscodecs: Remove redundant not-NULL checks ( coccinellery).
by Alexandre Julliard 12 Mar '19

12 Mar '19

Module: wine Branch: master Commit: 12eeed38164e8e34f26b684c5c1490b7d21a58ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=12eeed38164e8e34f26b684c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:51 2019 +0100 windowscodecs: Remove redundant not-NULL checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 3b3030b..72cbf1f 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1348,7 +1348,7 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec if (!srcdata) return E_OUTOFMEMORY; hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); - if (SUCCEEDED(hr) && prc) + if (SUCCEEDED(hr)) { INT x, y; BYTE *src = srcdata, *dst = pbBuffer; @@ -1438,7 +1438,7 @@ static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WIC if (!srcdata) return E_OUTOFMEMORY; hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); - if (SUCCEEDED(hr) && prc) + if (SUCCEEDED(hr)) { INT x, y; BYTE *src = srcdata, *dst = pbBuffer;

1 0