Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2f4ad88c
Commit
2f4ad88c
authored
Aug 05, 2011
by
Michał Ziętek
Committed by
Alexandre Julliard
Aug 05, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wscript: Fix tests on wow64.
parent
71a237d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Makefile.in
programs/wscript/tests/Makefile.in
+1
-1
run.c
programs/wscript/tests/run.c
+5
-4
No files found.
programs/wscript/tests/Makefile.in
View file @
2f4ad88c
TESTDLL
=
wscript.exe
IMPORTS
=
ole32 oleaut32 advapi32
IMPORTS
=
ole32 oleaut32
psapi
advapi32
C_SRCS
=
\
run.c
...
...
programs/wscript/tests/run.c
View file @
2f4ad88c
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment