ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Move IsDirty implementation to GeckoBrowser.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-03-12 16:11:10 +01:00 committed by Alexandre Julliard
parent 53e095c2e8
commit 1ea4924e46
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mshtml/editor.c
View File

@ -1223,15 +1223,14 @@ void init_editor(HTMLDocument *This)
set_ns_fontname(This, "Times New Roman"); set_ns_fontname(This, "Times New Roman");
} }
HRESULT editor_is_dirty(HTMLDocument *This) HRESULT browser_is_dirty(GeckoBrowser *browser)
{ {
cpp_bool modified; cpp_bool modified;
if(!This->doc_obj->nscontainer || !This->doc_obj->nscontainer->editor) if(browser->usermode != EDITMODE || !browser->editor)
return S_FALSE; return S_FALSE;
nsIEditor_GetDocumentModified(This->doc_obj->nscontainer->editor, &modified); nsIEditor_GetDocumentModified(browser->editor, &modified);
return modified ? S_OK : S_FALSE; return modified ? S_OK : S_FALSE;
} }

2
dlls/mshtml/mshtml_private.h
View File

@ -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_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN;
HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN;
void handle_edit_load(HTMLDocument*) 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; void set_dirty(GeckoBrowser*,VARIANT_BOOL) DECLSPEC_HIDDEN;
extern DWORD mshtml_tls DECLSPEC_HIDDEN; extern DWORD mshtml_tls DECLSPEC_HIDDEN;

5
dlls/mshtml/persist.c
View File

@ -884,10 +884,7 @@ static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface)
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if(This->doc_obj->nscontainer->usermode == EDITMODE) return browser_is_dirty(This->doc_obj->nscontainer);
return editor_is_dirty(This);
return S_FALSE;
} }
static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *pStm) static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *pStm)