ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wscript: Use the ARRAY_SIZE() macro. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-07-13 19:01:27 +02:00 committed by Alexandre Julliard
parent a9933cc2d1
commit f140ad6e05
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/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
programs/wscript/main.c
View File

@ -253,7 +253,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)
@ -266,7 +266,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)
@ -446,8 +446,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, '.');