[FSLIB]: Minor fixes:

- Stub and export VfatxChkdsk();
- Sync and fix the file code headers;
- In the libs, use NTAPI instead of WINAPI;
- Use 4-space indentation (instead of tabs).

svn path=/trunk/; revision=74643

diff --git a/reactos/dll/win32/ubtrfs/ubtrfs.c b/reactos/dll/win32/ubtrfs/ubtrfs.c
index c5b6297..9ccea1a 100644 (file)
--- a/reactos/dll/win32/ubtrfs/ubtrfs.c
+++ b/reactos/dll/win32/ubtrfs/ubtrfs.c
@@ -3,7 +3,6 @@
  * PROJECT:         BtrFS File System Management
  * FILE:            dll/win32/ubtrfs/ubtrfs.c
  * PURPOSE:         ubtrfs DLL initialisation
- *
  * PROGRAMMERS:     Pierre Schweitzer
  */
 
@@ -11,13 +10,13 @@
 
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/dll/win32/uext2/uext2.c b/reactos/dll/win32/uext2/uext2.c
index d443972..a1267ec 100644 (file)
--- a/reactos/dll/win32/uext2/uext2.c
+++ b/reactos/dll/win32/uext2/uext2.c
@@ -3,22 +3,20 @@
  * PROJECT:         Ext2 File System Management
  * FILE:            dll/win32/uext2/uext2.c
  * PURPOSE:         uext2 DLL initialisation
- *
  * PROGRAMMERS:     Pierre Schweitzer
  */
 
 #include <windef.h>
 
