Jacek Caban : mshtml: Set correct load type in load_nsuri.

Alexandre Julliard julliard at winehq.org
Tue Jul 25 16:11:27 CDT 2017


Module: wine
Branch: master
Commit: fcd136e1a2a074c9139b90de87926ad00133759f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fcd136e1a2a074c9139b90de87926ad00133759f

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Jul 25 15:30:32 2017 +0200

mshtml: Set correct load type in load_nsuri.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/nsiface.idl | 25 ++++++++++++++++++++++++-
 dlls/mshtml/nsio.c      |  3 +++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 83b91a7..04add4d 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -3757,9 +3757,32 @@ interface nsIContentViewer : nsISupports
 ]
 interface nsIDocShellLoadInfo : nsISupports
 {
-    typedef int32_t nsDocShellInfoLoadType;
     typedef uint32_t nsDocShellInfoReferrerPolicy;
 
+    typedef enum {
+        loadNormal = 0,
+        loadNormalReplace = 1,
+        loadHistory = 2,
+        loadReloadNormal = 3,
+        loadReloadBypassCache = 4,
+        loadReloadBypassProxy = 5,
+        loadReloadBypassProxyAndCache = 6,
+        loadLink = 7,
+        loadRefresh = 8,
+        loadReloadCharsetChange = 9,
+        loadBypassHistory = 10,
+        loadStopContent = 11,
+        loadStopContentAndReplace = 12,
+        loadNormalExternal = 13,
+        loadNormalBypassCache = 14,
+        loadNormalBypassProxy = 15,
+        loadNormalBypassProxyAndCache = 16,
+        loadPushState = 17,
+        loadReplaceBypassCache = 18,
+        loadReloadMixedContent = 19,
+        loadNormalAllowMixedContent = 20
+    } nsDocShellInfoLoadType;
+
     nsresult GetReferrer(nsIURI **aReferrer);
     nsresult SetReferrer(nsIURI *aReferrer);
     nsresult GetOriginalURI(nsIURI **aOriginalURI);
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 5a806c4..7baf0cc 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -296,6 +296,9 @@ HRESULT load_nsuri(HTMLOuterWindow *window, nsWineURI *uri, nsIInputStream *post
             return E_FAIL;
         }
 
+        nsres = nsIDocShellLoadInfo_SetLoadType(load_info, (flags & LOAD_FLAGS_BYPASS_CACHE) ? loadNormalBypassCache : loadNormal);
+        assert(nsres == NS_OK);
+
         nsres = nsIDocShellLoadInfo_SetPostDataStream(load_info, post_stream);
         assert(nsres == NS_OK);
     }




More information about the wine-cvs mailing list