Declare prototype for ChkdskEx function in u{FS}.dll

svn path=/trunk/; revision=23960

diff --git a/reactos/base/system/autochk/autochk.c b/reactos/base/system/autochk/autochk.c
index 4d49ae2..21a4786 100644 (file)
--- a/reactos/base/system/autochk/autochk.c
+++ b/reactos/base/system/autochk/autochk.c
@@ -15,9 +15,9 @@
 #include <stdio.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <fmifs/fmifs.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>
 
 /* DEFINES ******************************************************************/
 

diff --git a/reactos/dll/win32/fmifs/init.c b/reactos/dll/win32/fmifs/init.c
index 41ef311..b6a0c15 100644 (file)
--- a/reactos/dll/win32/fmifs/init.c
+++ b/reactos/dll/win32/fmifs/init.c
@@ -58,12 +58,9 @@ AddProvider(
        RtlZeroMemory(Provider, RequiredSize);
 
        /* Get function pointers */
-       //Provider->Chkdsk = (CHKDSK)GetProcAddress(hMod, "Chkdsk");
-       //Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx");
+       Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx");
        //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend");
-       //Provider->Format = (FORMAT)GetProcAddress(hMod, "Format");
        Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx");
-       //Provider->Recover = (RECOVER)GetProcAddress(hMod, "Recover");
 
        wcscpy(Provider->Name, FileSystem);
 

diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h
index a69c66c..4e8d377 100644 (file)
--- a/reactos/dll/win32/fmifs/precomp.h
+++ b/reactos/dll/win32/fmifs/precomp.h
@@ -25,26 +25,15 @@
 /* VFATLIB Public Header */\r
 #include <fslib/vfatlib.h>\r
 \r
-typedef NTSTATUS (NTAPI *FORMATEX)(\r
-       IN PUNICODE_STRING DriveRoot,\r
-       IN FMIFS_MEDIA_FLAG MediaFlag,\r
-       IN PUNICODE_STRING Label,\r
-       IN BOOLEAN QuickFormat,\r
-       IN ULONG ClusterSize,\r
-       IN PFMIFSCALLBACK Callback);\r
-\r
 extern LIST_ENTRY ProviderListHead;\r
 \r
 typedef struct _IFS_PROVIDER\r
 {\r
        LIST_ENTRY ListEntry;\r
 \r
-       PVOID Chkdsk;\r
-       PVOID ChkdskEx;\r
+       CHKDSKEX ChkdskEx;\r
        PVOID Extend;\r
-       PVOID Format;\r
        FORMATEX FormatEx;\r
-       PVOID Recover;\r
 \r
        WCHAR Name[1];\r
 } IFS_PROVIDER, *PIFS_PROVIDER;\r

diff --git a/reactos/include/reactos/libs/fmifs/fmifs.h b/reactos/include/reactos/libs/fmifs/fmifs.h
index eb5daf8..36a36c5 100644 (file)
--- a/reactos/include/reactos/libs/fmifs/fmifs.h
+++ b/reactos/include/reactos/libs/fmifs/fmifs.h
@@ -164,4 +164,24 @@ QuerySupportedMedia(
        ULONG Unknown3,
        ULONG Unknown4);*/
 
+/* Functions provided by u*.dll */
+
+typedef NTSTATUS
+(NTAPI *FORMATEX)(
+       IN PUNICODE_STRING DriveRoot,
+       IN FMIFS_MEDIA_FLAG MediaFlag,
+       IN PUNICODE_STRING Label,
+       IN BOOLEAN QuickFormat,
+       IN ULONG ClusterSize,
+       IN PFMIFSCALLBACK Callback);
+
+typedef NTSTATUS
+(NTAPI *CHKDSKEX)(
+       IN PUNICODE_STRING DriveRoot,
+       IN BOOLEAN FixErrors,
+       IN BOOLEAN Verbose,
+       IN BOOLEAN CheckOnlyIfDirty,
+       IN BOOLEAN ScanDrive,
+       IN PFMIFSCALLBACK Callback);
+
 #endif /* ndef _FMIFS_H */

diff --git a/reactos/lib/fslib/vfatlib/vfatlib.h b/reactos/lib/fslib/vfatlib/vfatlib.h
index cbc770f..ed3c793 100755 (executable)
--- a/reactos/lib/fslib/vfatlib/vfatlib.h
+++ b/reactos/lib/fslib/vfatlib/vfatlib.h
@@ -6,9 +6,9 @@
 
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <fmifs/fmifs.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>
 
 #define SECTORSIZE 512
 

diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h
index 9d358e1..d67d871 100644 (file)
--- a/reactos/lib/fslib/vfatxlib/vfatxlib.h
+++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h
@@ -5,9 +5,9 @@
  */
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <fmifs/fmifs.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>
 
 typedef struct _FATX_BOOT_SECTOR
 {