-
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/dll/win32/ufat/ufat.c b/reactos/dll/win32/ufat/ufat.c
index 05ba6f1..b284533 100644 (file)
--- a/reactos/dll/win32/ufat/ufat.c
+++ b/reactos/dll/win32/ufat/ufat.c
@@ -1,9 +1,8 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         FAT File System Management
- * FILE:            reactos/dll/win32/fmifs/init.c
- * PURPOSE:         Initialisation
- *
+ * FILE:            dll/win32/ufat/ufat.c
+ * PURPOSE:         ufat DLL initialisation
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
@@ -11,13 +10,13 @@
 
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/dll/win32/ufatx/CMakeLists.txt b/reactos/dll/win32/ufatx/CMakeLists.txt
index 927efb5..9f7ce36 100644 (file)
--- a/reactos/dll/win32/ufatx/CMakeLists.txt
+++ b/reactos/dll/win32/ufatx/CMakeLists.txt
@@ -2,12 +2,12 @@
 spec2def(ufatx.dll ufatx.spec)
 
 list(APPEND SOURCE
+    ufatx.c
     ufatx.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
 
 add_library(ufatx SHARED ${SOURCE})
+set_module_type(ufatx nativedll)
 target_link_libraries(ufatx vfatxlib)
-set_module_type(ufatx nativedll ENTRYPOINT 0 )
 add_importlibs(ufatx ntdll)
-add_dependencies(ufatx psdk)
 add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/win32/ufatx/ufatx.c b/reactos/dll/win32/ufatx/ufatx.c
new file mode 100644 (file)
index 0000000..9a171f4
--- /dev/null
+++ b/reactos/dll/win32/ufatx/ufatx.c
@@ -0,0 +1,22 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         FATX File System Management
+ * FILE:            dll/win32/ufatx/ufatx.c
+ * PURPOSE:         ufatx DLL initialisation
+ * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
+ */
+
+#include <windef.h>
+
+INT WINAPI
+DllMain(
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
+{
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
+
+    return TRUE;
+}

diff --git a/reactos/dll/win32/ufatx/ufatx.spec b/reactos/dll/win32/ufatx/ufatx.spec
index c34f527..40ab9e0 100644 (file)
--- a/reactos/dll/win32/ufatx/ufatx.spec
+++ b/reactos/dll/win32/ufatx/ufatx.spec
@@ -1 +1,2 @@
+@ stdcall ChkdskEx(ptr long long long long ptr) VfatxChkdsk
 @ stdcall FormatEx(ptr long ptr long long ptr) VfatxFormat

diff --git a/reactos/dll/win32/uffs/uffs.c b/reactos/dll/win32/uffs/uffs.c
index e21370a..96b4409 100644 (file)
--- a/reactos/dll/win32/uffs/uffs.c
+++ b/reactos/dll/win32/uffs/uffs.c
@@ -3,7 +3,6 @@
  * PROJECT:         FFS File System Management
  * FILE:            dll/win32/uffs/uffs.c
  * PURPOSE:         uffs DLL initialisation
- *
  * PROGRAMMERS:     Pierre Schweitzer
  */
 
@@ -11,13 +10,13 @@
 
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/dll/win32/untfs/untfs.c b/reactos/dll/win32/untfs/untfs.c
index 8b451ce..e7ed7d3 100644 (file)
--- a/reactos/dll/win32/untfs/untfs.c
+++ b/reactos/dll/win32/untfs/untfs.c
@@ -3,7 +3,6 @@
  * PROJECT:         NTFS File System Management
  * FILE:            dll/win32/untfs/untfs.c
  * PURPOSE:         untfs DLL initialisation
- *
  * PROGRAMMERS:     Pierre Schweitzer
  */
 
@@ -11,13 +10,13 @@
 
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/dll/win32/ureiserfs/ureiserfs.c b/reactos/dll/win32/ureiserfs/ureiserfs.c
index 9cf857a..112c8a7 100644 (file)
--- a/reactos/dll/win32/ureiserfs/ureiserfs.c
+++ b/reactos/dll/win32/ureiserfs/ureiserfs.c
@@ -1,9 +1,8 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         BTRFS File System Management
- * FILE:            dll/win32/ubtrfs/ubtrfs.c
- * PURPOSE:         ubtrfs DLL initialisation
- *
+ * PROJECT:         ReiserFS File System Management
+ * FILE:            dll/win32/ureiserfs/ureiserfs.c
+ * PURPOSE:         ureiserfs DLL initialisation
  * PROGRAMMERS:     Pierre Schweitzer
  */
 
@@ -11,13 +10,13 @@
 
 INT WINAPI
 DllMain(
-       IN HINSTANCE hinstDLL,
-       IN DWORD     dwReason,
-       IN LPVOID    lpvReserved)
+    IN HINSTANCE hinstDLL,
+    IN DWORD     dwReason,
+    IN LPVOID    lpvReserved)
 {
-       UNREFERENCED_PARAMETER(hinstDLL);
-       UNREFERENCED_PARAMETER(dwReason);
-       UNREFERENCED_PARAMETER(lpvReserved);
+    UNREFERENCED_PARAMETER(hinstDLL);
+    UNREFERENCED_PARAMETER(dwReason);
+    UNREFERENCED_PARAMETER(lpvReserved);
 
-       return TRUE;
+    return TRUE;
 }

diff --git a/reactos/sdk/lib/fslib/btrfslib/btrfslib.c b/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
index 0e671f7..3e5baf1 100644 (file)
--- a/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
+++ b/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
@@ -82,13 +82,13 @@ FORCEINLINE VOID InsertTailList(PLIST_ENTRY ListHead, PLIST_ENTRY Entry) {
 #endif
 
 #if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7)
-NTSTATUS WINAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max,
-                                  ULONG *utf8_bytes_written,
-                                  const WCHAR *uni_src, ULONG uni_bytes);
+NTSTATUS NTAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max,
+                                 ULONG *utf8_bytes_written,
+                                 const WCHAR *uni_src, ULONG uni_bytes);
 #endif /* defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) */
 
 #ifdef __REACTOS__
