Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 11:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FSLIB]: Minor fixes:

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/ubtrfs/ubtrfs.c
View file

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

16
reactos/dll/win32/uext2/uext2.c
View file

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

19
reactos/dll/win32/ufat/ufat.c
View file

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

4
reactos/dll/win32/ufatx/CMakeLists.txt
View file

@ -2,12 +2,12 @@
spec2def(ufatx.dll ufatx.spec) spec2def(ufatx.dll ufatx.spec)
list(APPEND SOURCE list(APPEND SOURCE
ufatx.c
ufatx.rc ufatx.rc
${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
add_library(ufatx SHARED ${SOURCE}) add_library(ufatx SHARED ${SOURCE})
set_module_type(ufatx nativedll)
target_link_libraries(ufatx vfatxlib) target_link_libraries(ufatx vfatxlib)
set_module_type(ufatx nativedll ENTRYPOINT 0 )
add_importlibs(ufatx ntdll) add_importlibs(ufatx ntdll)
add_dependencies(ufatx psdk)
add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all)

22
reactos/dll/win32/ufatx/ufatx.c Normal file
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;
}

1
reactos/dll/win32/ufatx/ufatx.spec
View file

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

15
reactos/dll/win32/uffs/uffs.c
View file

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

15
reactos/dll/win32/untfs/untfs.c
View file

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

21
reactos/dll/win32/ureiserfs/ureiserfs.c
View file

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

10
reactos/sdk/lib/fslib/btrfslib/btrfslib.c
View file

@ -82,13 +82,13 @@ FORCEINLINE VOID InsertTailList(PLIST_ENTRY ListHead, PLIST_ENTRY Entry) {
#endif #endif
#if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) #if defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7)
NTSTATUS WINAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max, NTSTATUS NTAPI RtlUnicodeToUTF8N(CHAR *utf8_dest, ULONG utf8_bytes_max,
ULONG *utf8_bytes_written, ULONG *utf8_bytes_written,
const WCHAR *uni_src, ULONG uni_bytes); const WCHAR *uni_src, ULONG uni_bytes);
#endif /* defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) */ #endif /* defined(__REACTOS__) && (NTDDI_VERSION < NTDDI_WIN7) */
#ifdef __REACTOS__ #ifdef __REACTOS__
ULONG WINAPI NtGetTickCount(VOID); ULONG NTAPI NtGetTickCount(VOID);
#endif #endif
typedef struct { typedef struct {
@ -237,7 +237,7 @@ static UINT32 calc_crc32c(UINT32 seed, UINT8* msg, ULONG msglen) {
#ifndef __REACTOS__ #ifndef __REACTOS__
NTSTATUS WINAPI ChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, NTSTATUS WINAPI ChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty,
#else #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 #endif
BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) { BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) {
// STUB // STUB

2
reactos/sdk/lib/fslib/ext2lib/Mke2fs.c
View file

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

2
reactos/sdk/lib/fslib/ffslib/ffslib.c
View file

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

2
reactos/sdk/lib/fslib/ntfslib/ntfslib.c
View file

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

2
reactos/sdk/lib/fslib/reiserfslib/reiserfslib.c
View file

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

2
reactos/sdk/lib/fslib/vfatlib/vfatlib.c
View file

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

11
reactos/sdk/lib/fslib/vfatxlib/vfatxlib.c
View file

@ -152,6 +152,17 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot,
return Status; 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 VOID
VfatxUpdateProgress(IN PFORMAT_CONTEXT Context, VfatxUpdateProgress(IN PFORMAT_CONTEXT Context,