mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-25 11:06:22 +00:00
wscript/tests: Use the available ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
ea6cc7245c
commit
d72112eda8
|
@ -77,7 +77,7 @@ static HANDLE wscript_process;
|
||||||
static int strcmp_wa(LPCWSTR strw, const char *stra)
|
static int strcmp_wa(LPCWSTR strw, const char *stra)
|
||||||
{
|
{
|
||||||
WCHAR buf[512];
|
WCHAR buf[512];
|
||||||
MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR));
|
MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf));
|
||||||
return lstrcmpW(strw, buf);
|
return lstrcmpW(strw, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
|
||||||
ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
|
ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
|
||||||
ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
|
ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
|
||||||
V_VT(pVarResult) = VT_BSTR;
|
V_VT(pVarResult) = VT_BSTR;
|
||||||
res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR));
|
res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName));
|
||||||
if(res == 0)
|
if(res == 0)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
if(!(V_BSTR(pVarResult) = SysAllocString(fullName)))
|
if(!(V_BSTR(pVarResult) = SysAllocString(fullName)))
|
||||||
|
@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
|
||||||
ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
|
ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs);
|
||||||
ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
|
ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs);
|
||||||
V_VT(pVarResult) = VT_BSTR;
|
V_VT(pVarResult) = VT_BSTR;
|
||||||
res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR));
|
res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath));
|
||||||
if(res == 0)
|
if(res == 0)
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
pos = mystrrchr(fullPath, '\\');
|
pos = mystrrchr(fullPath, '\\');
|
||||||
|
|
Loading…
Reference in a new issue