June 2007 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Call update_doc in exec_editmode.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 86e224c12d09183551af29e0727322d2f6d7eec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e224c12d09183551af29e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:40:16 2007 +0200 mshtml: Call update_doc in exec_editmode. --- dlls/mshtml/olecmd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 2c30dc7..8a0aa61 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -553,6 +553,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; } + update_doc(This, UPDATE_UI); + return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); }

1 0

Jacek Caban : mshtml: Move Exec(OLECMDID_SETTITLE) call to separated function and use it in on_timer.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 20d77432a25c61f970111ea8606194943ddcaa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d77432a25c61f970111ea86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:39:39 2007 +0200 mshtml: Move Exec(OLECMDID_SETTITLE) call to separated function and use it in on_timer. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 1 + dlls/mshtml/task.c | 15 +++------------ dlls/mshtml/view.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dd54bd..9668fcd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -388,6 +388,7 @@ extern const cmdtable_t editmode_cmds[]; #define UPDATE_TITLE 0x0002 void update_doc(HTMLDocument *This, DWORD flags); +void update_title(HTMLDocument*); /* editor */ void set_ns_editmode(NSContainer*); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8045241..cb1025b 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -153,6 +153,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO This->readystate = READYSTATE_LOADING; call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + update_doc(This, UPDATE_TITLE); HTMLDocument_LockContainer(This, TRUE); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 8949cdf..057f227 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -155,6 +155,8 @@ static void set_parsecomplete(HTMLDocument *doc) IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); } doc->readystate = READYSTATE_COMPLETE; @@ -165,18 +167,7 @@ static void set_parsecomplete(HTMLDocument *doc) IOleInPlaceFrame_SetStatusText(doc->frame, wszDone); } - if(olecmd) { - VARIANT title; - WCHAR empty[] = {0}; - - V_VT(&title) = VT_BSTR; - V_BSTR(&title) = SysAllocString(empty); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, - &title, NULL); - SysFreeString(V_BSTR(&title)); - - IOleCommandTarget_Release(olecmd); - } + update_title(doc); } static void set_progress(HTMLDocument *doc) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 238ed09..4c7cea9 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -104,6 +104,34 @@ void update_doc(HTMLDocument *This, DWORD flags) This->update |= flags; } +void update_title(HTMLDocument *This) +{ + IOleCommandTarget *olecmd; + HRESULT hres; + + if(!(This->update & UPDATE_TITLE)) + return; + + This->update &= ~UPDATE_TITLE; + + if(!This->client) + return; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT title; + WCHAR empty[] = {0}; + + V_VT(&title) = VT_BSTR; + V_BSTR(&title) = SysAllocString(empty); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, + &title, NULL); + SysFreeString(V_BSTR(&title)); + + IOleCommandTarget_Release(olecmd); + } +} + static LRESULT on_timer(HTMLDocument *This) { TRACE("(%p) %x\n", This, This->update); @@ -131,6 +159,7 @@ static LRESULT on_timer(HTMLDocument *This) } } + update_title(This); This->update = 0; return 0; }

1 0

Jacek Caban : mshtml: Added test of callbacks called from document timer.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 1e2ec943256c8d4081c7871403c657b41c2e5b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2ec943256c8d4081c787140… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:40:50 2007 +0200 mshtml: Added test of callbacks called from document timer. --- dlls/mshtml/tests/htmldoc.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 083181a..9033c55 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -151,6 +151,35 @@ static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_readyState(IUnknown*); static void test_MSHTML_QueryStatus(IUnknown*,DWORD); +#define EXPECT_UPDATEUI 1 +#define EXPECT_SETTITLE 2 + +static void test_timer(DWORD flags) +{ + BOOL *b = &called_Exec_SETTITLE; + MSG msg; + + if(flags & EXPECT_UPDATEUI) { + SET_EXPECT(UpdateUI); + SET_EXPECT(Exec_UPDATECOMMANDS); + b = &called_UpdateUI; + } + if(flags & EXPECT_SETTITLE) + SET_EXPECT(Exec_SETTITLE); + + while(!*b && GetMessage(&msg, hwnd, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + if(flags & EXPECT_UPDATEUI) { + CHECK_CALLED(UpdateUI); + CHECK_CALLED(Exec_UPDATECOMMANDS); + } + if(flags & EXPECT_SETTITLE) + CHECK_CALLED(Exec_SETTITLE); +} + static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -1493,6 +1522,8 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum } } + test_timer(EXPECT_UPDATEUI | ((load_state == LD_LOADING) ? EXPECT_SETTITLE : 0)); + if(activeobj) IOleInPlaceActiveObject_Release(activeobj); } @@ -2258,7 +2289,6 @@ static void test_download(BOOL verb_done, BOOL css_dwl) SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); - SET_EXPECT(Exec_SETTITLE); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, hwnd, 0, 0)) { @@ -2299,7 +2329,6 @@ static void test_download(BOOL verb_done, BOOL css_dwl) CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); - CHECK_CALLED(Exec_SETTITLE); load_state = LD_COMPLETE; @@ -2568,6 +2597,8 @@ static void test_exec_editmode(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); + test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); + IOleCommandTarget_Release(cmdtrg); editmode = TRUE; @@ -3016,6 +3047,8 @@ static void test_StreamLoad(IUnknown *unk) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Read); + test_timer(EXPECT_SETTITLE); + IPersistStreamInit_Release(init); }

