Jacek Caban : mshtml: Handle fClearDirty flag in IPersistStreamInit::Save.
Alexandre Julliard
julliard at winehq.org
Thu Jan 10 06:42:10 CST 2008
Module: wine
Branch: master
Commit: c58ca1312cbb9298a22736e6e9c82e2413017c36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58ca1312cbb9298a22736e6e9c82e2413017c36
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jan 10 12:53:38 2008 +0100
mshtml: Handle fClearDirty flag in IPersistStreamInit::Save.
---
dlls/mshtml/editor.c | 6 +++---
dlls/mshtml/mshtml_private.h | 3 ++-
dlls/mshtml/persist.c | 7 +++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c
index aaf4a04..00a3ba1 100644
--- a/dlls/mshtml/editor.c
+++ b/dlls/mshtml/editor.c
@@ -99,11 +99,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR wszFont[] = {'f','o','n','t',0};
static const WCHAR wszSize[] = {'s','i','z','e',0};
-static void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty)
+void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty)
{
nsresult nsres;
- if(!This->nscontainer || !This->nscontainer->editor)
+ if(This->usermode != EDITMODE || !This->nscontainer || !This->nscontainer->editor)
return;
if(dirty) {
@@ -976,7 +976,7 @@ static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
{
TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out);
- if(!in || This->usermode != EDITMODE)
+ if(!in)
return S_OK;
if(V_VT(in) == VT_BOOL)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index c981348..e2abfa4 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -490,8 +490,9 @@ void handle_edit_event(HTMLDocument*,nsIDOMEvent*);
HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*);
HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*);
HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*);
-void handle_edit_load(HTMLDocument *This);
+void handle_edit_load(HTMLDocument*);
HRESULT editor_is_dirty(HTMLDocument*);
+void set_dirty(HTMLDocument*,VARIANT_BOOL);
extern DWORD mshtml_tls;
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 033ce7e..38b4cef 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -705,18 +705,21 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM
DWORD len, written=0;
HRESULT hres;
- WARN("(%p)->(%p %x) needs more work\n", This, pStm, fClearDirty);
+ TRACE("(%p)->(%p %x)\n", This, pStm, fClearDirty);
hres = get_doc_string(This, &str, &len);
if(FAILED(hres))
return hres;
-
hres = IStream_Write(pStm, str, len, &written);
if(FAILED(hres))
FIXME("Write failed: %08x\n", hres);
heap_free(str);
+
+ if(fClearDirty)
+ set_dirty(This, VARIANT_FALSE);
+
return S_OK;
}
More information about the wine-cvs
mailing list