[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
This commit is contained in:
Hermès Bélusca-Maïto 2017-05-24 23:32:46 +00:00
parent bc7078eaf3
commit d452b9b684
16 changed files with 93 additions and 66 deletions

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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)

View file

@ -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;
}

View file

@ -1 +1,2 @@
@ stdcall ChkdskEx(ptr long long long long ptr) VfatxChkdsk
@ stdcall FormatEx(ptr long ptr long long ptr) VfatxFormat

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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

View file

@ -1004,7 +1004,7 @@ clean_up:
}
NTSTATUS
WINAPI
NTAPI
Ext2Chkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,

View file

@ -23,7 +23,7 @@ FfsFormat(IN PUNICODE_STRING DriveRoot,
}
NTSTATUS WINAPI
NTSTATUS NTAPI
FfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,

View file

@ -23,7 +23,7 @@ NtfsFormat(IN PUNICODE_STRING DriveRoot,
}
NTSTATUS WINAPI
NTSTATUS NTAPI
NtfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,

View file

@ -23,7 +23,7 @@ ReiserfsFormat(IN PUNICODE_STRING DriveRoot,
}
NTSTATUS WINAPI
NTSTATUS NTAPI
ReiserfsChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,

View file

@ -371,7 +371,7 @@ VfatPrint(PCHAR Format, ...)
NTSTATUS
WINAPI
NTAPI
VfatChkdsk(IN PUNICODE_STRING DriveRoot,
IN BOOLEAN FixErrors,
IN BOOLEAN Verbose,

View file

@ -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,