Jacek Caban : wscript: Use proper helpers for iface calls.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Mon Aug 13 11:10:21 2012 +0200

wscript: Use proper helpers for iface calls.

---

programs/wscript/main.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index d456e98..3d97bde 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -33,6 +33,20 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>

+#ifdef _WIN64
+
+#define IActiveScriptParse_Release IActiveScriptParse64_Release
+#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew
+#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText
+
+#else
+
+#define IActiveScriptParse_Release IActiveScriptParse32_Release
+#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew
+#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText
+
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(wscript);

static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0};
@@ -253,7 +267,7 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser)
     if(FAILED(hres))
         return FALSE;

-    hres = IActiveScriptParse64_InitNew(parser);
+    hres = IActiveScriptParse_InitNew(parser);
     if(FAILED(hres))
         return FALSE;

@@ -310,7 +324,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri
         return;
     }

-    hres = IActiveScriptParse64_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1,
+    hres = IActiveScriptParse_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1,
             SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL);
     SysFreeString(text);
     if(FAILED(hres)) {
@@ -406,7 +420,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
     }

IActiveScript_Release(script);
-    IUnknown_Release(parser);
+    IActiveScriptParse_Release(parser);

CoUninitialize();