Michał Ziętek : wscript: Fix tests on wow64.

[Alexandre Julliard]

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

Author: Michał Ziętek <smierc.w.wenecji at gmail.com>
Date:   Fri Aug  5 16:26:43 2011 +0200

wscript: Fix tests on wow64.

---

 programs/wscript/tests/Makefile.in |    2 +-
 programs/wscript/tests/run.c       |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/programs/wscript/tests/Makefile.in b/programs/wscript/tests/Makefile.in
index 78f0cc4..7d6a45d 100644
--- a/programs/wscript/tests/Makefile.in
+++ b/programs/wscript/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = wscript.exe
-IMPORTS   = ole32 oleaut32 advapi32
+IMPORTS   = ole32 oleaut32 psapi advapi32
 
 C_SRCS = \
 	run.c
diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c
index 50aa398..7d43d66 100644
--- a/programs/wscript/tests/run.c
+++ b/programs/wscript/tests/run.c
@@ -23,6 +23,7 @@
 
 #include <initguid.h>
 #include <windows.h>
+#include <psapi.h>
 #include <oaidl.h>
 
 #include "wine/test.h"
@@ -70,6 +71,7 @@ static const GUID CLSID_TestObj =
     {0x178fc166,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}};
 
 static const char *script_name;
+static HANDLE wscript_process;
 
 static int strcmp_wa(LPCWSTR strw, const char *stra)
 {
@@ -199,14 +201,13 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
     case DISPID_TESTOBJ_WSCRIPTFULLNAME:
     {
         WCHAR fullName[MAX_PATH];
-        const WCHAR wscriptexe[] = {'w','s','c','r','i','p','t','.','e','x','e',0};
         DWORD res;
 
         ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags);
         ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
         ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
         V_VT(pVarResult) = VT_BSTR;
-        res = SearchPathW(NULL, wscriptexe, NULL, sizeof(fullName)/sizeof(WCHAR), fullName, NULL);
+        res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR));
         if(res == 0)
             return E_FAIL;
         if(!(V_BSTR(pVarResult) = SysAllocString(fullName)))
@@ -216,7 +217,6 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
     case DISPID_TESTOBJ_WSCRIPTPATH:
     {
         WCHAR fullPath[MAX_PATH];
-        const WCHAR wscriptexe[] = {'w','s','c','r','i','p','t','.','e','x','e',0};
         DWORD res;
         const WCHAR *pos;
 
@@ -224,7 +224,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
         ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
         ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
         V_VT(pVarResult) = VT_BSTR;
-        res = SearchPathW(NULL, wscriptexe, NULL, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL);
+        res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR));
         if(res == 0)
             return E_FAIL;
         pos = mystrrchr(fullPath, '\\');
@@ -347,6 +347,7 @@ static void run_test(const char *file_name)
         return;
     }
 
+    wscript_process = pi.hProcess;
     WaitForSingleObject(pi.hProcess, INFINITE);
     CloseHandle(pi.hThread);
     CloseHandle(pi.hProcess);