Alexandre Julliard : wscript: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Thu May 2 16:45:07 CDT 2019
Module: wine
Branch: master
Commit: 4432405ec5b61536fe9a75c3289a8e6f35dfb203
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4432405ec5b61536fe9a75c3289a8e6f35dfb203
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu May 2 09:31:36 2019 +0200
wscript: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/cscript/Makefile.in | 3 ++-
programs/wscript/Makefile.in | 3 ++-
programs/wscript/host.c | 7 +++----
programs/wscript/main.c | 13 ++++++-------
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in
index b3fee31..73b8966 100644
--- a/programs/cscript/Makefile.in
+++ b/programs/cscript/Makefile.in
@@ -1,9 +1,10 @@
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 \
diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in
index 07d8832..96a4244 100644
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@@ -1,7 +1,8 @@
MODULE = wscript.exe
-APPMODE = -mwindows -municode
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32
+EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
+
RC_SRCS = \
rsrc.rc
diff --git a/programs/wscript/host.c b/programs/wscript/host.c
index fb1c86f..315b8ac 100644
--- a/programs/wscript/host.c
+++ b/programs/wscript/host.c
@@ -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 = lstrlenW(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;
diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index 1cbb9e7..8a80360 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -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) && lstrcmpW(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);
+ lstrcatW(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;
More information about the wine-cvs
mailing list