From 8cd23c3dc0945d8176795b4f5d76be412fa5a53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 4 Dec 2016 18:28:33 +0000 Subject: [PATCH] [USERENV]: Use ARRAYSIZE instead of hardcoding the sizes of the static buffers. svn path=/trunk/; revision=73425 --- reactos/dll/win32/userenv/profile.c | 18 +++++------ reactos/dll/win32/userenv/setup.c | 50 ++++++++++++++--------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/reactos/dll/win32/userenv/profile.c b/reactos/dll/win32/userenv/profile.c index d4b8c6e0a5c..4d4bd1a8415 100644 --- a/reactos/dll/win32/userenv/profile.c +++ b/reactos/dll/win32/userenv/profile.c @@ -44,7 +44,7 @@ AppendSystemPostfix(LPWSTR lpName, /* Build profile name postfix */ if (!ExpandEnvironmentStringsW(L"%SystemRoot%", szSystemRoot, - MAX_PATH)) + ARRAYSIZE(szSystemRoot))) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; @@ -180,7 +180,7 @@ CreateUserProfileW(PSID Sid, } /* Get profiles path */ - dwLength = MAX_PATH * sizeof(WCHAR); + dwLength = sizeof(szRawProfilesPath); Error = RegQueryValueExW(hKey, L"ProfilesDirectory", NULL, @@ -198,7 +198,7 @@ CreateUserProfileW(PSID Sid, /* Expand it */ if (!ExpandEnvironmentStringsW(szRawProfilesPath, szProfilesPath, - MAX_PATH)) + ARRAYSIZE(szProfilesPath))) { DPRINT1("Error: %lu\n", GetLastError()); RegCloseKey(hKey); @@ -216,7 +216,7 @@ CreateUserProfileW(PSID Sid, } /* Get default user path */ - dwLength = MAX_PATH * sizeof(WCHAR); + dwLength = sizeof(szBuffer); Error = RegQueryValueExW(hKey, L"DefaultUserProfile", NULL, @@ -318,7 +318,7 @@ CreateUserProfileW(PSID Sid, 0, REG_EXPAND_SZ, (LPBYTE)szBuffer, - (wcslen (szBuffer) + 1) * sizeof(WCHAR)); + (wcslen(szBuffer) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DPRINT1("Error: %lu\n", Error); @@ -766,13 +766,13 @@ GetProfilesDirectoryW(LPWSTR lpProfilesDir, /* Expand it */ if (!ExpandEnvironmentStringsW(szBuffer, szProfilesPath, - MAX_PATH)) + ARRAYSIZE(szProfilesPath))) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; } - dwLength = wcslen (szProfilesPath) + 1; + dwLength = wcslen(szProfilesPath) + 1; if (lpProfilesDir != NULL) { if (*lpcchSize < dwLength) @@ -915,7 +915,7 @@ GetUserProfileDirectoryW(HANDLE hToken, /* Expand it */ if (!ExpandEnvironmentStringsW(szRawImagePath, szImagePath, - MAX_PATH)) + ARRAYSIZE(szImagePath))) { DPRINT1 ("Error: %lu\n", GetLastError()); return FALSE; @@ -995,7 +995,7 @@ LoadUserProfileA(IN HANDLE hToken, } /* Convert the structure to UNICODE... */ - ProfileInfoW.dwSize = sizeof(PROFILEINFOW); + ProfileInfoW.dwSize = sizeof(ProfileInfoW); ProfileInfoW.dwFlags = lpProfileInfo->dwFlags; if (lpProfileInfo->lpUserName) diff --git a/reactos/dll/win32/userenv/setup.c b/reactos/dll/win32/userenv/setup.c index cadf7a23045..f9b1b324426 100644 --- a/reactos/dll/win32/userenv/setup.c +++ b/reactos/dll/win32/userenv/setup.c @@ -122,7 +122,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, IDS_PROFILEPATH, szBuffer, - MAX_PATH)) + ARRAYSIZE(szBuffer))) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; @@ -143,7 +143,7 @@ InitializeProfiles(VOID) /* Expand it */ if (!ExpandEnvironmentStringsW(szBuffer, szProfilesPath, - MAX_PATH)) + ARRAYSIZE(szProfilesPath))) { DPRINT1("Error: %lu\n", GetLastError()); RegCloseKey(hKey); @@ -162,7 +162,7 @@ InitializeProfiles(VOID) } /* Store the profiles directory path in the registry */ - dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"ProfilesDirectory", 0, @@ -186,7 +186,7 @@ InitializeProfiles(VOID) wcscat(szProfilePath, szBuffer); /* Attempt default user directory creation */ - if (!CreateDirectoryW (szProfilePath, NULL)) + if (!CreateDirectoryW(szProfilePath, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { @@ -196,7 +196,7 @@ InitializeProfiles(VOID) } /* Directory existed, let's try to append the postfix */ - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + if (!AppendSystemPostfix(szBuffer, ARRAYSIZE(szBuffer))) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); RegCloseKey(hKey); @@ -221,7 +221,7 @@ InitializeProfiles(VOID) } /* Store the default user profile path in the registry */ - dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"DefaultUserProfile", 0, @@ -254,7 +254,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -304,7 +304,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -330,7 +330,7 @@ InitializeProfiles(VOID) } /* Set 'Fonts' folder path */ - GetWindowsDirectoryW(szBuffer, MAX_PATH); + GetWindowsDirectoryW(szBuffer, ARRAYSIZE(szBuffer)); wcscat(szBuffer, L"\\Fonts"); dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); @@ -375,7 +375,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -411,7 +411,7 @@ InitializeProfiles(VOID) wcscat(szProfilePath, szBuffer); /* Attempt 'All Users' directory creation */ - if (!CreateDirectoryW (szProfilePath, NULL)) + if (!CreateDirectoryW(szProfilePath, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { @@ -420,7 +420,7 @@ InitializeProfiles(VOID) } /* Directory existed, let's try to append the postfix */ - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + if (!AppendSystemPostfix(szBuffer, ARRAYSIZE(szBuffer))) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); return FALSE; @@ -486,7 +486,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -536,7 +536,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -588,7 +588,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath); @@ -619,7 +619,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, IDS_PROGRAMFILES, szBuffer, - MAX_PATH)) + ARRAYSIZE(szBuffer))) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; @@ -628,7 +628,7 @@ InitializeProfiles(VOID) if (!LoadStringW(hInstance, IDS_COMMONFILES, szCommonFilesDirPath, - MAX_PATH)) + ARRAYSIZE(szCommonFilesDirPath))) { DPRINT1("Warning: %lu\n", GetLastError()); } @@ -636,7 +636,7 @@ InitializeProfiles(VOID) /* Expand it */ if (!ExpandEnvironmentStringsW(szBuffer, szProfilesPath, - MAX_PATH)) + ARRAYSIZE(szProfilesPath))) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; @@ -647,8 +647,8 @@ InitializeProfiles(VOID) wcscat(szBuffer, szCommonFilesDirPath); if (!ExpandEnvironmentStringsW(szBuffer, - szCommonFilesDirPath, - MAX_PATH)) + szCommonFilesDirPath, + ARRAYSIZE(szCommonFilesDirPath))) { DPRINT1("Warning: %lu\n", GetLastError()); } @@ -666,7 +666,7 @@ InitializeProfiles(VOID) return FALSE; } - dwLength = (wcslen (szProfilesPath) + 1) * sizeof(WCHAR); + dwLength = (wcslen(szProfilesPath) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"ProgramFilesDir", 0, @@ -693,12 +693,12 @@ InitializeProfiles(VOID) DPRINT1("Warning: %lu\n", Error); } - RegCloseKey (hKey); + RegCloseKey(hKey); /* Create directory */ if (!CreateDirectoryW(szProfilesPath, NULL)) { - if (GetLastError () != ERROR_ALREADY_EXISTS) + if (GetLastError() != ERROR_ALREADY_EXISTS) { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; @@ -708,7 +708,7 @@ InitializeProfiles(VOID) /* Create directory */ if (!CreateDirectoryW(szCommonFilesDirPath, NULL)) { - if (GetLastError () != ERROR_ALREADY_EXISTS) + if (GetLastError() != ERROR_ALREADY_EXISTS) { DPRINT1("Warning: %lu\n", GetLastError()); } @@ -759,7 +759,7 @@ UpdateUsersShellFolderSettings(LPCWSTR lpUserProfilePath, if (!LoadStringW(hInstance, lpFolderData->uId, &szBuffer[dwLength], - MAX_PATH - dwLength)) + ARRAYSIZE(szBuffer) - dwLength)) { /* Use the default name instead */ wcscat(szBuffer, lpFolderData->lpPath);