Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 04:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHKDSK]

Browse source 
- Integrate chkdsk into our build system.
- Whitespace fixes.

svn path=/trunk/; revision=70868
This commit is contained in:
Hermès Bélusca-Maïto 2016-03-02 22:05:19 +00:00
parent 4dc68af961
commit 9723b5e974
3 changed files with 310 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/system/chkdsk/CMakeLists.txt
View file

@ -1,7 +1,7 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs)
add_executable(chkdsk chkdsk.c chkdsk.rc) add_executable(chkdsk chkdsk.c chkdsk.rc)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs)
set_module_type(chkdsk win32cui UNICODE) set_module_type(chkdsk win32cui UNICODE)
target_link_libraries(chkdsk win32err)
add_importlibs(chkdsk fmifs msvcrt kernel32 ntdll) add_importlibs(chkdsk fmifs msvcrt kernel32 ntdll)
add_cd_file(TARGET chkdsk DESTINATION reactos/system32 FOR all) add_cd_file(TARGET chkdsk DESTINATION reactos/system32 FOR all)

284
reactos/base/system/chkdsk/chkdsk.c
View file

@ -6,6 +6,9 @@
// Systems Internals // Systems Internals
// http://www.sysinternals.com/ // http://www.sysinternals.com/
// //
// Chkdsk clone that demonstrates the use of the FMIFS file system
// utility library.
//
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// //
// This software is free software; you can redistribute it and/or // This software is free software; you can redistribute it and/or
@ -25,9 +28,6 @@
// //
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// //
// Chkdsk clone that demonstrates the use of the FMIFS file system
// utility library.
//
// 1999 February (Emanuele Aliberti) // 1999 February (Emanuele Aliberti)
// Adapted for ReactOS and lcc-win32. // Adapted for ReactOS and lcc-win32.
// //
@ -38,16 +38,18 @@
// Cleanup, use ReactOS's fmifs.h // Cleanup, use ReactOS's fmifs.h
// //
//====================================================================== //======================================================================
#define WIN32_NO_STATUS
#define NTOS_MODE_USER
#include <windows.h>
#include <stdio.h> #include <stdio.h>
/* PSDK/NDK Headers */
#define WIN32_NO_STATUS
#include <windows.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h> #include <ndk/ntndk.h>
#include <fmifs/fmifs.h> #include <fmifs/fmifs.h>
#define _UNICODE 1
#include <tchar.h> #define FMIFS_IMPORT_DLL
#include "../config.h"
#include "../win32err.h"
// //
// Globals // Globals
@ -66,10 +68,31 @@ WCHAR CurrentDirectory[1024];
// //
// FMIFS function // FMIFS function
// //
//PCHKDSK Chkdsk; // PCHKDSK Chkdsk;
#endif /* ndef FMIFS_IMPORT_DLL */ #endif /* ndef FMIFS_IMPORT_DLL */
//----------------------------------------------------------------------
//
// PrintWin32Error
//
// Takes the win32 error code and prints the text version.
//
//----------------------------------------------------------------------
static VOID PrintWin32Error(LPWSTR Message, DWORD ErrorCode)
{
LPWSTR lpMsgBuf;
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
NULL, ErrorCode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPWSTR)&lpMsgBuf, 0, NULL);
wprintf(L"%s: %s\n", Message, lpMsgBuf);
LocalFree(lpMsgBuf);
}
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// //
// CtrlCIntercept // CtrlCIntercept
@ -80,7 +103,7 @@ WCHAR CurrentDirectory[1024];
//-------------------------------------------------------------------- //--------------------------------------------------------------------
BOOL BOOL
WINAPI WINAPI
CtrlCIntercept( DWORD dwCtrlType ) CtrlCIntercept(DWORD dwCtrlType)
{ {
// //
// Handle the event so that the default handler doesn't // Handle the event so that the default handler doesn't
@ -98,18 +121,15 @@ CtrlCIntercept( DWORD dwCtrlType )
// 19990216 EA Missing printf %s argument // 19990216 EA Missing printf %s argument
//---------------------------------------------------------------------- //----------------------------------------------------------------------
VOID VOID
Usage( PWCHAR ProgramName ) Usage(PWCHAR ProgramName)
{ {
_tprintf( wprintf(L"Usage: %s [drive:] [-F] [-V] [-R] [-C]\n\n"
L"\ L"[drive:] Specifies the drive to check.\n"
Usage: %s [drive:] [-F] [-V] [-R] [-C]\n\n\ L"-F Fixes errors on the disk.\n"
[drive:] Specifies the drive to check.\n\ L"-V Displays the full path of every file on the disk.\n"
-F Fixes errors on the disk.\n\ L"-R Locates bad sectors and recovers readable information.\n"
-V Displays the full path of every file on the disk.\n\ L"-C Checks the drive only if it is dirty.\n\n",
-R Locates bad sectors and recovers readable information.\n\ ProgramName);
-C Checks the drive only if it is dirty.\n\n",
ProgramName
);
} }
@ -123,58 +143,58 @@ Usage: %s [drive:] [-F] [-V] [-R] [-C]\n\n\
int int
ParseCommandLine( ParseCommandLine(
int argc, int argc,
WCHAR *argv [] WCHAR *argv[]
) )
{ {
int i; int i;
BOOLEAN gotFix = FALSE; BOOLEAN gotFix = FALSE;
BOOLEAN gotVerbose = FALSE; BOOLEAN gotVerbose = FALSE;
BOOLEAN gotClean = FALSE; BOOLEAN gotClean = FALSE;
/*BOOLEAN gotScan = FALSE;*/ // BOOLEAN gotScan = FALSE;
for (i = 1; i < argc; i++)
for ( i = 1;
(i < argc);
i++
) {
switch( argv[i][0] )
{ {
case L'-': switch (argv[i][0])
case L'/':
switch( argv[i][1] )
{ {
case L'F': case L'-': case L'/':
case L'f':
if( gotFix ) return i; switch (argv[i][1])
{
case L'?':
Usage(argv[0]);
break;
case L'F': case L'f':
{
if (gotFix) return i;
FixErrors = TRUE; FixErrors = TRUE;
gotFix = TRUE; gotFix = TRUE;
break; break;
}
case L'V': case L'V': case L'v':
case L'v': {
if (gotVerbose) return i;
if( gotVerbose) return i;
Verbose = TRUE; Verbose = TRUE;
gotVerbose = TRUE; gotVerbose = TRUE;
break; break;
}
case L'R': case L'R': case L'r':
case L'r': {
if (gotFix) return i;
if( gotFix ) return i;
ScanSectors = TRUE; ScanSectors = TRUE;
gotFix = TRUE; gotFix = TRUE;
break; break;
}
case L'C': case L'C': case L'c':
case L'c': {
if (gotClean) return i;
if( gotClean ) return i;
SkipClean = TRUE; SkipClean = TRUE;
gotClean = TRUE; gotClean = TRUE;
break; break;
}
default: default:
return i; return i;
@ -182,14 +202,15 @@ ParseCommandLine(
break; break;
default: default:
{
if( Drive ) return i; if (Drive) return i;
if( argv[i][1] != L':' ) return i; if (argv[i][1] != L':') return i;
Drive = argv[i]; Drive = argv[i];
break; break;
} }
} }
}
return 0; return 0;
} }
@ -218,77 +239,77 @@ ChkdskCallback(
// We get other types of commands, // We get other types of commands,
// but we don't have to pay attention to them // but we don't have to pay attention to them
// //
switch( Command ) switch (Command)
{ {
case UNKNOWN2: case UNKNOWN2:
wprintf(L"UNKNOWN2\r"); wprintf(L"UNKNOWN2\r");
break; break;
case UNKNOWN3: case UNKNOWN3:
wprintf(L"UNKNOWN3\r"); wprintf(L"UNKNOWN3\n");
break; break;
case UNKNOWN4: case UNKNOWN4:
wprintf(L"UNKNOWN4\r"); wprintf(L"UNKNOWN4\n");
break; break;
case UNKNOWN5: case UNKNOWN5:
wprintf(L"UNKNOWN5\r"); wprintf(L"UNKNOWN5\n");
break; break;
case FSNOTSUPPORTED: case FSNOTSUPPORTED:
wprintf(L"FSNOTSUPPORTED\r"); wprintf(L"FSNOTSUPPORTED\n");
break; break;
case VOLUMEINUSE: case VOLUMEINUSE:
wprintf(L"VOLUMEINUSE\r"); wprintf(L"VOLUMEINUSE\n");
break; break;
case UNKNOWN9: case UNKNOWN9:
wprintf(L"UNKNOWN9\r"); wprintf(L"UNKNOWN9\n");
break; break;
case UNKNOWNA: case UNKNOWNA:
wprintf(L"UNKNOWNA\r"); wprintf(L"UNKNOWNA\n");
break; break;
case UNKNOWNC: case UNKNOWNC:
wprintf(L"UNKNOWNC\r"); wprintf(L"UNKNOWNC\n");
break; break;
case UNKNOWND: case UNKNOWND:
wprintf(L"UNKNOWND\r"); wprintf(L"UNKNOWND\n");
break; break;
case INSUFFICIENTRIGHTS: case INSUFFICIENTRIGHTS:
wprintf(L"INSUFFICIENTRIGHTS\r"); wprintf(L"INSUFFICIENTRIGHTS\n");
break; break;
case STRUCTUREPROGRESS: case STRUCTUREPROGRESS:
wprintf(L"STRUCTUREPROGRESS\r"); wprintf(L"STRUCTUREPROGRESS\n");
break; break;
case DONEWITHSTRUCTURE: case DONEWITHSTRUCTURE:
wprintf(L"DONEWITHSTRUCTURE\r"); wprintf(L"DONEWITHSTRUCTURE\n");
break; break;
case CLUSTERSIZETOOSMALL: case CLUSTERSIZETOOSMALL:
wprintf(L"CLUSTERSIZETOOSMALL\r"); wprintf(L"CLUSTERSIZETOOSMALL\n");
break; break;
case PROGRESS: case PROGRESS:
percent = (PDWORD) Argument; percent = (PDWORD)Argument;
wprintf(L"%d percent completed.\r", *percent); wprintf(L"%d percent completed.\r", *percent);
break; break;
case OUTPUT: case OUTPUT:
output = (PTEXTOUTPUT) Argument; output = (PTEXTOUTPUT)Argument;
fwprintf(stdout, L"%s", output->Output); wprintf(L"%S", output->Output);
break; break;
case DONE: case DONE:
status = (PBOOLEAN) Argument; status = (PBOOLEAN)Argument;
if ( *status == TRUE ) if (*status == TRUE)
{ {
wprintf(L"Chkdsk was unable to complete successfully.\n\n"); wprintf(L"Chkdsk was unable to complete successfully.\n\n");
Error = TRUE; Error = TRUE;
@ -311,16 +332,18 @@ ChkdskCallback(
BOOLEAN BOOLEAN
LoadFMIFSEntryPoints(VOID) LoadFMIFSEntryPoints(VOID)
{ {
LoadLibraryW( L"fmifs.dll" ); HMODULE hFmifs = LoadLibraryW(L"fmifs.dll");
if (hFmifs == NULL)
return FALSE;
if( !(Chkdsk = Chkdsk = (PCHKDSK)GetProcAddress(hFmifs, "Chkdsk");
(void *) GetProcAddress(
GetModuleHandleW(L"fmifs.dll"), if (!Chkdsk)
"Chkdsk" ))
)
{ {
FreeLibrary(hFmifs);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
#endif /* ndef FMIFS_IMPORT_DLL */ #endif /* ndef FMIFS_IMPORT_DLL */
@ -339,42 +362,38 @@ LoadFMIFSEntryPoints(VOID)
// //
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int int
wmain( int argc, WCHAR *argv[] ) wmain(int argc, WCHAR *argv[])
{ {
int badArg; int badArg;
HANDLE volumeHandle; HANDLE volumeHandle;
WCHAR fileSystem [1024]; WCHAR fileSystem[1024];
WCHAR volumeName [1024]; WCHAR volumeName[1024];
DWORD serialNumber; DWORD serialNumber;
DWORD flags, DWORD flags, maxComponent;
maxComponent;
wprintf( wprintf(L"\n\
L"\n\
Chkdskx v1.0.1 by Mark Russinovich\n\ Chkdskx v1.0.1 by Mark Russinovich\n\
Systems Internals - http://www.sysinternals.com/\n\ Systems Internals - http://www.sysinternals.com/\n\
ReactOS adaptation 1999 by Emanuele Aliberti\n\n" ReactOS adaptation 1999 by Emanuele Aliberti\n\n");
);
#ifndef FMIFS_IMPORT_DLL #ifndef FMIFS_IMPORT_DLL
// //
// Get function pointers // Get function pointers
// //
if( !LoadFMIFSEntryPoints()) if (!LoadFMIFSEntryPoints())
{ {
wprintf(L"Could not located FMIFS entry points.\n\n"); wprintf(L"Could not located FMIFS entry points.\n\n");
return -1; return -1;
} }
#endif /* ndef FMIFS_IMPORT_DLL */ #endif /* ndef FMIFS_IMPORT_DLL */
// //
// Parse command line // Parse command line
// //
if( (badArg = ParseCommandLine( argc, argv ))) badArg = ParseCommandLine(argc, argv);
if (badArg)
{ {
wprintf( wprintf(L"Unknown argument: %s\n", argv[badArg]);
L"Unknown argument: %s\n",
argv[badArg]
);
Usage(argv[0]); Usage(argv[0]);
return -1; return -1;
} }
@ -382,24 +401,17 @@ ReactOS adaptation 1999 by Emanuele Aliberti\n\n"
// //
// Get the drive's format // Get the drive's format
// //
if( !Drive ) if (!Drive)
{ {
if( !GetCurrentDirectoryW( if (!GetCurrentDirectoryW(ARRAYSIZE(CurrentDirectory), CurrentDirectory))
sizeof(CurrentDirectory), {
CurrentDirectory PrintWin32Error(L"Could not get current directory", GetLastError());
)
) {
PrintWin32Error(
L"Could not get current directory",
GetLastError()
);
return -1; return -1;
} }
}
} else { else
{
wcscpy( CurrentDirectory, Drive ); wcscpy(CurrentDirectory, Drive);
} }
CurrentDirectory[2] = L'\\'; CurrentDirectory[2] = L'\\';
CurrentDirectory[3] = L'\0'; CurrentDirectory[3] = L'\0';
@ -409,65 +421,50 @@ ReactOS adaptation 1999 by Emanuele Aliberti\n\n"
// Determine the drive's file system format, which we need to // Determine the drive's file system format, which we need to
// tell chkdsk // tell chkdsk
// //
if( !GetVolumeInformationW( if (!GetVolumeInformationW(Drive,
Drive,
volumeName, volumeName,
sizeof volumeName, ARRAYSIZE(volumeName),
& serialNumber, &serialNumber,
& maxComponent, &maxComponent,
& flags, &flags,
fileSystem, fileSystem,
sizeof fileSystem ARRAYSIZE(fileSystem)))
) {
) { PrintWin32Error(L"Could not query volume", GetLastError());
PrintWin32Error(
L"Could not query volume",
GetLastError()
);
return -1; return -1;
} }
// //
// If they want to fix, we need to have access to the drive // If they want to fix, we need to have access to the drive
// //
if ( FixErrors ) if (FixErrors)
{ {
swprintf( swprintf(volumeName, L"\\\\.\\%C:", Drive[0]);
volumeName, volumeHandle = CreateFileW(volumeName,
L"\\\\.\\%C:",
Drive[0]
);
volumeHandle = CreateFileW(
volumeName,
GENERIC_WRITE, GENERIC_WRITE,
0, 0,
NULL, NULL,
OPEN_EXISTING, OPEN_EXISTING,
0, 0,
0 0);
); if (volumeHandle == INVALID_HANDLE_VALUE)
if( volumeHandle == INVALID_HANDLE_VALUE )
{ {
wprintf(L"Chdskx cannot run because the volume is in use by another process.\n\n"); wprintf(L"Chdskx cannot run because the volume is in use by another process.\n\n");
return -1; return -1;
} }
CloseHandle( volumeHandle ); CloseHandle(volumeHandle);
// //
// Can't let the user break out of a chkdsk that can modify the drive // Can't let the user break out of a chkdsk that can modify the drive
// //
SetConsoleCtrlHandler( CtrlCIntercept, TRUE ); SetConsoleCtrlHandler(CtrlCIntercept, TRUE);
} }
// //
// Just do it // Just do it
// //
wprintf( wprintf(L"The type of file system is %s.\n", fileSystem);
L"The type of file system is %s.\n", Chkdsk(Drive,
fileSystem
);
Chkdsk(
Drive,
fileSystem, fileSystem,
FixErrors, FixErrors,
Verbose, Verbose,
@ -475,10 +472,9 @@ ReactOS adaptation 1999 by Emanuele Aliberti\n\n"
ScanSectors, ScanSectors,
NULL, NULL,
NULL, NULL,
ChkdskCallback ChkdskCallback);
);
if ( Error ) return -1; if (Error) return -1;
return 0; return 0;
} }

8
reactos/base/system/chkdsk/chkdsk.rc
View file

@ -1,6 +1,6 @@
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Disk Checking Utility\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Disk Checking Utility"
#define REACTOS_STR_INTERNAL_NAME "chkdsk\0" #define REACTOS_STR_INTERNAL_NAME "chkdsk"
#define REACTOS_STR_ORIGINAL_FILENAME "chkdsk.exe\0" #define REACTOS_STR_ORIGINAL_FILENAME "chkdsk.exe"
#define REACTOS_STR_ORIGINAL_COPYRIGHT "1998 Mark Russinovich\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "1998 Mark Russinovich"
#include <reactos/version.rc> #include <reactos/version.rc>