September 2009 - Wine-commits

Jacek Caban : mshtml: Move mime to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 23e7fe481ba9bf9405c279f8da8971da4a30345a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e7fe481ba9bf9405c279f8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:12:56 2009 +0200 mshtml: Move mime to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/nsio.c | 4 ++-- dlls/mshtml/persist.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 95b0100..8144092 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1763,7 +1763,6 @@ static void destroy_htmldoc(HTMLDocument *This) if(This->event_target) release_event_target(This->event_target); - heap_free(This->mime); release_nodes(This); release_dispex(&This->dispex); @@ -1894,6 +1893,7 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base) if(This->hwnd) DestroyWindow(This->hwnd); + heap_free(This->mime); destroy_htmldoc(&This->basedoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c8d1c61..d5fcd8d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,8 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - LPWSTR mime; - DWORD update; event_target_t *event_target; @@ -350,6 +348,7 @@ struct HTMLDocumentObj { USERMODE usermode; READYSTATE readystate; + LPWSTR mime; /* FIXME: probably should be in document node object */ nsChannelBSC *bscallback; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ee3df0d..d7fe4a9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -708,9 +708,9 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, if(container->bscallback) { channelbsc_set_channel(container->bscallback, This, listener, context); - if(container->doc && container->doc->basedoc.mime) { + if(container->doc && container->doc->mime) { heap_free(This->content_type); - This->content_type = heap_strdupWtoA(container->doc->basedoc.mime); + This->content_type = heap_strdupWtoA(container->doc->mime); } return NS_OK; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0ce29c4..f89cde8 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -370,8 +370,8 @@ static HRESULT WINAPI MonikerProp_PutProperty(IMonikerProp *iface, MONIKERPROPER switch(mkp) { case MIMETYPEPROP: - heap_free(This->mime); - This->mime = heap_strdupW(val); + heap_free(This->doc_obj->mime); + This->doc_obj->mime = heap_strdupW(val); break; case CLASSIDPROP:

1 0

Jacek Caban : mshtml: Move update flags to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 95080eac65f9ec326870aab2f07d636e31381ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=95080eac65f9ec326870aab2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:13:13 2009 +0200 mshtml: Move update flags to HTMLDocumentObj. --- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/view.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d5fcd8d..699054a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,8 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - DWORD update; - event_target_t *event_target; ConnectionPointContainer cp_container; ConnectionPoint cp_htmldocevents; @@ -350,6 +348,8 @@ struct HTMLDocumentObj { READYSTATE readystate; LPWSTR mime; + DWORD update; + /* FIXME: probably should be in document node object */ nsChannelBSC *bscallback; IMoniker *mon; diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index ff28995..0d1d055 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -97,10 +97,10 @@ static void activate_gecko(NSContainer *This) void update_doc(HTMLDocument *This, DWORD flags) { - if(!This->update && This->doc_obj->hwnd) + if(!This->doc_obj->update && This->doc_obj->hwnd) SetTimer(This->doc_obj->hwnd, TIMER_ID, 100, NULL); - This->update |= flags; + This->doc_obj->update |= flags; } void update_title(HTMLDocumentObj *This) @@ -108,10 +108,10 @@ void update_title(HTMLDocumentObj *This) IOleCommandTarget *olecmd; HRESULT hres; - if(!(This->basedoc.update & UPDATE_TITLE)) + if(!(This->update & UPDATE_TITLE)) return; - This->basedoc.update &= ~UPDATE_TITLE; + This->update &= ~UPDATE_TITLE; if(!This->client) return; @@ -133,14 +133,14 @@ void update_title(HTMLDocumentObj *This) static LRESULT on_timer(HTMLDocumentObj *This) { - TRACE("(%p) %x\n", This, This->basedoc.update); + TRACE("(%p) %x\n", This, This->update); KillTimer(This->hwnd, TIMER_ID); - if(!This->basedoc.update) + if(!This->update) return 0; - if(This->basedoc.update & UPDATE_UI) { + if(This->update & UPDATE_UI) { if(This->hostui) IDocHostUIHandler_UpdateUI(This->hostui); @@ -159,7 +159,7 @@ static LRESULT on_timer(HTMLDocumentObj *This) } update_title(This); - This->basedoc.update = 0; + This->update = 0; return 0; }

1 0

Jacek Caban : mshtml: Move readystate to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 05d199474b03936bbfb02588e1b785584f7a37c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d199474b03936bbfb02588e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:12:41 2009 +0200 mshtml: Move readystate to HTMLDocumentObj. --- dlls/mshtml/editor.c | 6 +++--- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/task.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 245e8d8..d1d9aad 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -150,7 +150,7 @@ static DWORD query_ns_edit_status(HTMLDocument *This, const char *nscmd) nsICommandParams *nsparam; PRBool b = FALSE; - if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->doc_obj->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(This->doc_obj->nscontainer && nscmd) { @@ -185,7 +185,7 @@ static DWORD query_align_status(HTMLDocument *This, const char *align_str) nsICommandParams *nsparam; char *align = NULL; - if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->doc_obj->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(This->doc_obj->nscontainer) { @@ -715,7 +715,7 @@ static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", This); /* FIXME: We should set OLECMDF_LATCHED only if it's set explicitly. */ - if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->doc_obj->readystate < READYSTATE_INTERACTIVE) cmd->cmdf = OLECMDF_SUPPORTED; else cmd->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8729945..95b0100 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -454,7 +454,7 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p if(!p) return E_POINTER; - *p = SysAllocString(readystate_str[This->readystate]); + *p = SysAllocString(readystate_str[This->doc_obj->readystate]); return S_OK; } @@ -1512,7 +1512,7 @@ static HRESULT WINAPI DocDispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMemb return E_INVALIDARG; V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = This->readystate; + V_I4(pVarResult) = This->doc_obj->readystate; return S_OK; } @@ -1737,7 +1737,6 @@ static void init_doc(HTMLDocument *doc, const htmldoc_vtbl_t *vtbl) doc->lpHTMLDocument2Vtbl = &HTMLDocumentVtbl; doc->lpIDispatchExVtbl = &DocDispatchExVtbl; doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; - doc->readystate = READYSTATE_UNINITIALIZED; HTMLDocument_HTMLDocument3_Init(doc); HTMLDocument_HTMLDocument5_Init(doc); @@ -1941,6 +1940,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->nscontainer = NSContainer_Create(doc, NULL); list_init(&doc->bindings); doc->usermode = UNKNOWN_USERMODE; + doc->readystate = READYSTATE_UNINITIALIZED; if(doc->nscontainer) { nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fc66426..c8d1c61 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,7 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - READYSTATE readystate; LPWSTR mime; DWORD update; @@ -350,6 +349,7 @@ struct HTMLDocumentObj { BOOL focus; USERMODE usermode; + READYSTATE readystate; /* FIXME: probably should be in document node object */ nsChannelBSC *bscallback; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index dc3e638..c2f6fef 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -555,7 +555,7 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(This->doc_obj->frame) IOleInPlaceFrame_SetStatusText(This->doc_obj->frame, NULL); - This->readystate = READYSTATE_UNINITIALIZED; + This->doc_obj->readystate = READYSTATE_UNINITIALIZED; if(This->doc_obj->client) { IOleCommandTarget *cmdtrg; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6fa9283..0ce29c4 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -113,7 +113,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } } - This->readystate = READYSTATE_LOADING; + This->doc_obj->readystate = READYSTATE_LOADING; call_property_onchanged(&This->cp_propnotif, DISPID_READYSTATE); update_doc(This, UPDATE_TITLE); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 331a9d3..a387e6a 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -263,7 +263,7 @@ static void set_parsecomplete(HTMLDocument *doc) /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ - doc->readystate = READYSTATE_INTERACTIVE; + doc->doc_obj->readystate = READYSTATE_INTERACTIVE; call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE); if(doc->doc_obj->client) @@ -289,7 +289,7 @@ static void set_parsecomplete(HTMLDocument *doc) IOleCommandTarget_Release(olecmd); } - doc->readystate = READYSTATE_COMPLETE; + doc->doc_obj->readystate = READYSTATE_COMPLETE; call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE); if(doc->doc_obj->frame) {

1 0

Jacek Caban : mshtml: Moved usermode to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 56b69dff4ab279f57ee8acf574e1918524bab825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b69dff4ab279f57ee8acf57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:12:25 2009 +0200 mshtml: Moved usermode to HTMLDocumentObj. --- dlls/mshtml/editor.c | 8 ++++---- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/olecmd.c | 12 ++++++------ dlls/mshtml/oleobj.c | 10 ++++------ dlls/mshtml/persist.c | 2 +- dlls/mshtml/task.c | 4 ++-- dlls/mshtml/view.c | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 77e5a8b..245e8d8 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -100,7 +100,7 @@ void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty) { nsresult nsres; - if(This->usermode != EDITMODE || !This->doc_obj->nscontainer || !This->doc_obj->nscontainer->editor) + if(This->doc_obj->usermode != EDITMODE || !This->doc_obj->nscontainer || !This->doc_obj->nscontainer->editor) return; if(dirty) { @@ -150,7 +150,7 @@ static DWORD query_ns_edit_status(HTMLDocument *This, const char *nscmd) nsICommandParams *nsparam; PRBool b = FALSE; - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(This->doc_obj->nscontainer && nscmd) { @@ -185,7 +185,7 @@ static DWORD query_align_status(HTMLDocument *This, const char *align_str) nsICommandParams *nsparam; char *align = NULL; - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; if(This->doc_obj->nscontainer) { @@ -715,7 +715,7 @@ static HRESULT query_justify(HTMLDocument *This, OLECMD *cmd) case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", This); /* FIXME: We should set OLECMDF_LATCHED only if it's set explicitly. */ - if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + if(This->doc_obj->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) cmd->cmdf = OLECMDF_SUPPORTED; else cmd->cmdf = OLECMDF_SUPPORTED | OLECMDF_ENABLED; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2b0fe95..8729945 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1940,6 +1940,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->nscontainer = NSContainer_Create(doc, NULL); list_init(&doc->bindings); + doc->usermode = UNKNOWN_USERMODE; if(doc->nscontainer) { nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e07f580..fc66426 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,7 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - USERMODE usermode; READYSTATE readystate; LPWSTR mime; @@ -350,6 +349,8 @@ struct HTMLDocumentObj { BOOL container_locked; BOOL focus; + USERMODE usermode; + /* FIXME: probably should be in document node object */ nsChannelBSC *bscallback; IMoniker *mon; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index bff421f..7ab700f 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -121,7 +121,7 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, TRACE("(%p)->(%p)\n", This, event); update_doc(&This->doc->basedoc, UPDATE_UI); - if(This->doc->basedoc.usermode == EDITMODE) + if(This->doc->usermode == EDITMODE) handle_edit_event(&This->doc->basedoc, event); return NS_OK; @@ -145,7 +145,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event This->editor_controller = NULL; } - if(This->doc->basedoc.usermode == EDITMODE) + if(This->doc->usermode == EDITMODE) handle_edit_load(&This->doc->basedoc); if(!This->doc->basedoc.nsdoc) { diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index bf5b7c1..dc3e638 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -473,7 +473,7 @@ static HRESULT exec_mshtml_copy(HTMLDocument *This, DWORD cmdexecopt, VARIANT *i { TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - if(This->usermode == EDITMODE) + if(This->doc_obj->usermode == EDITMODE) return editor_exec_copy(This, cmdexecopt, in, out); do_ns_command(This, NSCMD_COPY, NULL); @@ -491,7 +491,7 @@ static HRESULT exec_mshtml_cut(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in { TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - if(This->usermode == EDITMODE) + if(This->doc_obj->usermode == EDITMODE) return editor_exec_cut(This, cmdexecopt, in, out); FIXME("Unimplemented in browse mode\n"); @@ -509,7 +509,7 @@ static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT * { TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - if(This->usermode == EDITMODE) + if(This->doc_obj->usermode == EDITMODE) return editor_exec_paste(This, cmdexecopt, in, out); FIXME("Unimplemented in browse mode\n"); @@ -523,7 +523,7 @@ static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in if(in || out) FIXME("unsupported args\n"); - This->usermode = BROWSEMODE; + This->doc_obj->usermode = BROWSEMODE; return S_OK; } @@ -538,10 +538,10 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(in || out) FIXME("unsupported args\n"); - if(This->usermode == EDITMODE) + if(This->doc_obj->usermode == EDITMODE) return S_OK; - This->usermode = EDITMODE; + This->doc_obj->usermode = EDITMODE; if(This->doc_obj->mon) { CLSID clsid = IID_NULL; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 18805cf..5a2f3de 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -103,7 +103,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(This->doc_obj->client) { IOleClientSite_Release(This->doc_obj->client); This->doc_obj->client = NULL; - This->usermode = UNKNOWN_USERMODE; + This->doc_obj->usermode = UNKNOWN_USERMODE; } if(This->doc_obj->hostui) { @@ -195,7 +195,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->client = pClientSite; This->doc_obj->hostui = pDocHostUIHandler; - if(This->usermode == UNKNOWN_USERMODE) + if(This->doc_obj->usermode == UNKNOWN_USERMODE) IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -618,10 +618,10 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS if(V_VT(&res) == VT_BOOL) { if(V_BOOL(&res)) { - This->usermode = BROWSEMODE; + This->doc_obj->usermode = BROWSEMODE; }else { FIXME("edit mode is not supported\n"); - This->usermode = EDITMODE; + This->doc_obj->usermode = EDITMODE; } }else { FIXME("V_VT(res)=%d\n", V_VT(&res)); @@ -767,6 +767,4 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpCustomDocVtbl = &CustomDocVtbl; - - This->usermode = UNKNOWN_USERMODE; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7ff3821..6fa9283 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -529,7 +529,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) TRACE("(%p)\n", This); - if(This->usermode == EDITMODE) + if(This->doc_obj->usermode == EDITMODE) return editor_is_dirty(This); return S_FALSE; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index cdeeccb..331a9d3 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -254,7 +254,7 @@ static void set_parsecomplete(HTMLDocument *doc) TRACE("(%p)\n", doc); - if(doc->usermode == EDITMODE) + if(doc->doc_obj->usermode == EDITMODE) init_editor(doc); call_explorer_69(doc->doc_obj); @@ -324,7 +324,7 @@ static void set_progress(HTMLDocument *doc) &progress, NULL); } - if(doc->usermode == EDITMODE && doc->doc_obj->hostui) { + if(doc->doc_obj->usermode == EDITMODE && doc->doc_obj->hostui) { DOCHOSTUIINFO hostinfo; memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 7c83f24..ff28995 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -610,7 +610,7 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f if(This->doc_obj->hostui) { hres = IDocHostUIHandler_ShowUI(This->doc_obj->hostui, - This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, + This->doc_obj->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, ACTOBJ(This), CMDTARGET(This), This->doc_obj->frame, This->doc_obj->ip_window); if(FAILED(hres)) IDocHostUIHandler_HideUI(This->doc_obj->hostui);

1 0

Jacek Caban : mshtml: Moved range_list to HTMLDocumentNode object.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: d460c67305d912d40148e11375d3dc3fa03412e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d460c67305d912d40148e1137… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:11:43 2009 +0200 mshtml: Moved range_list to HTMLDocumentNode object. --- dlls/mshtml/htmlbody.c | 7 +++++-- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 7 +++---- dlls/mshtml/selection.c | 9 +++++++-- dlls/mshtml/txtrange.c | 38 ++++++++++++++++++++++---------------- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index da5d70a..280464a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -602,6 +602,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange *nsdocrange; nsIDOMRange *nsrange = NULL; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, range); @@ -628,8 +629,10 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange_Release(nsdocrange); - *range = HTMLTxtRange_Create(This->textcont.element.node.doc, nsrange); - return S_OK; + hres = HTMLTxtRange_Create(This->textcont.element.node.doc->doc_node, nsrange, range); + + nsIDOMRange_Release(nsrange); + return hres; } #undef HTMLBODY_THIS diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b835c99..5261c97 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1740,7 +1740,6 @@ static void init_doc(HTMLDocument *doc, const htmldoc_vtbl_t *vtbl) doc->readystate = READYSTATE_UNINITIALIZED; list_init(&doc->bindings); - list_init(&doc->range_list); HTMLDocument_HTMLDocument3_Init(doc); HTMLDocument_HTMLDocument5_Init(doc); @@ -1771,7 +1770,6 @@ static void destroy_htmldoc(HTMLDocument *This) release_event_target(This->event_target); heap_free(This->mime); - detach_ranges(This); release_nodes(This); release_dispex(&This->dispex); @@ -1809,6 +1807,7 @@ static ULONG HTMLDocumentNode_Release(HTMLDocument *base) if(!ref) { detach_selection(This); + detach_ranges(This); destroy_htmldoc(&This->basedoc); heap_free(This); } @@ -1844,6 +1843,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->basedoc.window = window; list_init(&doc->selection_list); + list_init(&doc->range_list); *ret = doc; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 05fb91f..1c744ed 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -301,8 +301,6 @@ struct HTMLDocument { ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; - struct list range_list; - HTMLDOMNode *nodes; }; @@ -327,6 +325,7 @@ struct HTMLDocumentNode { LONG ref; struct list selection_list; + struct list range_list; }; struct HTMLDocumentObj { @@ -638,13 +637,13 @@ void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISuppo IMoniker *get_channelbsc_mon(nsChannelBSC*); HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**); -IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); +HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*); IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*); void detach_selection(HTMLDocumentNode*); -void detach_ranges(HTMLDocument*); +void detach_ranges(HTMLDocumentNode*); HRESULT get_node_text(HTMLDOMNode*,BSTR*); HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocument*,nsIDOMNode*); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 0d1729d..65e3ecb 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -140,7 +140,9 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + IHTMLTxtRange *range_obj = NULL; nsIDOMRange *nsrange = NULL; + HRESULT hres; TRACE("(%p)->(%p)\n", This, range); @@ -178,8 +180,11 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac ERR("GetRangeAt failed: %08x\n", nsres); } - *range = (IDispatch*)HTMLTxtRange_Create(&This->doc->basedoc, nsrange); - return S_OK; + hres = HTMLTxtRange_Create(This->doc, nsrange, &range_obj); + + nsIDOMRange_Release(nsrange); + *range = (IDispatch*)range_obj; + return hres; } static HRESULT WINAPI HTMLSelectionObject_empty(IHTMLSelectionObject *iface) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index e6a6ff2..9ed6f63 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -43,7 +43,7 @@ typedef struct { LONG ref; nsIDOMRange *nsrange; - HTMLDocument *doc; + HTMLDocumentNode *doc; struct list entry; } HTMLTxtRange; @@ -72,7 +72,7 @@ typedef enum { RU_TEXTEDIT } range_unit_t; -static HTMLTxtRange *get_range_object(HTMLDocument *doc, IHTMLTxtRange *iface) +static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *iface) { HTMLTxtRange *iter; @@ -342,7 +342,7 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) if(!iter) { nsIDOMHTMLElement *nselem; - nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nselem); + nsIDOMHTMLDocument_GetBody(This->doc->basedoc.nsdoc, &nselem); nsIDOMElement_GetLastChild(nselem, &tmp); if(!tmp) return (nsIDOMNode*)nselem; @@ -1139,7 +1139,7 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) return MSHTML_E_NODOC; nsAString_Init(&text_str, v); - nsres = nsIDOMHTMLDocument_CreateTextNode(This->doc->nsdoc, &text_str, &text_node); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->doc->basedoc.nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { ERR("CreateTextNode failed: %08x\n", nsres); @@ -1201,7 +1201,7 @@ static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElem return S_OK; } - node = get_node(This->doc, nsnode, TRUE); + node = get_node(&This->doc->basedoc, nsnode, TRUE); nsIDOMNode_Release(nsnode); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)parent); @@ -1211,14 +1211,15 @@ static HRESULT WINAPI HTMLTxtRange_duplicate(IHTMLTxtRange *iface, IHTMLTxtRange { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); nsIDOMRange *nsrange = NULL; + HRESULT hres; TRACE("(%p)->(%p)\n", This, Duplicate); nsIDOMRange_CloneRange(This->nsrange, &nsrange); - *Duplicate = HTMLTxtRange_Create(This->doc, nsrange); + hres = HTMLTxtRange_Create(This->doc, nsrange, Duplicate); nsIDOMRange_Release(nsrange); - return S_OK; + return hres; } static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange *Range, @@ -1347,7 +1348,7 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA nsIDOMHTMLElement *nsbody = NULL; nsresult nsres; - nsres = nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nsbody); + nsres = nsIDOMHTMLDocument_GetBody(This->doc->basedoc.nsdoc, &nsbody); if(NS_FAILED(nsres) || !nsbody) { ERR("Could not get body: %08x\n", nsres); break; @@ -1550,7 +1551,7 @@ static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface) TRACE("(%p)\n", This); - nsres = nsIDOMWindow_GetSelection(This->doc->window->nswindow, &nsselection); + nsres = nsIDOMWindow_GetSelection(This->doc->basedoc.window->nswindow, &nsselection); if(NS_FAILED(nsres)) { ERR("GetSelection failed: %08x\n", nsres); return E_FAIL; @@ -1787,17 +1788,17 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) TRACE("(%p)->(%p %p)\n", This, in, out); - if(!This->doc->nsdoc) { + if(!This->doc->basedoc.nsdoc) { WARN("NULL nsdoc\n"); return E_NOTIMPL; } nsAString_Init(&tag_str, blockquoteW); - nsIDOMHTMLDocument_CreateElement(This->doc->nsdoc, &tag_str, &blockquote_elem); + nsIDOMHTMLDocument_CreateElement(This->doc->basedoc.nsdoc, &tag_str, &blockquote_elem); nsAString_Finish(&tag_str); nsAString_Init(&tag_str, pW); - nsIDOMDocument_CreateElement(This->doc->nsdoc, &tag_str, &p_elem); + nsIDOMDocument_CreateElement(This->doc->basedoc.nsdoc, &tag_str, &p_elem); nsAString_Finish(&tag_str); nsIDOMRange_ExtractContents(This->nsrange, &fragment); @@ -1847,9 +1848,13 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { RangeCommandTarget_Exec }; -IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument *doc, nsIDOMRange *nsrange) +HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTxtRange **p) { - HTMLTxtRange *ret = heap_alloc(sizeof(HTMLTxtRange)); + HTMLTxtRange *ret; + + ret = heap_alloc(sizeof(HTMLTxtRange)); + if(!ret) + return E_OUTOFMEMORY; ret->lpHTMLTxtRangeVtbl = &HTMLTxtRangeVtbl; ret->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; @@ -1862,10 +1867,11 @@ IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument *doc, nsIDOMRange *nsrange) ret->doc = doc; list_add_head(&doc->range_list, &ret->entry); - return HTMLTXTRANGE(ret); + *p = HTMLTXTRANGE(ret); + return S_OK; } -void detach_ranges(HTMLDocument *This) +void detach_ranges(HTMLDocumentNode *This) { HTMLTxtRange *iter;

1 0

Jacek Caban : mshtml: Moved binding variables to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: e52e57cf2b9188e59a8ec47d8a74a84fb0098e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52e57cf2b9188e59a8ec47d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:12:06 2009 +0200 mshtml: Moved binding variables to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 12 +++++------- dlls/mshtml/htmllocation.c | 4 ++-- dlls/mshtml/mshtml_private.h | 11 ++++++----- dlls/mshtml/navigate.c | 18 +++++++++--------- dlls/mshtml/olecmd.c | 8 ++++---- dlls/mshtml/persist.c | 33 ++++++++++++++------------------- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5261c97..2b0fe95 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -588,8 +588,8 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) TRACE("(%p)->(%p)\n", iface, p); - *p = SysAllocString(This->url ? This->url : about_blank_url); - return S_OK; + *p = SysAllocString(This->doc_obj->url ? This->doc_obj->url : about_blank_url); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) @@ -1739,8 +1739,6 @@ static void init_doc(HTMLDocument *doc, const htmldoc_vtbl_t *vtbl) doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; doc->readystate = READYSTATE_UNINITIALIZED; - list_init(&doc->bindings); - HTMLDocument_HTMLDocument3_Init(doc); HTMLDocument_HTMLDocument5_Init(doc); HTMLDocument_Persist_Init(doc); @@ -1763,9 +1761,6 @@ static void destroy_htmldoc(HTMLDocument *This) { remove_doc_tasks(This); - set_document_bscallback(This, NULL); - set_current_mon(This, NULL); - if(This->event_target) release_event_target(This->event_target); @@ -1876,6 +1871,8 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base) TRACE("(%p) ref = %u\n", This, ref); if(!ref) { + set_document_bscallback(&This->basedoc, NULL); + set_current_mon(&This->basedoc, NULL); if(This->basedoc.doc_node) { This->basedoc.doc_node->basedoc.doc_obj = NULL; IHTMLDocument2_Release(HTMLDOC(&This->basedoc.doc_node->basedoc)); @@ -1942,6 +1939,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return hres; doc->nscontainer = NSContainer_Create(doc, NULL); + list_init(&doc->bindings); if(doc->nscontainer) { nsresult nsres; diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 7006a76..470d679 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -37,12 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) { - if(!This->window || !This->window->doc_obj || !This->window->doc_obj->basedoc.url) { + if(!This->window || !This->window->doc_obj || !This->window->doc_obj->url) { FIXME("No current URL\n"); return E_NOTIMPL; } - *ret = This->window->doc_obj->basedoc.url; + *ret = This->window->doc_obj->url; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1c744ed..e07f580 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,11 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - nsChannelBSC *bscallback; - IMoniker *mon; - LPOLESTR url; - struct list bindings; - USERMODE usermode; READYSTATE readystate; LPWSTR mime; @@ -354,6 +349,12 @@ struct HTMLDocumentObj { BOOL has_key_path; BOOL container_locked; BOOL focus; + + /* FIXME: probably should be in document node object */ + nsChannelBSC *bscallback; + IMoniker *mon; + LPOLESTR url; + struct list bindings; }; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3b0571c..267168f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -313,7 +313,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallback *ifa This->binding = pbind; if(This->doc) - list_add_head(&This->doc->bindings, &This->entry); + list_add_head(&This->doc->doc_obj->bindings, &This->entry); return This->vtbl->start_binding(This); } @@ -949,7 +949,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); /* events are reset when a new document URI is loaded, so re-initialise them here */ - if(This->bsc.doc && This->bsc.doc->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { + if(This->bsc.doc && This->bsc.doc->doc_obj->bscallback == This && This->bsc.doc->doc_obj->nscontainer) { update_nsdocument(This->bsc.doc->doc_obj); init_nsevents(This->bsc.doc->doc_obj->nscontainer); } @@ -1109,19 +1109,19 @@ void set_document_bscallback(HTMLDocument *doc, nsChannelBSC *callback) { BSCallback *iter; - if(doc->bscallback) { - if(doc->bscallback->bsc.binding) - IBinding_Abort(doc->bscallback->bsc.binding); - doc->bscallback->bsc.doc = NULL; - IBindStatusCallback_Release(STATUSCLB(&doc->bscallback->bsc)); + if(doc->doc_obj->bscallback) { + if(doc->doc_obj->bscallback->bsc.binding) + IBinding_Abort(doc->doc_obj->bscallback->bsc.binding); + doc->doc_obj->bscallback->bsc.doc = NULL; + IBindStatusCallback_Release(STATUSCLB(&doc->doc_obj->bscallback->bsc)); } - LIST_FOR_EACH_ENTRY(iter, &doc->bindings, BSCallback, entry) { + LIST_FOR_EACH_ENTRY(iter, &doc->doc_obj->bindings, BSCallback, entry) { iter->doc = NULL; list_remove(&iter->entry); } - doc->bscallback = callback; + doc->doc_obj->bscallback = callback; if(callback) { IBindStatusCallback_AddRef(STATUSCLB(&callback->bsc)); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index d8da015..bf5b7c1 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -543,9 +543,9 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, This->usermode = EDITMODE; - if(This->mon) { + if(This->doc_obj->mon) { CLSID clsid = IID_NULL; - hres = IMoniker_GetClassID(This->mon, &clsid); + hres = IMoniker_GetClassID(This->doc_obj->mon, &clsid); if(SUCCEEDED(hres)) { /* We should use IMoniker::Save here */ FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); @@ -588,11 +588,11 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, update_doc(This, UPDATE_UI); - if(This->mon) { + if(This->doc_obj->mon) { /* FIXME: We should find nicer way to do this */ remove_doc_tasks(This); - mon = This->mon; + mon = This->doc_obj->mon; IMoniker_AddRef(mon); }else { static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 872ed1e..7ff3821 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -52,27 +52,27 @@ void set_current_mon(HTMLDocument *This, IMoniker *mon) { HRESULT hres; - if(This->mon) { - IMoniker_Release(This->mon); - This->mon = NULL; + if(This->doc_obj->mon) { + IMoniker_Release(This->doc_obj->mon); + This->doc_obj->mon = NULL; } - if(This->url) { - CoTaskMemFree(This->url); - This->url = NULL; + if(This->doc_obj->url) { + CoTaskMemFree(This->doc_obj->url); + This->doc_obj->url = NULL; } if(!mon) return; IMoniker_AddRef(mon); - This->mon = mon; + This->doc_obj->mon = mon; - hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->doc_obj->url); if(FAILED(hres)) WARN("GetDisplayName failed: %08x\n", hres); - set_script_mode(This->window, use_gecko_script(This->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); + set_script_mode(This->window, use_gecko_script(This->doc_obj->url) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) @@ -292,7 +292,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva return hres; if(!bind_complete) - return start_binding(This, (BSCallback*)This->bscallback, pibc); + return start_binding(This, (BSCallback*)This->doc_obj->bscallback, pibc); return S_OK; } @@ -318,11 +318,11 @@ static HRESULT WINAPI PersistMoniker_GetCurMoniker(IPersistMoniker *iface, IMoni TRACE("(%p)->(%p)\n", This, ppimkName); - if(!This->mon) + if(!This->doc_obj->mon) return E_UNEXPECTED; - IMoniker_AddRef(This->mon); - *ppimkName = This->mon; + IMoniker_AddRef(This->doc_obj->mon); + *ppimkName = This->doc_obj->mon; return S_OK; } @@ -556,7 +556,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->bscallback, pStm); + return channelbsc_load_stream(This->doc_obj->bscallback, pStm); } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, @@ -692,9 +692,4 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->lpMonikerPropVtbl = &MonikerPropVtbl; This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; This->lpPersistHistoryVtbl = &PersistHistoryVtbl; - - This->bscallback = NULL; - This->mon = NULL; - This->url = NULL; - This->mime = NULL; }

1 0

Jacek Caban : mshtml: Moved state flags to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: b3c2b380b8ab09387ecb6d4f73b31a715e178088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c2b380b8ab09387ecb6d4f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:11:26 2009 +0200 mshtml: Moved state flags to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 13 +++++++------ dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 12 ++++++------ dlls/mshtml/olecmd.c | 4 ++-- dlls/mshtml/oleobj.c | 10 +++++----- dlls/mshtml/olewnd.c | 12 ++++++------ dlls/mshtml/view.c | 24 ++++++++++++------------ 8 files changed, 40 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c2b380b8ab09387ecb6…

1 0

Jacek Caban : mshtml: Moved hostinfo to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: e1aa05b13e151cfa3781ac1fcd30ee37c91e8b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1aa05b13e151cfa3781ac1fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:11:05 2009 +0200 mshtml: Moved hostinfo to HTMLDocumentObj. --- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/oleobj.c | 4 ++-- dlls/mshtml/view.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 77cb5a7..94ddbbc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -289,8 +289,6 @@ struct HTMLDocument { LPOLESTR url; struct list bindings; - DOCHOSTUIINFO hostinfo; - USERMODE usermode; READYSTATE readystate; BOOL in_place_active; @@ -350,6 +348,8 @@ struct HTMLDocumentObj { IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window; + DOCHOSTUIINFO hostinfo; + IOleUndoManager *undomgr; HWND hwnd; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index b0a097f..f25611d 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -111,7 +111,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->hostui = NULL; } - memset(&This->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); if(!pClientSite) return S_OK; @@ -130,7 +130,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); update_hostinfo(This->doc_obj, &hostinfo); - This->hostinfo = hostinfo; + This->doc_obj->hostinfo = hostinfo; } if(!This->has_key_path) { diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index ae9ad39..dcc2ebf 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -60,7 +60,7 @@ static void paint_document(HTMLDocumentObj *This) hdc = BeginPaint(This->hwnd, &ps); - if(!(This->basedoc.hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) DrawEdge(hdc, &rect, EDGE_SUNKEN, BF_RECT|BF_ADJUST); if(!This->nscontainer) { @@ -204,7 +204,7 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if(This->nscontainer) { INT ew=0, eh=0; - if(!(This->basedoc.hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) { + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) { ew = GetSystemMetrics(SM_CXEDGE); eh = GetSystemMetrics(SM_CYEDGE); }

1 0

Jacek Caban : mshtml: Moved hwnd and tooltip_hwnd to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: fffc8c66fd330607261f2845622dbbe338680d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffc8c66fd330607261f28456… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:10:47 2009 +0200 mshtml: Moved hwnd and tooltip_hwnd to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 12 ++++--- dlls/mshtml/htmlwindow.c | 6 ++-- dlls/mshtml/mshtml_private.h | 12 ++++---- dlls/mshtml/nsembed.c | 6 ++-- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/olewnd.c | 8 ++-- dlls/mshtml/view.c | 66 +++++++++++++++++++++--------------------- 8 files changed, 58 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fffc8c66fd330607261f2…

1 0

Jacek Caban : mshtml: Moved undomgr to HTMLDocumentObj.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: aadd0774dbd856ac38af0288113964d434ade666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadd0774dbd856ac38af02881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 22:10:30 2009 +0200 mshtml: Moved undomgr to HTMLDocumentObj. --- dlls/mshtml/htmldoc.c | 5 ++--- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/service.c | 10 ++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b37ff72..ecff6f2 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1764,9 +1764,6 @@ static void destroy_htmldoc(HTMLDocument *This) { remove_doc_tasks(This); - if(This->undomgr) - IOleUndoManager_Release(This->undomgr); - set_document_bscallback(This, NULL); set_current_mon(This, NULL); @@ -1899,6 +1896,8 @@ static ULONG HTMLDocumentObj_Release(HTMLDocument *base) IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(&This->basedoc)); if(This->ipsite) IOleDocumentView_SetInPlaceSite(DOCVIEW(&This->basedoc), NULL); + if(This->undomgr) + IOleUndoManager_Release(This->undomgr); destroy_htmldoc(&This->basedoc); if(This->basedoc.nsdoc) remove_mutation_observer(This->nscontainer, This->basedoc.nsdoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7db3b8b..d676108 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -284,8 +284,6 @@ struct HTMLDocument { HTMLWindow *window; nsIDOMHTMLDocument *nsdoc; - IOleUndoManager *undomgr; - nsChannelBSC *bscallback; IMoniker *mon; LPOLESTR url; @@ -354,6 +352,8 @@ struct HTMLDocumentObj { IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window; + + IOleUndoManager *undomgr; }; typedef struct { diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index f2d619e..d120cf4 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -240,11 +240,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG if(IsEqualGUID(&IID_IOleUndoManager, riid)) { TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); - if(!This->undomgr) - This->undomgr = create_undomgr(); + if(!This->doc_obj->undomgr) + This->doc_obj->undomgr = create_undomgr(); - IOleUndoManager_AddRef(This->undomgr); - *ppv = This->undomgr; + IOleUndoManager_AddRef(This->doc_obj->undomgr); + *ppv = This->doc_obj->undomgr; return S_OK; } @@ -263,6 +263,4 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { void HTMLDocument_Service_Init(HTMLDocument *This) { This->lpServiceProviderVtbl = &ServiceProviderVtbl; - - This->undomgr = NULL; }

1 0