lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-31 16:31:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CACLS] Improve imports, simplify code, and fix x64 build warning

Browse Source 
cacls\cacls.c(198):
  warning C4267: '=': conversion from 'size_t' to 'DWORD', possible loss of data
This commit is contained in:
Hermès Bélusca-Maïto
2026-03-27 16:24:38 +01:00
parent 7331a0186d
commit 7a82bc8deb
4 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base/applications/cacls/CMakeLists.txt
View File

@@ -1,8 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
add_executable(cacls cacls.c cacls.rc)
set_module_type(cacls win32cui UNICODE)
target_link_libraries(cacls conutils ${PSEH_LIB})
add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
target_link_libraries(cacls conutils)
add_importlibs(cacls advapi32 msvcrt kernel32)
add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)

64
base/applications/cacls/cacls.c
View File

@@ -111,7 +111,7 @@ PrintFileDacl(IN LPTSTR FilePath,
LPTSTR Name = NULL;
LPTSTR Domain = NULL;
LPTSTR SidString = NULL;
DWORD IndentAccess;
size_t IndentAccess;
DWORD AccessMask = Ace->Mask;
PSID Sid = (PSID)&Ace->SidStart;
@@ -183,7 +183,7 @@ BuildSidString:
/* attempt to map the SID to a user name */
if (AceIndex == 0)
{
DWORD i = 0;
size_t i = 0;
/* overwrite the full file name with spaces so we
only print the file name once */
@@ -195,28 +195,28 @@ BuildSidString:
if (Name != NULL && Domain[0] != _T('\0'))
{
ConPrintf(StdOut, L"%s\\%s:", Domain, Name);
IndentAccess = (DWORD)_tcslen(Domain) + _tcslen(Name);
IndentAccess = _tcslen(Domain) + _tcslen(Name);
}
else
{
LPTSTR DisplayString = (Name != NULL ? Name : SidString);
ConPrintf(StdOut, L"%s:", DisplayString);
IndentAccess = (DWORD)_tcslen(DisplayString);
IndentAccess = _tcslen(DisplayString);
}
/* print the ACE Flags */
if (Ace->Header.AceFlags & CONTAINER_INHERIT_ACE)
{
IndentAccess += ConResPuts(StdOut, IDS_ABBR_CI);
IndentAccess += (size_t)ConResPuts(StdOut, IDS_ABBR_CI);
}
if (Ace->Header.AceFlags & OBJECT_INHERIT_ACE)
{
IndentAccess += ConResPuts(StdOut, IDS_ABBR_OI);
IndentAccess += (size_t)ConResPuts(StdOut, IDS_ABBR_OI);
}
if (Ace->Header.AceFlags & INHERIT_ONLY_ACE)
{
IndentAccess += ConResPuts(StdOut, IDS_ABBR_IO);
IndentAccess += (size_t)ConResPuts(StdOut, IDS_ABBR_IO);
}
IndentAccess += 2;
@@ -257,7 +257,7 @@ BuildSidString:
}
else
{
DWORD x, x2;
DWORD x;
static const struct
{
DWORD Access;
@@ -305,11 +305,7 @@ PrintSpecialAccess:
if ((Ace->Mask & AccessRights[x].Access) == AccessRights[x].Access)
{
ConPrintf(StdOut, L"\n%s ", FullFileName);
for (x2 = 0; x2 < IndentAccess; x2++)
{
ConPuts(StdOut, L" ");
}
ConPrintf(StdOut, L"%*s", IndentAccess, L"");
ConResPuts(StdOut, AccessRights[x].uID);
}
}
@@ -358,14 +354,15 @@ PrintSpecialAccess:
return Ret;
}
/* add a backslash at end to a path string if necessary */
/* Add a backslash at the end of a path string if necessary */
static VOID
AddBackslash(LPTSTR FilePath)
{
INT len = lstrlen(FilePath);
LPTSTR pch = CharPrev(FilePath, FilePath + len);
if (*pch != _T('\\'))
lstrcat(pch, _T("\\"));
/* Find the last backslash. If there is none, or if it doesn't
* terminate the string, then append a backslash. */
LPTSTR pch = _tcsrchr(FilePath, _T('\\'));
if (!pch || *(pch+1))
_tcscat(FilePath, _T("\\"));
}
static BOOL
@@ -375,7 +372,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
LPTSTR pch;
DWORD attrs;
lstrcpyn(FilePath, pszFiles, MAX_PATH);
_tcsncpy(FilePath, pszFiles, MAX_PATH);
pch = _tcsrchr(FilePath, _T('\\'));
if (pch != NULL)
{
@@ -385,7 +382,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
PrintError(GetLastError());
return FALSE;
}
lstrcpyn(FilePath, FullPath, MAX_PATH);
_tcsncpy(FilePath, FullPath, MAX_PATH);
attrs = GetFileAttributes(FilePath);
if (attrs == 0xFFFFFFFF || !(attrs & FILE_ATTRIBUTE_DIRECTORY))
@@ -421,7 +418,6 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
hFind = FindFirstFile(pszFiles, &FindData);
if (hFind == INVALID_HANDLE_VALUE)
return FALSE;
do
{
if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -448,7 +444,7 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
{
ConPuts(StdOut, L"\n");
}
} while(FindNextFile(hFind, &FindData));
} while (FindNextFile(hFind, &FindData));
LastError = GetLastError();
FindClose(hFind);
@@ -605,7 +601,6 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
hFind = FindFirstFile(pszFiles, &FindData);
if (hFind == INVALID_HANDLE_VALUE)
return FALSE;
do
{
if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -626,8 +621,7 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
else
break;
}
} while(FindNextFile(hFind, &FindData));
} while (FindNextFile(hFind, &FindData));
LastError = GetLastError();
FindClose(hFind);
@@ -660,7 +654,6 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
hFind = FindFirstFile(pszFiles, &FindData);
if (hFind == INVALID_HANDLE_VALUE)
return FALSE;
do
{
if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -681,8 +674,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
else
break;
}
} while(FindNextFile(hFind, &FindData));
} while (FindNextFile(hFind, &FindData));
LastError = GetLastError();
FindClose(hFind);
@@ -728,7 +720,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
break;
}
}
} while(FindNextFile(hFind, &FindData));
} while (FindNextFile(hFind, &FindData));
LastError = GetLastError();
FindClose(hFind);
@@ -762,19 +754,19 @@ int _tmain(int argc, const TCHAR *argv[])
*/
for (i = 2; i < argc; i++)
{
if (lstrcmpi(argv[i], _T("/T")) == 0)
if (_tcsicmp(argv[i], _T("/T")) == 0)
{
OptionT = TRUE;
}
else if (lstrcmpi(argv[i], _T("/E")) == 0)
else if (_tcsicmp(argv[i], _T("/E")) == 0)
{
OptionE = TRUE;
}
else if (lstrcmpi(argv[i], _T("/C")) == 0)
else if (_tcsicmp(argv[i], _T("/C")) == 0)
{
OptionC = TRUE;
}
else if (lstrcmpi(argv[i], _T("/G")) == 0)
else if (_tcsicmp(argv[i], _T("/G")) == 0)
{
if (i + 1 < argc)
{
@@ -791,7 +783,7 @@ int _tmain(int argc, const TCHAR *argv[])
InvalidParameter = TRUE;
break;
}
else if (lstrcmpi(argv[i], _T("/R")) == 0)
else if (_tcsicmp(argv[i], _T("/R")) == 0)
{
if (i + 1 < argc)
{
@@ -802,7 +794,7 @@ int _tmain(int argc, const TCHAR *argv[])
InvalidParameter = TRUE;
break;
}
else if (lstrcmpi(argv[i], _T("/P")) == 0)
else if (_tcsicmp(argv[i], _T("/P")) == 0)
{
if (i + 1 < argc)
{
@@ -819,7 +811,7 @@ int _tmain(int argc, const TCHAR *argv[])
InvalidParameter = TRUE;
break;
}
else if (lstrcmpi(argv[i], _T("/D")) == 0)
else if (_tcsicmp(argv[i], _T("/D")) == 0)
{
if (i + 1 < argc)
{

6
base/applications/cacls/cacls.rc
View File

@@ -1,9 +1,9 @@
#include <windef.h>
#include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control ACLs Program"
#define REACTOS_STR_INTERNAL_NAME "cacls"
#define REACTOS_STR_ORIGINAL_FILENAME "cacls.exe"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control ACLs Program"
#define REACTOS_STR_INTERNAL_NAME "cacls"
#define REACTOS_STR_ORIGINAL_FILENAME "cacls.exe"
#include <reactos/version.rc>
/* UTF-8 */

6
base/applications/cacls/precomp.h
View File

@@ -1,16 +1,12 @@
#ifndef _CACLS_PRECOMP_H
#define _CACLS_PRECOMP_H
#pragma once
#include <stdarg.h>
#include <tchar.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h> // For CharPrev
#include <sddl.h>
#include <conutils.h>
#include "resource.h"
#endif /* _CACLS_PRECOMP_H */