reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Move Exec(OLECMDID_SETTITLE) call to separated function and use it in on_timer.

Browse Source
This commit is contained in:
Jacek Caban 2007-06-10 11:39:39 +02:00 committed by Alexandre Julliard
parent d8e518eb68
commit 20d77432a2
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/mshtml/mshtml_private.h
View File

@ -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*);

1
dlls/mshtml/persist.c
View File

@ -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);

15
dlls/mshtml/task.c
View File

@ -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)

29
dlls/mshtml/view.c
View File

@ -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;
}