diff --git a/base/applications/cmdutils/wscript/host.c b/base/applications/cmdutils/wscript/host.c index c6bc31c8bdb..a61851e22bc 100644 --- a/base/applications/cmdutils/wscript/host.c +++ b/base/applications/cmdutils/wscript/host.c @@ -29,7 +29,6 @@ #include #include -#include 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/base/applications/cmdutils/wscript/main.c b/base/applications/cmdutils/wscript/main.c index e3ffe35ca34..030243984df 100644 --- a/base/applications/cmdutils/wscript/main.c +++ b/base/applications/cmdutils/wscript/main.c @@ -34,7 +34,6 @@ #include "wscript.h" #include -#include #ifdef _WIN64 @@ -90,7 +89,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) { @@ -264,7 +263,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; @@ -403,11 +402,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 { @@ -453,7 +452,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; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f49e47cdf73..82a641bd24d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -228,12 +228,12 @@ win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-4.18 (known ther ReactOS shares the following programs with Winehq. -base/applications/cmdutils/cscript # Synced to WineStaging-3.17 +base/applications/cmdutils/cscript # Synced to WineStaging-4.18 base/applications/cmdutils/reg # Synced to WineStaging-3.17 base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 base/applications/cmdutils/wmic # Synced to WineStaging-4.0 -base/applications/cmdutils/wscript # Synced to WineStaging-3.17 +base/applications/cmdutils/wscript # Synced to WineStaging-4.18 base/applications/cmdutils/xcopy # Synced to WineStaging-3.17 base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. base/applications/extrac32 # Synced to WineStaging-4.0