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

* Fix multiple bugs in SHFormatDrive dialog

Browse source 
* It now correcly calls FormatEx but the fmifs.dll is not yet in usable shape :(

svn path=/trunk/; revision=35321
This commit is contained in:
Johannes Anderwald 2008-08-13 22:56:02 +00:00
parent 0ae6a9811c
commit 33938183af
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
reactos/dll/win32/shell32/drive.c
View file

@ -550,7 +550,7 @@ VOID
InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{ {
WCHAR szFs[100] = {0}; WCHAR szFs[100] = {0};
WCHAR szDrive[3] = { L'C', '\\', 0 }; WCHAR szDrive[4] = { L'C', ':', '\\', 0 };
INT iSelIndex; INT iSelIndex;
ULARGE_INTEGER FreeBytesAvailableUser, TotalNumberOfBytes; ULARGE_INTEGER FreeBytesAvailableUser, TotalNumberOfBytes;
DWORD ClusterSize; DWORD ClusterSize;
@ -566,12 +566,13 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
return; return;
szFs[(sizeof(szFs)/sizeof(WCHAR))-1] = L'\0'; szFs[(sizeof(szFs)/sizeof(WCHAR))-1] = L'\0';
szDrive[0] = pContext->Drive; szDrive[0] = pContext->Drive + 'A';
if (!GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailableUser, &TotalNumberOfBytes, NULL)) if (!GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailableUser, &TotalNumberOfBytes, NULL))
return; return;
if (!wcsicmp(szFs, L"FAT16")) if (!wcsicmp(szFs, L"FAT16") ||
!wcsicmp(szFs, L"FAT")) //REACTOS HACK
{ {
if (TotalNumberOfBytes.QuadPart <= (16 * 1024 * 1024)) if (TotalNumberOfBytes.QuadPart <= (16 * 1024 * 1024))
ClusterSize = 2048; ClusterSize = 2048;
@ -597,7 +598,6 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
return; return;
} }
if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR))) if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR)))
{ {
hDlgCtrl = GetDlgItem(hwndDlg, 28680); hDlgCtrl = GetDlgItem(hwndDlg, 28680);
@ -606,6 +606,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs); lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs);
if (lIndex != CB_ERR) if (lIndex != CB_ERR)
SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize); SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
} }
} }
else if (!wcsicmp(szFs, L"FAT32")) else if (!wcsicmp(szFs, L"FAT32"))
@ -628,6 +629,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0); SendMessageW(hDlgCtrl, CB_DELETESTRING, iSelIndex, 0);
return; return;
} }
if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR))) if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR)))
{ {
hDlgCtrl = GetDlgItem(hwndDlg, 28680); hDlgCtrl = GetDlgItem(hwndDlg, 28680);
@ -636,6 +638,7 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs); lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs);
if (lIndex != CB_ERR) if (lIndex != CB_ERR)
SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize); SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
} }
} }
else if (!wcsicmp(szFs, L"NTFS")) else if (!wcsicmp(szFs, L"NTFS"))
@ -649,14 +652,15 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
else else
ClusterSize = 2048; ClusterSize = 2048;
hDlgCtrl = GetDlgItem(hwndDlg, 28680);
if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR))) if (LoadStringW(shell32_hInstance, IDS_DEFAULT_CLUSTER_SIZE, szFs, sizeof(szFs)/sizeof(WCHAR)))
{ {
hDlgCtrl = GetDlgItem(hwndDlg, 28680);
szFs[(sizeof(szFs)/sizeof(WCHAR))-1] = L'\0'; szFs[(sizeof(szFs)/sizeof(WCHAR))-1] = L'\0';
SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0); SendMessageW(hDlgCtrl, CB_RESETCONTENT, 0, 0);
lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs); lIndex = SendMessageW(hDlgCtrl, CB_ADDSTRING, 0, (LPARAM)szFs);
if (lIndex != CB_ERR) if (lIndex != CB_ERR)
SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize); SendMessageW(hDlgCtrl, CB_SETITEMDATA, lIndex, (LPARAM)ClusterSize);
SendMessageW(hDlgCtrl, CB_SETCURSEL, 0, 0);
} }
ClusterSize = 512; ClusterSize = 512;
for (lIndex = 0; lIndex < 4; lIndex++) for (lIndex = 0; lIndex < 4; lIndex++)
@ -671,13 +675,19 @@ InsertDefaultClusterSizeForFs(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
ClusterSize *= 2; ClusterSize *= 2;
} }
} }
else
{
FIXME("unknown fs\n");
SendDlgItemMessageW(hwndDlg, 28680, CB_RESETCONTENT, iSelIndex, 0);
return;
}
} }
VOID VOID
InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{ {
WCHAR szText[120]; WCHAR szText[120];
WCHAR szDrive[3] = { L'C', '\\', 0 }; WCHAR szDrive[4] = { L'C', ':', '\\', 0 };
WCHAR szFs[30] = {0}; WCHAR szFs[30] = {0};
INT Length, TempLength; INT Length, TempLength;
DWORD dwSerial, dwMaxComp, dwFileSys; DWORD dwSerial, dwMaxComp, dwFileSys;
@ -688,7 +698,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
HWND hDlgCtrl; HWND hDlgCtrl;
Length = GetWindowTextW(hwndDlg, szText, sizeof(szText)/sizeof(WCHAR)); Length = GetWindowTextW(hwndDlg, szText, sizeof(szText)/sizeof(WCHAR));
szDrive[0] = pContext->Drive; szDrive[0] = pContext->Drive + L'A';
if (GetVolumeInformationW(szDrive, &szText[Length+1], (sizeof(szText)/sizeof(WCHAR))- Length - 2, &dwSerial, &dwMaxComp, &dwFileSys, szFs, sizeof(szFs)/sizeof(WCHAR))) if (GetVolumeInformationW(szDrive, &szText[Length+1], (sizeof(szText)/sizeof(WCHAR))- Length - 2, &dwSerial, &dwMaxComp, &dwFileSys, szFs, sizeof(szFs)/sizeof(WCHAR)))
{ {
szText[Length] = L' '; szText[Length] = L' ';
@ -707,6 +717,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
} }
Length += TempLength + 1; Length += TempLength + 1;
} }
if (Length + 4 < (sizeof(szText)/sizeof(WCHAR))) if (Length + 4 < (sizeof(szText)/sizeof(WCHAR)))
{ {
szText[Length] = L' '; szText[Length] = L' ';
@ -730,7 +741,8 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{ {
/* add drive capacity */ /* add drive capacity */
szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0';
SendDlgItemMessageW(hwndDlg, 28673, LB_ADDSTRING, 0, (LPARAM)szText); SendDlgItemMessageW(hwndDlg, 28673, CB_ADDSTRING, 0, (LPARAM)szText);
SendDlgItemMessageW(hwndDlg, 28673, CB_SETCURSEL, 0, (LPARAM)0);
} }
} }
@ -744,6 +756,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
dwIndex = 0; dwIndex = 0;
dwDefault = 0; dwDefault = 0;
hDlgCtrl = GetDlgItem(hwndDlg, 28677); hDlgCtrl = GetDlgItem(hwndDlg, 28677);
while(pContext->QueryAvailableFileSystemFormat(dwIndex, szText, &uMajor, &uMinor, &Latest)) while(pContext->QueryAvailableFileSystemFormat(dwIndex, szText, &uMajor, &uMinor, &Latest))
{ {
szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0';
@ -761,7 +774,7 @@ InitializeFormatDriveDlg(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
} }
/* select default filesys */ /* select default filesys */
SendMessageW(hDlgCtrl, CB_SETCURSEL, dwIndex, 0); SendMessageW(hDlgCtrl, CB_SETCURSEL, dwDefault, 0);
/* setup cluster combo */ /* setup cluster combo */
InsertDefaultClusterSizeForFs(hwndDlg, pContext); InsertDefaultClusterSizeForFs(hwndDlg, pContext);
/* hide progress control */ /* hide progress control */
@ -814,7 +827,7 @@ FormatExCB(
VOID VOID
FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext) FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
{ {
WCHAR szDrive[3] = { L'C', '\\', 0 }; WCHAR szDrive[4] = { L'C', ':', '\\', 0 };
WCHAR szFileSys[40] = {0}; WCHAR szFileSys[40] = {0};
WCHAR szLabel[40] = {0}; WCHAR szLabel[40] = {0};
INT iSelIndex; INT iSelIndex;