-ULONG WINAPI NtGetTickCount(VOID);
+ULONG NTAPI NtGetTickCount(VOID);
 #endif
 
 typedef struct {
@@ -237,7 +237,7 @@ static UINT32 calc_crc32c(UINT32 seed, UINT8* msg, ULONG msglen) {
 #ifndef __REACTOS__
 NTSTATUS WINAPI ChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty,
 #else
-NTSTATUS WINAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty,
+NTSTATUS NTAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty,
 #endif
                          BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) {
     // STUB

diff --git a/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c b/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
index 62757e9..91506ad 100644 (file)
--- a/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
+++ b/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
@@ -1004,7 +1004,7 @@ clean_up:
 }
 
 NTSTATUS
-WINAPI
+NTAPI
 Ext2Chkdsk(IN PUNICODE_STRING DriveRoot,
            IN BOOLEAN FixErrors,
            IN BOOLEAN Verbose,

diff --git a/reactos/sdk/lib/fslib/ffslib/ffslib.c b/reactos/sdk/lib/fslib/ffslib/ffslib.c
index ae7c29e..2c7f3ed 100644 (file)
--- a/reactos/sdk/lib/fslib/ffslib/ffslib.c
+++ b/reactos/sdk/lib/fslib/ffslib/ffslib.c
@@ -23,7 +23,7 @@ FfsFormat(IN PUNICODE_STRING DriveRoot,
 }
 
 
-NTSTATUS WINAPI
+NTSTATUS NTAPI
 FfsChkdsk(IN PUNICODE_STRING DriveRoot,
           IN BOOLEAN FixErrors,
           IN BOOLEAN Verbose,

diff --git a/reactos/sdk/lib/fslib/ntfslib/ntfslib.c b/reactos/sdk/lib/fslib/ntfslib/ntfslib.c
index 7fc0e22..d99f63e 100644 (file)
--- a/reactos/sdk/lib/fslib/ntfslib/ntfslib.c
+++ b/reactos/sdk/lib/fslib/ntfslib/ntfslib.c
@@ -23,7 +23,7 @@ NtfsFormat(IN PUNICODE_STRING DriveRoot,
 }
 
 
-NTSTATUS WINAPI
+NTSTATUS NTAPI
 NtfsChkdsk(IN PUNICODE_STRING DriveRoot,
            IN BOOLEAN FixErrors,
            IN BOOLEAN Verbose,

diff --git a/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c b/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
index a5909f1..7356e14 100644 (file)
--- a/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
+++ b/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
@@ -23,7 +23,7 @@ ReiserfsFormat(IN PUNICODE_STRING DriveRoot,
 }
 
 
-NTSTATUS WINAPI
+NTSTATUS NTAPI
 ReiserfsChkdsk(IN PUNICODE_STRING DriveRoot,
                IN BOOLEAN FixErrors,
                IN BOOLEAN Verbose,

diff --git a/reactos/sdk/lib/fslib/vfatlib/vfatlib.c b/reactos/sdk/lib/fslib/vfatlib/vfatlib.c
index 5ef5618..d61b359 100644 (file)
--- a/reactos/sdk/lib/fslib/vfatlib/vfatlib.c
+++ b/reactos/sdk/lib/fslib/vfatlib/vfatlib.c
@@ -371,7 +371,7 @@ VfatPrint(PCHAR Format, ...)
 
 
 NTSTATUS
-WINAPI
+NTAPI
 VfatChkdsk(IN PUNICODE_STRING DriveRoot,
            IN BOOLEAN FixErrors,
            IN BOOLEAN Verbose,

diff --git a/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c b/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
index 40d2105..4f40cad 100644 (file)
--- a/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
+++ b/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
@@ -152,6 +152,17 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot,
     return Status;
 }
 
+NTSTATUS NTAPI
+VfatxChkdsk(IN PUNICODE_STRING DriveRoot,
+            IN BOOLEAN FixErrors,
+            IN BOOLEAN Verbose,
+            IN BOOLEAN CheckOnlyIfDirty,
+            IN BOOLEAN ScanDrive,
+            IN PFMIFSCALLBACK Callback)
+{
+    UNIMPLEMENTED;
+    return STATUS_SUCCESS;
+}
 
 VOID
 VfatxUpdateProgress(IN PFORMAT_CONTEXT Context,