Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
4432405e
Commit
4432405e
authored
May 02, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wscript: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bb90e8dd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
Makefile.in
programs/cscript/Makefile.in
+2
-1
Makefile.in
programs/wscript/Makefile.in
+2
-1
host.c
programs/wscript/host.c
+3
-4
main.c
programs/wscript/main.c
+6
-7
No files found.
programs/cscript/Makefile.in
View file @
4432405e
MODULE
=
cscript.exe
APPMODE
=
-mwindows
-municode
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
EXTRADEFS
=
-DCSCRIPT_BUILD
PARENTSRC
=
../wscript
EXTRADLLFLAGS
=
-mwindows
-municode
-mno-cygwin
C_SRCS
=
\
arguments.c
\
host.c
\
...
...
programs/wscript/Makefile.in
View file @
4432405e
MODULE
=
wscript.exe
APPMODE
=
-mwindows
-municode
IMPORTS
=
uuid shell32 oleaut32 ole32 user32 advapi32
EXTRADLLFLAGS
=
-mwindows
-municode
-mno-cygwin
RC_SRCS
=
\
rsrc.rc
...
...
programs/wscript/host.c
View file @
4432405e
...
...
@@ -29,7 +29,6 @@
#include <wine/debug.h>
#include <wine/heap.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL
(
wscript
);
...
...
@@ -80,7 +79,7 @@ static void print_string(const WCHAR *string)
return
;
}
len
=
strlenW
(
string
);
len
=
l
strlenW
(
string
);
ret
=
WriteConsoleW
(
GetStdHandle
(
STD_OUTPUT_HANDLE
),
string
,
len
,
&
count
,
NULL
);
if
(
ret
)
{
static
const
WCHAR
crnlW
[]
=
{
'\r'
,
'\n'
};
...
...
@@ -200,7 +199,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path)
if
(
GetModuleFileNameW
(
NULL
,
path
,
ARRAY_SIZE
(
path
))
==
0
)
return
E_FAIL
;
pos
=
strrchrW
(
path
,
'\\'
);
pos
=
wcsrchr
(
path
,
'\\'
);
howMany
=
pos
-
path
;
if
(
!
(
*
out_Path
=
SysAllocStringLen
(
path
,
howMany
)))
return
E_OUTOFMEMORY
;
...
...
@@ -237,7 +236,7 @@ static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName)
WINE_TRACE
(
"(%p)
\n
"
,
out_ScriptName
);
scriptName
=
strrchrW
(
scriptFullName
,
'\\'
);
scriptName
=
wcsrchr
(
scriptFullName
,
'\\'
);
++
scriptName
;
if
(
!
(
*
out_ScriptName
=
SysAllocString
(
scriptName
)))
return
E_OUTOFMEMORY
;
...
...
programs/wscript/main.c
View file @
4432405e
...
...
@@ -31,7 +31,6 @@
#include "wscript.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#ifdef _WIN64
...
...
@@ -87,7 +86,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface,
{
WINE_TRACE
(
"(%s %x %p %p)
\n
"
,
wine_dbgstr_w
(
pstrName
),
dwReturnMask
,
ppunkItem
,
ppti
);
if
(
strcmpW
(
pstrName
,
wshW
)
&&
strcmpW
(
pstrName
,
wscriptW
))
if
(
lstrcmpW
(
pstrName
,
wshW
)
&&
l
strcmpW
(
pstrName
,
wscriptW
))
return
E_FAIL
;
if
(
dwReturnMask
&
SCRIPTINFO_ITYPEINFO
)
{
...
...
@@ -261,7 +260,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid)
WINE_TRACE
(
"fileid is %s
\n
"
,
wine_dbgstr_w
(
fileid
));
strcatW
(
fileid
,
script_engineW
);
l
strcatW
(
fileid
,
script_engineW
);
res
=
RegOpenKeyW
(
HKEY_CLASSES_ROOT
,
fileid
,
&
hkey
);
if
(
res
!=
ERROR_SUCCESS
)
return
FALSE
;
...
...
@@ -400,11 +399,11 @@ static BOOL set_host_properties(const WCHAR *prop)
else
++
prop
;
if
(
strcmpiW
(
prop
,
iactive
)
==
0
)
if
(
wcsicmp
(
prop
,
iactive
)
==
0
)
wshInteractive
=
VARIANT_TRUE
;
else
if
(
strcmpiW
(
prop
,
batch
)
==
0
)
else
if
(
wcsicmp
(
prop
,
batch
)
==
0
)
wshInteractive
=
VARIANT_FALSE
;
else
if
(
strcmpiW
(
prop
,
nologoW
)
==
0
)
else
if
(
wcsicmp
(
prop
,
nologoW
)
==
0
)
WINE_FIXME
(
"ignored %s switch
\n
"
,
debugstr_w
(
nologoW
));
else
{
...
...
@@ -450,7 +449,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
if
(
!
res
||
res
>
ARRAY_SIZE
(
scriptFullName
))
return
1
;
ext
=
strrchrW
(
filepart
,
'.'
);
ext
=
wcsrchr
(
filepart
,
'.'
);
if
(
!
ext
||
!
get_engine_clsid
(
ext
,
&
clsid
))
{
WINE_FIXME
(
"Could not find engine for %s
\n
"
,
wine_dbgstr_w
(
ext
));
return
1
;
...
...
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