Jacek Caban : shdocvw: Don' t fail on invalid headers argument in navigate_url.
Alexandre Julliard
julliard at winehq.org
Thu Jul 22 12:09:35 CDT 2010
Module: wine
Branch: master
Commit: ad759e793cf86dda7c8611c607911f8f3a53a9a4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad759e793cf86dda7c8611c607911f8f3a53a9a4
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jul 22 13:58:45 2010 +0200
shdocvw: Don't fail on invalid headers argument in navigate_url.
---
dlls/shdocvw/navigate.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 6f05cf2..6d73fd9 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -759,19 +759,12 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags,
Flags, Flags ? V_VT(Flags) : -1, TargetFrameName,
TargetFrameName ? V_VT(TargetFrameName) : -1);
- if(PostData) {
- TRACE("PostData vt=%d\n", V_VT(PostData));
-
- if(V_VT(PostData) == (VT_ARRAY | VT_UI1)) {
- SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data);
- post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements;
- }
+ if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1)) {
+ SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data);
+ post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements;
}
- if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) {
- if(V_VT(Headers) != VT_BSTR)
- return E_INVALIDARG;
-
+ if(Headers && V_VT(Headers) == VT_BSTR) {
headers = V_BSTR(Headers);
TRACE("Headers: %s\n", debugstr_w(headers));
}
More information about the wine-cvs
mailing list