[reactos] 01/01: [SHELL32] Avoid code duplication on FAT and EXT2/BtrFS related FSs insertion (#3505)
9 Mar
2021
9 Mar
'21
3:17 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5fbf5e78e137f89f73e2f…
commit 5fbf5e78e137f89f73e2f42817e52aacfc748450
Author: George Bișoc <george.bisoc(a)reactos.org>
AuthorDate: Tue Mar 9 16:17:23 2021 +0100
Commit: GitHub <noreply(a)github.com>
CommitDate: Tue Mar 9 16:17:23 2021 +0100
[SHELL32] Avoid code duplication on FAT and EXT2/BtrFS related FSs insertion (#3505)
This is a slight refactor of InsertDefaultClusterSizeForFs() code with the goal to
avoid having the same code for FAT-related and EXT2/BtrFS filesystems.
---
dll/win32/shell32/dialogs/drive.cpp | 161 ++++++++++++------------------------
1 file changed, 51 insertions(+), 110 deletions(-)
diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp
index 6c6b0f39590..0b22f83af02 100644
--- a/dll/win32/shell32/dialogs/drive.cpp
+++ b/dll/win32/shell32/dialogs/drive.cpp
@@ -41,7 +41,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER
TotalNum
DWORD ClusterSize;
if (!wcsicmp(szFs, L"FAT16") ||
- !wcsicmp(szFs, L"FAT")) //REACTOS HACK
+ !wcsicmp(szFs, L"FAT")) // REACTOS HACK
{
if (TotalNumberOfBytes->QuadPart <= (16 * 1024 * 1024))
ClusterSize = 2048;
@@ -208,6 +208,8 @@ static VOID
InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{
WCHAR wszBuf[100] = {0};
+ WCHAR wszDefaultSize[100] = {0};
+ PCWSTR pwszFsSizeLimit;
WCHAR szDrive[] = L"C:\\";
INT iSelIndex;
ULARGE_INTEGER FreeBytesAvailableUser, TotalNumberOfBytes;
@@ -229,146 +231,85 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT
pContext)
return;
if (!wcsicmp(wszBuf, L"FAT16") ||
- !wcsicmp(wszBuf, L"FAT")) //REACTOS HACK
+ !wcsicmp(wszBuf, L"FAT")) // REACTOS HACK
{
- if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
- {
- TRACE("FAT16 is not supported on drive larger than 4G current
%lu\n", TotalNumberOfBytes.QuadPart);
- SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
- return;
- }
-
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
- {
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
- SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
- }
-
- SendMessageW(GetDlgItem(hwndDlg, 28675), BM_SETCHECK, BST_UNCHECKED, 0);
- EnableWindow(GetDlgItem(hwndDlg, 28675), FALSE);
+ pwszFsSizeLimit = L"4GB";
}
else if (!wcsicmp(wszBuf, L"FAT32"))
{
- if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
- {
- TRACE("FAT32 is not supported on drive larger than 32G current
%lu\n", TotalNumberOfBytes.QuadPart);
- SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
- return;
- }
-
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
- {
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
- SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
- }
-
- SendMessageW(GetDlgItem(hwndDlg, 28675), BM_SETCHECK, BST_UNCHECKED, 0);
- EnableWindow(GetDlgItem(hwndDlg, 28675), FALSE);
+ pwszFsSizeLimit = L"32GB";
}
else if (!wcsicmp(wszBuf, L"FATX"))
{
- if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
- {
- TRACE("FATX supports drives smaller than 1G (FATX16) and up to 32G
(FATX32), current size -> %lu\n", TotalNumberOfBytes.QuadPart);
- SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
- return;
- }
-
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
- {
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
- SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
- }
-
- SendMessageW(GetDlgItem(hwndDlg, 28675), BM_SETCHECK, BST_UNCHECKED, 0);
- EnableWindow(GetDlgItem(hwndDlg, 28675), FALSE);
+ pwszFsSizeLimit = L"1GB/32GB";
}
else if (!wcsicmp(wszBuf, L"NTFS"))
{
- if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
- {
- TRACE("NTFS is not supported on drive larger than 2TB current
%lu\n", TotalNumberOfBytes.QuadPart);
- SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
- return;
- }
-
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
- {
- SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
- }
- ClusterSize = 512;
- for (lIndex = 0; lIndex < 4; lIndex++)
- {
- TotalNumberOfBytes.QuadPart = ClusterSize;
- if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszBuf,
_countof(wszBuf)))
- {
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- }
- ClusterSize *= 2;
- }
-
- EnableWindow(GetDlgItem(hwndDlg, 28675), TRUE);
+ pwszFsSizeLimit = L"256TB";
}
else if (!wcsicmp(wszBuf, L"EXT2"))
+ {
+ pwszFsSizeLimit = L"32TB";
+ }
+ else
+ {
+ pwszFsSizeLimit = L"16EB";
+ }
+
+ if (!wcsicmp(wszBuf, L"FAT16") ||
+ !wcsicmp(wszBuf, L"FAT") || // REACTOS HACK
+ !wcsicmp(wszBuf, L"FAT32") ||
+ !wcsicmp(wszBuf, L"FATX") ||
+ !wcsicmp(wszBuf, L"NTFS") ||
+ !wcsicmp(wszBuf, L"EXT2") ||
+ !wcsicmp(wszBuf, L"BtrFS"))
{
if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
{
- TRACE("EXT2 is not supported on drive larger than 32T current
%lu\n", TotalNumberOfBytes.QuadPart);
+ TRACE("%S is not supported on drive larger than %S, current size:
%lu\n", wszBuf, pwszFsSizeLimit, TotalNumberOfBytes.QuadPart);
SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
return;
}
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
+ if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszDefaultSize,
_countof(wszDefaultSize)))
{
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
+ hDlgCtrl = GetDlgItem(hwndDlg, 28680); // Get the window handle of
"allocation unit size" combobox
SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
+ lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszDefaultSize);
if (lIndex != CB_ERR)
SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
}
- EnableWindow(GetDlgItem(hwndDlg, 28675), TRUE);
- }
- else if (!wcsicmp(wszBuf, L"BtrFS"))
- {
- if (!GetDefaultClusterSize(wszBuf, &ClusterSize, &TotalNumberOfBytes))
+ if (!wcsicmp(wszBuf, L"NTFS"))
{
- TRACE("BtrFS is not supported on drive larger than 16E current
%lu\n", TotalNumberOfBytes.QuadPart);
- SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
- return;
+ ClusterSize = 512;
+ for (lIndex = 0; lIndex < 4; lIndex++)
+ {
+ TotalNumberOfBytes.QuadPart = ClusterSize;
+ if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, wszDefaultSize,
_countof(wszDefaultSize)))
+ {
+ lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0,
(LPARAM)wszDefaultSize);
+ if (lIndex != CB_ERR)
+ SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex,
(LPARAM)ClusterSize);
+ }
+ ClusterSize *= 2;
+ }
}
- if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, wszBuf,
_countof(wszBuf)))
+ SendMessageW(GetDlgItem(hwndDlg, 28675), BM_SETCHECK, BST_UNCHECKED, 0);
+ if (!wcsicmp(wszBuf, L"EXT2") ||
+ !wcsicmp(wszBuf, L"BtrFS") ||
+ !wcsicmp(wszBuf, L"NTFS"))
{
- hDlgCtrl = GetDlgItem(hwndDlg, 28680);
- SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
- lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)wszBuf);
- if (lIndex != CB_ERR)
- SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
- SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
+ /* Enable the "Enable Compression" button */
+ EnableWindow(GetDlgItem(hwndDlg, 28675), TRUE);
+ }
+ else
+ {
+ /* Disable the "Enable Compression" button */
+ EnableWindow(GetDlgItem(hwndDlg, 28675), FALSE);
}
-
- EnableWindow(GetDlgItem(hwndDlg, 28675), TRUE);
}
else
{
1291
days inactive
1291
days old
0 comments
1 participants
participants (1)
-
George Bișoc