Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CSCRIPT][WSCRIPT] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 00:11:58 +01:00
parent 82faa151e5
commit fd8ec79fd1
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/applications/cmdutils/cscript/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-DCSCRIPT_BUILD) add_definitions(-DCSCRIPT_BUILD -D__WINESRC__)
set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript) set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript)
include_directories(${wscript_folder}) include_directories(${wscript_folder})

2
base/applications/cmdutils/wscript/CMakeLists.txt
View file

@ -1,4 +1,6 @@
add_definitions(-D__WINESRC__)
list(APPEND SOURCE list(APPEND SOURCE
arguments.c arguments.c
host.c host.c

6
base/applications/cmdutils/wscript/host.c
View file

@ -84,7 +84,7 @@ static void print_string(const WCHAR *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'};
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL);
return; return;
} }
@ -183,7 +183,7 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path)
WINE_TRACE("(%p)\n", out_Path); WINE_TRACE("(%p)\n", out_Path);
if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) if(GetModuleFileNameW(NULL, fullPath, ARRAY_SIZE(fullPath)) == 0)
return E_FAIL; return E_FAIL;
if(!(*out_Path = SysAllocString(fullPath))) if(!(*out_Path = SysAllocString(fullPath)))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -198,7 +198,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path)
WINE_TRACE("(%p)\n", out_Path); WINE_TRACE("(%p)\n", out_Path);
if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0)
return E_FAIL; return E_FAIL;
pos = strrchrW(path, '\\'); pos = strrchrW(path, '\\');
howMany = pos - path; howMany = pos - path;

8
base/applications/cmdutils/wscript/main.c
View file

@ -256,7 +256,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid)
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
return FALSE; return FALSE;
size = sizeof(fileid)/sizeof(WCHAR); size = ARRAY_SIZE(fileid);
res = RegQueryValueW(hkey, NULL, fileid, &size); res = RegQueryValueW(hkey, NULL, fileid, &size);
RegCloseKey(hkey); RegCloseKey(hkey);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
@ -269,7 +269,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid)
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
return FALSE; return FALSE;
size = sizeof(progid)/sizeof(WCHAR); size = ARRAY_SIZE(progid);
res = RegQueryValueW(hkey, NULL, progid, &size); res = RegQueryValueW(hkey, NULL, progid, &size);
RegCloseKey(hkey); RegCloseKey(hkey);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
@ -449,8 +449,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
WINE_FIXME("No file name specified\n"); WINE_FIXME("No file name specified\n");
return 1; return 1;
} }
res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); res = GetFullPathNameW(filename, ARRAY_SIZE(scriptFullName), scriptFullName, &filepart);
if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) if(!res || res > ARRAY_SIZE(scriptFullName))
return 1; return 1;
ext = strrchrW(filepart, '.'); ext = strrchrW(filepart, '.');

4
media/doc/README.WINE
View file

@ -226,12 +226,12 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno
ReactOS shares the following programs with Winehq. ReactOS shares the following programs with Winehq.
reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9
reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3
reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.
reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/extrac32 # Synced to WineStaging-3.3