[hbelusca] 74643: [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).
24 May
2017
24 May
'17
11:32 p.m.
Author: hbelusca
Date: Wed May 24 23:32:46 2017
New Revision: 74643
URL: http://svn.reactos.org/svn/reactos?rev=74643&view=rev
Log:
[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).
Added:
trunk/reactos/dll/win32/ufatx/ufatx.c (with props)
Modified:
trunk/reactos/dll/win32/ubtrfs/ubtrfs.c
trunk/reactos/dll/win32/uext2/uext2.c
trunk/reactos/dll/win32/ufat/ufat.c
trunk/reactos/dll/win32/ufatx/CMakeLists.txt
trunk/reactos/dll/win32/ufatx/ufatx.spec
trunk/reactos/dll/win32/uffs/uffs.c
trunk/reactos/dll/win32/untfs/untfs.c
trunk/reactos/dll/win32/ureiserfs/ureiserfs.c
trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c
trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c
trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c
trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
Modified: trunk/reactos/dll/win32/ubtrfs/ubtrfs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ubtrfs/ubtrfs.c?…
==============================================================================
--- trunk/reactos/dll/win32/ubtrfs/ubtrfs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ubtrfs/ubtrfs.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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;
}
Modified: trunk/reactos/dll/win32/uext2/uext2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re…
==============================================================================
--- trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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;
}
Modified: trunk/reactos/dll/win32/ufat/ufat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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(a)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;
}
Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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)
Added: trunk/reactos/dll/win32/ufatx/ufatx.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.c?re…
==============================================================================
--- trunk/reactos/dll/win32/ufatx/ufatx.c (added)
+++ trunk/reactos/dll/win32/ufatx/ufatx.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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(a)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;
+}
Propchange: trunk/reactos/dll/win32/ufatx/ufatx.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/ufatx/ufatx.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.spec…
==============================================================================
--- trunk/reactos/dll/win32/ufatx/ufatx.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ufatx/ufatx.spec [iso-8859-1] Wed May 24 23:32:46 2017
@@ -1 +1,2 @@
+@ stdcall ChkdskEx(ptr long long long long ptr) VfatxChkdsk
@ stdcall FormatEx(ptr long ptr long long ptr) VfatxFormat
Modified: trunk/reactos/dll/win32/uffs/uffs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uffs/uffs.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/uffs/uffs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uffs/uffs.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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;
}
Modified: trunk/reactos/dll/win32/untfs/untfs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re…
==============================================================================
--- trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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;
}
Modified: trunk/reactos/dll/win32/ureiserfs/ureiserfs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ureiserfs/ureise…
==============================================================================
--- trunk/reactos/dll/win32/ureiserfs/ureiserfs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ureiserfs/ureiserfs.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -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;
}
Modified: trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/btrfslib/btr…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/btrfslib/btrfslib.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -82,13 +82,13 @@
#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 @@
#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
Modified: trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ext2lib/Mke2…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -1004,7 +1004,7 @@
}
NTSTATUS
-WINAPI
+NTAPI
Ext2Chkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,
Modified: trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ffslib/ffsli…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/ffslib/ffslib.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -23,7 +23,7 @@
}
-NTSTATUS WINAPI
+NTSTATUS NTAPI
FfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,
Modified: trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/ntfslib/ntfs…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -23,7 +23,7 @@
}
-NTSTATUS WINAPI
+NTSTATUS NTAPI
NtfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,
Modified: trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/reiserfslib/…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c [iso-8859-1] Wed May 24 23:32:46
2017
@@ -23,7 +23,7 @@
}
-NTSTATUS WINAPI
+NTSTATUS NTAPI
ReiserfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,
Modified: trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatlib/vfat…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -371,7 +371,7 @@
NTSTATUS
-WINAPI
+NTAPI
VfatChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,
Modified: trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatxlib/vfa…
==============================================================================
--- trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] Wed May 24 23:32:46 2017
@@ -152,6 +152,17 @@
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,
2676
days inactive
2676
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org