reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-19 12:21:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Handle fClearDirty flag in IPersistStreamInit::Save.

Browse Source
This commit is contained in:
Jacek Caban 2008-01-10 12:53:38 +01:00 committed by Alexandre Julliard
parent 7de847c6ee
commit c58ca1312c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mshtml/editor.c
View File

@ -99,11 +99,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR wszFont[] = {'f','o','n','t',0}; static const WCHAR wszFont[] = {'f','o','n','t',0};
static const WCHAR wszSize[] = {'s','i','z','e',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; nsresult nsres;
if(!This->nscontainer || !This->nscontainer->editor) if(This->usermode != EDITMODE || !This->nscontainer || !This->nscontainer->editor)
return; return;
if(dirty) { 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); TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out);
if(!in || This->usermode != EDITMODE) if(!in)
return S_OK; return S_OK;
if(V_VT(in) == VT_BOOL) if(V_VT(in) == VT_BOOL)

3
dlls/mshtml/mshtml_private.h
View File

@ -490,8 +490,9 @@ void handle_edit_event(HTMLDocument*,nsIDOMEvent*);
HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*);
HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*);
HRESULT editor_exec_paste(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*); HRESULT editor_is_dirty(HTMLDocument*);
void set_dirty(HTMLDocument*,VARIANT_BOOL);
extern DWORD mshtml_tls; extern DWORD mshtml_tls;

7
dlls/mshtml/persist.c
View File

@ -705,18 +705,21 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM
DWORD len, written=0; DWORD len, written=0;
HRESULT hres; 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); hres = get_doc_string(This, &str, &len);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = IStream_Write(pStm, str, len, &written); hres = IStream_Write(pStm, str, len, &written);
if(FAILED(hres)) if(FAILED(hres))
FIXME("Write failed: %08x\n", hres); FIXME("Write failed: %08x\n", hres);
heap_free(str); heap_free(str);
if(fClearDirty)
set_dirty(This, VARIANT_FALSE);
return S_OK; return S_OK;
} }