1 0

Jacek Caban : mshtml: Call UpdateUI and Exec(OLECMDID_UPDATECOMMANDS) from timer callback.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: d8e518eb68632d694670b6adc2b5285dc0c46958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e518eb68632d694670b6adc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:38:51 2007 +0200 mshtml: Call UpdateUI and Exec(OLECMDID_UPDATECOMMANDS) from timer callback. --- dlls/mshtml/mshtml_private.h | 7 +++++ dlls/mshtml/view.c | 51 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7842e85..7dd54bd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -115,6 +115,8 @@ struct HTMLDocument { BOOL has_key_path; BOOL container_locked; + DWORD update; + ConnectionPoint *cp_htmldocevents; ConnectionPoint *cp_htmldocevents2; ConnectionPoint *cp_propnotif; @@ -382,6 +384,11 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; +#define UPDATE_UI 0x0001 +#define UPDATE_TITLE 0x0002 + +void update_doc(HTMLDocument *This, DWORD flags); + /* editor */ void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 79fe399..238ed09 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define TIMER_ID 0x1000 + static const WCHAR wszInternetExplorer_Server[] = {'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','_','S','e','r','v','e','r',0}; @@ -94,6 +96,45 @@ static void activate_gecko(HTMLDocument *This) nsIWebBrowserFocus_Activate(This->nscontainer->focus); } +void update_doc(HTMLDocument *This, DWORD flags) +{ + if(!This->update && This->hwnd) + SetTimer(This->hwnd, TIMER_ID, 100, NULL); + + This->update |= flags; +} + +static LRESULT on_timer(HTMLDocument *This) +{ + TRACE("(%p) %x\n", This, This->update); + + KillTimer(This->hwnd, TIMER_ID); + + if(!This->update) + return 0; + + if(This->update & UPDATE_UI) { + if(This->hostui) + IDocHostUIHandler_UpdateUI(This->hostui); + + if(This->client) { + IOleCommandTarget *cmdtrg; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, + (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_UPDATECOMMANDS, + OLECMDEXECOPT_DONTPROMPTUSER, NULL, NULL); + IOleCommandTarget_Release(cmdtrg); + } + } + } + + This->update = 0; + return 0; +} + static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { HTMLDocument *This; @@ -130,6 +171,9 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM LOWORD(lParam) - 2*ew, HIWORD(lParam) - 2*eh, SWP_NOZORDER | SWP_NOACTIVATE); } + break; + case WM_TIMER: + return on_timer(This); } return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -211,8 +255,8 @@ static HRESULT activate_window(HTMLDocument *This) /* NOTE: * Windows implementation calls: * RegisterWindowMessage("MSWHEEL_ROLLMSG"); - * SetTimer(This->hwnd, TIMER_ID, 100, NULL); */ + SetTimer(This->hwnd, TIMER_ID, 100, NULL); } This->in_place_active = TRUE; @@ -442,6 +486,7 @@ static HRESULT WINAPI OleDocumentView_Show(IOleDocumentView *iface, BOOL fShow) if(FAILED(hres)) return hres; } + update_doc(This, UPDATE_UI); ShowWindow(This->hwnd, SW_SHOW); }else { ShowWindow(This->hwnd, SW_HIDE); @@ -472,6 +517,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } + update_doc(This, UPDATE_UI); + hres = IOleInPlaceSite_OnUIActivate(This->ipsite); if(SUCCEEDED(hres)) { OLECHAR wszHTMLDocument[30]; @@ -682,4 +729,6 @@ void HTMLDocument_View_Init(HTMLDocument *This) This->in_place_active = FALSE; This->ui_active = FALSE; This->window_active = FALSE; + + This->update = 0; }

1 0

Jacek Caban : mshtml: Use IOleCommandTarget::Exec to implement context menu .
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 03342918285d02ba87bb006f078b3d9d7fe151a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03342918285d02ba87bb006f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:38:16 2007 +0200 mshtml: Use IOleCommandTarget::Exec to implement context menu. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/olecmd.c | 21 +++++++++++++++++++++ dlls/mshtml/olewnd.c | 19 ------------------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3f54104..7842e85 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -313,7 +313,7 @@ NSContainer *NSContainer_Create(HTMLDocument*,NSContainer*); void NSContainer_Release(NSContainer*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); -void HTMLDocument_ShowContextMenu(HTMLDocument*,DWORD,POINT*); +void show_context_menu(HTMLDocument*,DWORD,POINT*); void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR); void hide_tooltip(HTMLDocument*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c2c7318..a5dd2d5 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -898,7 +898,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList FIXME("aContextFlags=%08x\n", aContextFlags); }; - HTMLDocument_ShowContextMenu(This->doc, dwID, &pt); + show_context_menu(This->doc, dwID, &pt); return NS_OK; } diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 8c4b8cf..2c30dc7 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -814,6 +814,27 @@ static const IOleCommandTargetVtbl OleCommandTargetVtbl = { OleCommandTarget_Exec }; +void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt) +{ + HMENU menu_res, menu; + DWORD cmdid; + HRESULT hres; + + hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, + (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This)); + if(hres == S_OK) + return; + + menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); + menu = GetSubMenu(menu_res, dwID); + + cmdid = TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, + ppt->x, ppt->y, 0, This->hwnd, NULL); + DestroyMenu(menu_res); + + IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL); +} + void HTMLDocument_OleCmd_Init(HTMLDocument *This) { This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 45e505a..d91e792 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -262,25 +262,6 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { #undef INPLACEWIN_THIS -void HTMLDocument_ShowContextMenu(HTMLDocument *This, DWORD dwID, POINT *ppt) -{ - HMENU menu_res, menu; - HRESULT hres; - - hres = IDocHostUIHandler_ShowContextMenu(This->hostui, dwID, ppt, - (IUnknown*)CMDTARGET(This), (IDispatch*)HTMLDOC(This)); - if(hres == S_OK) - return; - - menu_res = LoadMenuW(get_shdoclc(), MAKEINTRESOURCEW(IDR_BROWSE_CONTEXT_MENU)); - menu = GetSubMenu(menu_res, dwID); - - TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, - ppt->x, ppt->y, 0, This->hwnd, NULL); - - DestroyMenu(menu_res); -} - void HTMLDocument_Window_Init(HTMLDocument *This) { This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl;

1 0

Jacek Caban : mshtml: Move setup_ns_editing to nsembed.c.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 791b868ce7883c254cee007cc759f45efd2ca9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b868ce7883c254cee007cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:35:11 2007 +0200 mshtml: Move setup_ns_editing to nsembed.c. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 48 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/olecmd.c | 50 +----------------------------------------- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a0b17b..3f54104 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -383,6 +383,7 @@ typedef struct { extern const cmdtable_t editmode_cmds[]; /* editor */ +void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2040e03..c2c7318 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -580,6 +580,54 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) nsIContentSerializer_Release(serializer); } +void set_ns_editmode(NSContainer *This) +{ + nsIInterfaceRequestor *iface_req; + nsIEditingSession *editing_session = NULL; + nsIURIContentListener *listener = NULL; + nsIDOMWindow *dom_window = NULL; + nsresult nsres; + + nsres = nsIWebBrowser_QueryInterface(This->webbrowser, + &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); + return; + } + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, + (void**)&editing_session); + nsIInterfaceRequestor_Release(iface_req); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIEditingSession: %08x\n", nsres); + return; + } + + nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); + if(NS_FAILED(nsres)) { + ERR("Could not get content DOM window: %08x\n", nsres); + nsIEditingSession_Release(editing_session); + return; + } + + nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); + nsIEditingSession_Release(editing_session); + nsIDOMWindow_Release(dom_window); + if(NS_FAILED(nsres)) { + ERR("MakeWindowEditable failed: %08x\n", nsres); + return; + } + + /* MakeWindowEditable changes WebBrowser's parent URI content listener. + * It seams to be a bug in Gecko. To workaround it we set our content + * listener again and Gecko's one as its parent. + */ + nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); + nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); + nsIURIContentListener_Release(listener); + nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); +} + void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 2c5a8ba..468c401 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -511,54 +511,6 @@ static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in return S_OK; } -static void setup_ns_editing(NSContainer *This) -{ - nsIInterfaceRequestor *iface_req; - nsIEditingSession *editing_session = NULL; - nsIURIContentListener *listener = NULL; - nsIDOMWindow *dom_window = NULL; - nsresult nsres; - - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, - (void**)&editing_session); - nsIInterfaceRequestor_Release(iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIEditingSession: %08x\n", nsres); - return; - } - - nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); - if(NS_FAILED(nsres)) { - ERR("Could not get content DOM window: %08x\n", nsres); - nsIEditingSession_Release(editing_session); - return; - } - - nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, NULL, FALSE); - nsIEditingSession_Release(editing_session); - nsIDOMWindow_Release(dom_window); - if(NS_FAILED(nsres)) { - ERR("MakeWindowEditable failed: %08x\n", nsres); - return; - } - - /* MakeWindowEditable changes WebBrowser's parent URI content listener. - * It seams to be a bug in Gecko. To workaround it we set our content - * listener again and Gecko's one as its parent. - */ - nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); - nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); - nsIURIContentListener_Release(listener); - nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); -} - static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { IMoniker *mon; @@ -590,7 +542,7 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, } if(This->nscontainer) - setup_ns_editing(This->nscontainer); + set_ns_editmode(This->nscontainer); hres = CreateURLMoniker(NULL, wszAboutBlank, &mon); if(FAILED(hres)) {

1 0

Jacek Caban : mshtml: Forward all IsDirty implementations to one function.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: bf7a479042a13fa8528c194245751c53a17a5d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7a479042a13fa8528c19424… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:35:55 2007 +0200 mshtml: Forward all IsDirty implementations to one function. --- dlls/mshtml/persist.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2cc80ec..8045241 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -332,8 +332,10 @@ static HRESULT WINAPI PersistMoniker_GetClassID(IPersistMoniker *iface, CLSID *p static HRESULT WINAPI PersistMoniker_IsDirty(IPersistMoniker *iface) { HTMLDocument *This = PERSISTMON_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IPersistStreamInit_IsDirty(PERSTRINIT(This)); } static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAvailable, @@ -467,8 +469,10 @@ static HRESULT WINAPI PersistFile_GetClassID(IPersistFile *iface, CLSID *pClassI static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *iface) { HTMLDocument *This = PERSISTFILE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IPersistStreamInit_IsDirty(PERSTRINIT(This)); } static HRESULT WINAPI PersistFile_Load(IPersistFile *iface, LPCOLESTR pszFileName, DWORD dwMode)

1 0

Jacek Caban : mshtml: Don't crash in load_stream if Gecko is not available.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 95e96fd54784cf025a9355878569a3ff1c2224d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e96fd54784cf025a9355878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:36:54 2007 +0200 mshtml: Don't crash in load_stream if Gecko is not available. --- dlls/mshtml/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bcafb6c..dd7d78d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -826,8 +826,10 @@ HRESULT load_stream(BSCallback *bscallback, IStream *stream) add_nsrequest(bscallback); - bscallback->nschannel->content = mshtml_alloc(sizeof(text_html)); - memcpy(bscallback->nschannel->content, text_html, sizeof(text_html)); + if(bscallback->nschannel) { + bscallback->nschannel->content = mshtml_alloc(sizeof(text_html)); + memcpy(bscallback->nschannel->content, text_html, sizeof(text_html)); + } hres = read_stream_data(bscallback, stream); IBindStatusCallback_OnStopBinding(STATUSCLB(bscallback), hres, ERROR_SUCCESS);

1 0

Jacek Caban : mshtml: Don' t do anything in exec_editmode if edit mode is already set.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: 239b86fe8ff16c6be952421823beea36a4f55452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239b86fe8ff16c6be95242182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:37:37 2007 +0200 mshtml: Don't do anything in exec_editmode if edit mode is already set. --- dlls/mshtml/olecmd.c | 3 +++ dlls/mshtml/tests/htmldoc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 468c401..8c4b8cf 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -523,6 +523,9 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(in || out) FIXME("unsupported args\n"); + if(This->usermode == EDITMODE) + return S_OK; + This->usermode = EDITMODE; if(This->frame) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2627a85..083181a 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2571,6 +2571,10 @@ static void test_exec_editmode(IUnknown *unk) IOleCommandTarget_Release(cmdtrg); editmode = TRUE; + + hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + ok(hres == S_OK, "Exec failed: %08x\n", hres); } static HWND create_container_window(void)

1 0

Jacek Caban : mshtml: Make [get|set]_font_size static.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: bd71f19ef12af08d6bb22abf0d96e0c8a77b2450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd71f19ef12af08d6bb22abf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 10 11:34:38 2007 +0200 mshtml: Make [get|set]_font_size static. --- dlls/mshtml/editor.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b3ef0cb..9b68c32 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -247,7 +247,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ nsIDOMNodeList_Release(node_list); } -void get_font_size(HTMLDocument *This, WCHAR *ret) +static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); nsIDOMElement *elem = NULL; @@ -315,7 +315,7 @@ void get_font_size(HTMLDocument *This, WCHAR *ret) nsIDOMNode_Release(node); } -void set_font_size(HTMLDocument *This, LPCWSTR size) +static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; PRBool collapsed; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5c2d689..5a0b17b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -385,9 +385,6 @@ extern const cmdtable_t editmode_cmds[]; /* editor */ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); -void get_font_size(HTMLDocument*,WCHAR*); -void set_font_size(HTMLDocument*,LPCWSTR); - extern DWORD mshtml_tls; typedef struct task_t {

1 0