winhttp: Always use the 64-bit version of IActiveScriptParse.

Hans Leidekker hans at codeweavers.com
Fri Jul 27 07:03:41 CDT 2012


---
 dlls/winhttp/Makefile.in |    1 +
 dlls/winhttp/session.c   |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index 53b5b97..130971e 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -3,6 +3,7 @@ IMPORTLIB = winhttp
 IMPORTS   = uuid user32 advapi32
 DELAYIMPORTS = oleaut32 ole32 crypt32
 EXTRALIBS = @SOCKETLIBS@
+EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	cookie.c \
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index e3e5e2b..d32a801 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -1832,7 +1832,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
 {
     static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0};
     static const WCHAR findproxyW[] = {'F','i','n','d','P','r','o','x','y','F','o','r','U','R','L',0};
-    IActiveScriptParse *parser = NULL;
+    IActiveScriptParse64 *parser = NULL;
     IActiveScript *engine = NULL;
     IDispatch *dispatch = NULL;
     BOOL ret = FALSE;
@@ -1859,7 +1859,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
                            &IID_IActiveScript, (void **)&engine );
     if (hr != S_OK) goto done;
 
-    hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse, (void **)&parser );
+    hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse64, (void **)&parser );
     if (hr != S_OK) goto done;
 
     hr = IActiveScriptParse64_InitNew( parser );
@@ -1910,7 +1910,7 @@ done:
     SysFreeString( hostname );
     SysFreeString( func );
     if (dispatch) IDispatch_Release( dispatch );
-    if (parser) IUnknown_Release( parser );
+    if (parser) IActiveScriptParse64_Release( parser );
     if (engine) IActiveScript_Release( engine );
     if (SUCCEEDED( init )) CoUninitialize();
     if (!ret) set_last_error( ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT );
-- 
1.7.10.4






More information about the wine-patches mailing list