Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 02:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FLTMC] Do not ignore failures of some functions

Browse source 
Also reduce use of magic values.

CORE-17637
This commit is contained in:
Jérôme Gardou 2021-06-17 15:50:54 +02:00 • committed by Jérôme Gardou
parent 46394ab80d
commit 5aafeb473f
1 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

76
base/applications/fltmc/fltmc.cpp
View file

@ -61,7 +61,7 @@ SetDriverLoadPrivilege()
LUID luid; LUID luid;
BOOL bSuccess; BOOL bSuccess;
DWORD dwError = ERROR_SUCCESS; DWORD dwError = ERROR_SUCCESS;
bSuccess = OpenProcessToken(GetCurrentProcess(), bSuccess = OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES, TOKEN_ADJUST_PRIVILEGES,
&hToken); &hToken);
@ -220,7 +220,8 @@ PrintVolumeInfo(_In_ PVOID Buffer)
VolName[FilterVolInfo->FilterVolumeNameLength] = UNICODE_NULL; VolName[FilterVolInfo->FilterVolumeNameLength] = UNICODE_NULL;
} }
(void)FilterGetDosName(VolName, DosName, 16); if (!SUCCEEDED(FilterGetDosName(VolName, DosName, _countof(DosName))))
DosName[0] = L'\0';
switch (FilterVolInfo->FileSystemType) switch (FilterVolInfo->FileSystemType)
{ {
@ -271,7 +272,7 @@ ListFilters()
hr = FilterFindFirst(FilterAggregateStandardInformation, hr = FilterFindFirst(FilterAggregateStandardInformation,
Buffer, Buffer,
1024, sizeof(Buffer),
&BytesReturned, &BytesReturned,
&FindHandle); &FindHandle);
if (!SUCCEEDED(hr)) if (!SUCCEEDED(hr))
@ -279,44 +280,51 @@ ListFilters()
IsNewStyle = FALSE; IsNewStyle = FALSE;
hr = FilterFindFirst(FilterFullInformation, hr = FilterFindFirst(FilterFullInformation,
Buffer, Buffer,
1024, sizeof(Buffer),
&BytesReturned, &BytesReturned,
&FindHandle); &FindHandle);
} }
if (SUCCEEDED(hr)) if (!SUCCEEDED(hr))
{ {
if (IsNewStyle) LoadAndPrintString(IDS_ERROR_FILTERS, hr);
{ PrintErrorText(hr);
LoadAndPrintString(IDS_DISPLAY_FILTERS1); return;
wprintf(L"------------------------------ ------------- ------------ -----\n");
}
else
{
LoadAndPrintString(IDS_DISPLAY_FILTERS2);
wprintf(L"------------------------------ ------------- -----\n");
}
PrintFilterInfo(Buffer, IsNewStyle);
do
{
hr = FilterFindNext(FindHandle,
IsNewStyle ? FilterAggregateStandardInformation : FilterFullInformation,
Buffer,
1024,
&BytesReturned);
if (SUCCEEDED(hr))
{
PrintFilterInfo(Buffer, IsNewStyle);
}
} while (SUCCEEDED(hr));
FilterFindClose(FindHandle);
} }
if (!SUCCEEDED(hr) && hr != HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)) if (IsNewStyle)
{
LoadAndPrintString(IDS_DISPLAY_FILTERS1);
wprintf(L"------------------------------ ------------- ------------ -----\n");
}
else
{
LoadAndPrintString(IDS_DISPLAY_FILTERS2);
wprintf(L"------------------------------ ------------- -----\n");
}
PrintFilterInfo(Buffer, IsNewStyle);
do
{
hr = FilterFindNext(FindHandle,
IsNewStyle ? FilterAggregateStandardInformation : FilterFullInformation,
Buffer,
sizeof(Buffer),
&BytesReturned);
if (SUCCEEDED(hr))
{
PrintFilterInfo(Buffer, IsNewStyle);
}
else if (hr != HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS))
{
LoadAndPrintString(IDS_ERROR_FILTERS, hr);
PrintErrorText(hr);
}
} while (SUCCEEDED(hr));
hr = FilterFindClose(FindHandle);
if (!SUCCEEDED(hr))
{ {
LoadAndPrintString(IDS_ERROR_FILTERS, hr); LoadAndPrintString(IDS_ERROR_FILTERS, hr);
PrintErrorText(hr); PrintErrorText(hr);