marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wscript: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-05-02 09:31:36 +02:00
parent bb90e8dd49
commit 4432405ec5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/cscript/Makefile.in
View File

@ -1,9 +1,10 @@
MODULE = cscript.exe MODULE = cscript.exe
APPMODE = -mwindows -municode
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32
EXTRADEFS = -DCSCRIPT_BUILD EXTRADEFS = -DCSCRIPT_BUILD
PARENTSRC = ../wscript PARENTSRC = ../wscript
EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
C_SRCS = \ C_SRCS = \
arguments.c \ arguments.c \
host.c \ host.c \

3
programs/wscript/Makefile.in
View File

@ -1,7 +1,8 @@
MODULE = wscript.exe MODULE = wscript.exe
APPMODE = -mwindows -municode
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32
EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
RC_SRCS = \ RC_SRCS = \
rsrc.rc rsrc.rc

7
programs/wscript/host.c
View File

@ -29,7 +29,6 @@
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/heap.h> #include <wine/heap.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(wscript); WINE_DEFAULT_DEBUG_CHANNEL(wscript);
@ -80,7 +79,7 @@ static void print_string(const WCHAR *string)
return; return;
} }
len = strlenW(string); len = lstrlenW(string);
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL);
if(ret) { if(ret) {
static const WCHAR crnlW[] = {'\r','\n'}; 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) if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0)
return E_FAIL; return E_FAIL;
pos = strrchrW(path, '\\'); pos = wcsrchr(path, '\\');
howMany = pos - path; howMany = pos - path;
if(!(*out_Path = SysAllocStringLen(path, howMany))) if(!(*out_Path = SysAllocStringLen(path, howMany)))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -237,7 +236,7 @@ static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName)
WINE_TRACE("(%p)\n", out_ScriptName); WINE_TRACE("(%p)\n", out_ScriptName);
scriptName = strrchrW(scriptFullName, '\\'); scriptName = wcsrchr(scriptFullName, '\\');
++scriptName; ++scriptName;
if(!(*out_ScriptName = SysAllocString(scriptName))) if(!(*out_ScriptName = SysAllocString(scriptName)))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;

13
programs/wscript/main.c
View File

@ -31,7 +31,6 @@
#include "wscript.h" #include "wscript.h"
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h>
#ifdef _WIN64 #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); 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; return E_FAIL;
if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { 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)); 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); res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
return FALSE; return FALSE;
@ -400,11 +399,11 @@ static BOOL set_host_properties(const WCHAR *prop)
else else
++prop; ++prop;
if(strcmpiW(prop, iactive) == 0) if(wcsicmp(prop, iactive) == 0)
wshInteractive = VARIANT_TRUE; wshInteractive = VARIANT_TRUE;
else if(strcmpiW(prop, batch) == 0) else if(wcsicmp(prop, batch) == 0)
wshInteractive = VARIANT_FALSE; wshInteractive = VARIANT_FALSE;
else if(strcmpiW(prop, nologoW) == 0) else if(wcsicmp(prop, nologoW) == 0)
WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW));
else else
{ {
@ -450,7 +449,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
if(!res || res > ARRAY_SIZE(scriptFullName)) if(!res || res > ARRAY_SIZE(scriptFullName))
return 1; return 1;
ext = strrchrW(filepart, '.'); ext = wcsrchr(filepart, '.');
if(!ext || !get_engine_clsid(ext, &clsid)) { if(!ext || !get_engine_clsid(ext, &clsid)) {
WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext));
return 1; return 1;