Jacek Caban : mshtml: Move Exec(CGID_ShellDocView,
37) call to match native .
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jun 12 06:30:42 CDT 2007
Module: wine
Branch: master
Commit: 8d4c839ab8914399b7dbbef2fd00540606712043
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4c839ab8914399b7dbbef2fd00540606712043
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jun 11 17:26:31 2007 +0200
mshtml: Move Exec(CGID_ShellDocView, 37) call to match native.
---
dlls/mshtml/persist.c | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 13c07d4..8959cd7 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -166,23 +166,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
TRACE("got url: %s\n", debugstr_w(url));
if(This->client) {
- IOleCommandTarget *cmdtrg = NULL;
-
- hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget,
- (void**)&cmdtrg);
- if(SUCCEEDED(hres)) {
- VARIANT var;
-
- V_VT(&var) = VT_I4;
- V_I4(&var) = 0;
- IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL);
-
- IOleCommandTarget_Release(cmdtrg);
- }
- }
-
- if(This->client) {
VARIANT silent, offline;
+ IOleCommandTarget *cmdtrg = NULL;
hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent);
if(SUCCEEDED(hres)) {
@@ -200,6 +185,18 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
else if(V_BOOL(&silent))
FIXME("offline == true\n");
}
+
+ hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget,
+ (void**)&cmdtrg);
+ if(SUCCEEDED(hres)) {
+ VARIANT var;
+
+ V_VT(&var) = VT_I4;
+ V_I4(&var) = 0;
+ IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL);
+
+ IOleCommandTarget_Release(cmdtrg);
+ }
}
bscallback = create_bscallback(mon);
More information about the wine-cvs
mailing list