Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CSCRIPT][WSCRIPT] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-12-23 00:58:01 +01:00
parent e32507b525
commit e87b3957e4
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base/applications/cmdutils/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
base/applications/cmdutils/wscript/main.c
View file

@ -34,7 +34,6 @@
#include "wscript.h" #include "wscript.h"
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h>
#ifdef _WIN64 #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); 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) {
@ -264,7 +263,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;
@ -403,11 +402,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
{ {
@ -453,7 +452,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;

4
media/doc/README.WINE
View file

@ -228,12 +228,12 @@ win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-4.18 (known ther
ReactOS shares the following programs with Winehq. 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/reg # Synced to WineStaging-3.17
base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 base/applications/cmdutils/schtasks # Synced to WineStaging-3.3
base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 base/applications/cmdutils/taskkill # Synced to WineStaging-3.17
base/applications/cmdutils/wmic # Synced to WineStaging-4.0 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/cmdutils/xcopy # Synced to WineStaging-3.17
base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.
base/applications/extrac32 # Synced to WineStaging-4.0 base/applications/extrac32 # Synced to WineStaging-4.0