This commit is contained in:
Igor Pavlov
2023-12-22 17:17:05 +00:00
committed by Kornel
parent ec44a8a070
commit a36c48cece
954 changed files with 42199 additions and 25482 deletions

View File

@@ -83,7 +83,7 @@ static HRESULT Call7zGui(const UString &params,
const WRes wres = process.Create(imageName, params, NULL); // curDir);
if (wres != 0)
{
HRESULT hres = HRESULT_FROM_WIN32(wres);
const HRESULT hres = HRESULT_FROM_WIN32(wres);
ErrorMessageHRESULT(hres, imageName);
return hres;
}
@@ -92,7 +92,7 @@ static HRESULT Call7zGui(const UString &params,
else if (event != NULL)
{
HANDLE handles[] = { process, *event };
::WaitForMultipleObjects(ARRAY_SIZE(handles), handles, FALSE, INFINITE);
::WaitForMultipleObjects(Z7_ARRAY_SIZE(handles), handles, FALSE, INFINITE);
}
return S_OK;
}
@@ -175,7 +175,7 @@ static HRESULT CreateMap(const UStringVector &names,
FOR_VECTOR (i, names)
{
const UString &s = names[i];
unsigned len = s.Len() + 1;
const unsigned len = s.Len() + 1;
wmemcpy(cur, (const wchar_t *)s, len);
cur += len;
}
@@ -197,7 +197,7 @@ HRESULT CompressFiles(
CFileMapping fileMapping;
NSynchronization::CManualResetEvent event;
params += kIncludeSwitch;
RINOK(CreateMap(names, fileMapping, event, params));
RINOK(CreateMap(names, fileMapping, event, params))
if (!arcType.IsEmpty())
{
@@ -336,7 +336,7 @@ void Benchmark(bool totalMode)
if (totalMode)
params += " -mm=*";
AddLagePagesSwitch(params);
HRESULT result = Call7zGui(params, false, NULL);
const HRESULT result = Call7zGui(params, false, NULL);
if (result != S_OK)
ErrorMessageHRESULT(result);
MY_TRY_FINISH_VOID