Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-10 04:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
A DialogProc returns INT_PTR, not BOOL

svn path=/trunk/; revision=53706
This commit is contained in:
Timo Kreuzer 2011-09-14 06:28:11 +00:00
parent 57b01f1a06
commit 16c957463f
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/dll/win32/shell32/drive.cpp
View file

@ -32,7 +32,7 @@ typedef enum
} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; } HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE;
typedef typedef
BOOLEAN BOOLEAN
(NTAPI *INITIALIZE_FMIFS)( (NTAPI *INITIALIZE_FMIFS)(
IN PVOID hinstDll, IN PVOID hinstDll,
IN DWORD dwReason, IN DWORD dwReason,
@ -55,7 +55,7 @@ BOOLEAN
); );
typedef typedef
VOID VOID
(NTAPI *FORMAT_EX)( (NTAPI *FORMAT_EX)(
IN PWCHAR DriveRoot, IN PWCHAR DriveRoot,
IN FMIFS_MEDIA_FLAG MediaFlag, IN FMIFS_MEDIA_FLAG MediaFlag,
@ -67,7 +67,7 @@ VOID
); );
typedef typedef
VOID VOID
(NTAPI *CHKDSK)( (NTAPI *CHKDSK)(
IN PWCHAR DriveRoot, IN PWCHAR DriveRoot,
IN PWCHAR Format, IN PWCHAR Format,
@ -234,7 +234,7 @@ ChkDskNow(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
bChkdskSuccess = FALSE; bChkdskSuccess = FALSE;
SendDlgItemMessageW(hwndDlg, 14002, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendDlgItemMessageW(hwndDlg, 14002, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
pContext->Chkdsk(szDrive, szFs, bCorrectErrors, TRUE, FALSE, bScanDrive, NULL, NULL, ChkdskCallback); pContext->Chkdsk(szDrive, szFs, bCorrectErrors, TRUE, FALSE, bScanDrive, NULL, NULL, ChkdskCallback);
ChkdskDrvDialog = NULL; ChkdskDrvDialog = NULL;
pContext->Result = bChkdskSuccess; pContext->Result = bChkdskSuccess;
bChkdskSuccess = FALSE; bChkdskSuccess = FALSE;
@ -563,7 +563,7 @@ DriveExtraDlg(
break; break;
case 14001: case 14001:
dwSize = sizeof(szPath); dwSize = sizeof(szPath);
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\DefragPath", L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\DefragPath",
NULL, NULL,
RRF_RT_REG_EXPAND_SZ, RRF_RT_REG_EXPAND_SZ,
@ -588,7 +588,7 @@ DriveExtraDlg(
break; break;
case 14002: case 14002:
dwSize = sizeof(szPath); dwSize = sizeof(szPath);
if (RegGetValueW(HKEY_LOCAL_MACHINE, if (RegGetValueW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath", L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath",
NULL, NULL,
RRF_RT_REG_EXPAND_SZ, RRF_RT_REG_EXPAND_SZ,
@ -692,7 +692,7 @@ SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *
if (!wcslen(szName)) if (!wcslen(szName))
{ {
/* FIXME /* FIXME
* check if disk is a really a local hdd * check if disk is a really a local hdd
*/ */
i = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szName, sizeof(szName)/sizeof(WCHAR)-6); i = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szName, sizeof(szName)/sizeof(WCHAR)-6);
if (i > 0 && i < (sizeof(szName)/sizeof(WCHAR)) - 6) if (i > 0 && i < (sizeof(szName)/sizeof(WCHAR)) - 6)
@ -766,7 +766,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum
ClusterSize = 32768; ClusterSize = 32768;
else if (TotalNumberOfBytes->QuadPart <= (4096LL * 1024LL * 1024LL)) else if (TotalNumberOfBytes->QuadPart <= (4096LL * 1024LL * 1024LL))
ClusterSize = 8192; ClusterSize = 8192;
else else
return FALSE; return FALSE;
} }
else if (!wcsicmp(szFs, L"FAT32")) else if (!wcsicmp(szFs, L"FAT32"))
@ -783,7 +783,7 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum
ClusterSize = 8192; ClusterSize = 8192;
else if (TotalNumberOfBytes->QuadPart <= (32768LL * 1024LL * 1024LL)) else if (TotalNumberOfBytes->QuadPart <= (32768LL * 1024LL * 1024LL))
ClusterSize = 16384; ClusterSize = 16384;
else else
return FALSE; return FALSE;
} }
else if (!wcsicmp(szFs, L"NTFS")) else if (!wcsicmp(szFs, L"NTFS"))
@ -1156,8 +1156,8 @@ FormatDrive(HWND hwndDlg, PFORMAT_DRIVE_CONTEXT pContext)
} }
BOOL INT_PTR
CALLBACK CALLBACK
FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) FormatDriveDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PFORMAT_DRIVE_CONTEXT pContext; PFORMAT_DRIVE_CONTEXT pContext;
@ -1261,7 +1261,7 @@ InitializeFmifsLibrary(PFORMAT_DRIVE_CONTEXT pContext)
* SHFormatDrive (SHELL32.@) * SHFormatDrive (SHELL32.@)
*/ */
DWORD DWORD
WINAPI WINAPI
SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options) SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options)
{ {