Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FASTFAT_NEW] Fix MSVC builds

Browse source 
CORE-14879
This commit is contained in:
Serge Gautherie 2019-07-04 21:16:12 +02:00 committed by Pierre Schweitzer
parent 5dadfdaa39
commit 6d238e4513
7 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/filesystems/fastfat_new/cachesup.c
View file

@ -1675,8 +1675,8 @@ FatZeroData (
LARGE_INTEGER ZeroStart = {0,0};
LARGE_INTEGER BeyondZeroEnd = {0,0};
#else
LARGE_INTEGER ZeroStart = {.LowPart = 0, .HighPart = 0};
LARGE_INTEGER BeyondZeroEnd = {.LowPart = 0, .HighPart = 0};
LARGE_INTEGER ZeroStart = {{0,0}};
LARGE_INTEGER BeyondZeroEnd = {{0,0}};
#endif
ULONG SectorSize;

2
drivers/filesystems/fastfat_new/create.c
View file

@ -6448,7 +6448,7 @@ Return Value:
#ifndef __REACTOS__
LARGE_INTEGER AllocSize = {0};
#else
LARGE_INTEGER AllocSize = {.LowPart = 0, .HighPart = 0};
LARGE_INTEGER AllocSize = {{0}};
#endif
//

2
drivers/filesystems/fastfat_new/dirsup.c
View file

@ -2643,7 +2643,7 @@ Return Value:
#ifndef __REACTOS__
LARGE_INTEGER CurrentDay = {0};
#else
LARGE_INTEGER CurrentDay = {.LowPart = 0, .HighPart = 0};
LARGE_INTEGER CurrentDay = {{0}};
#endif
LARGE_INTEGER LastAccessDay;

18
drivers/filesystems/fastfat_new/fatdata.c
View file

@ -62,8 +62,8 @@ PDEVICE_OBJECT FatCdromFileSystemDeviceObject;
LARGE_INTEGER FatLargeZero = {0,0};
LARGE_INTEGER FatMaxLarge = {MAXULONG,MAXLONG};
#else
LARGE_INTEGER FatLargeZero = {.LowPart = 0, .HighPart = 0};
LARGE_INTEGER FatMaxLarge = {.LowPart = MAXULONG, .HighPart = MAXLONG};
LARGE_INTEGER FatLargeZero = {{0,0}};
LARGE_INTEGER FatMaxLarge = {{MAXULONG,MAXLONG}};
#endif
#ifndef __REACTOS__
@ -73,11 +73,11 @@ LARGE_INTEGER FatOneDay = {0x2a69c000, 0xc9};
LARGE_INTEGER FatJanOne1980 = {0xe1d58000,0x01a8e79f};
LARGE_INTEGER FatDecThirtyOne1979 = {0xb76bc000,0x01a8e6d6};
#else
LARGE_INTEGER Fat30Milliseconds = {.LowPart = (ULONG)(-30 * 1000 * 10), .HighPart = -1};
LARGE_INTEGER Fat100Milliseconds = {.LowPart = (ULONG)(-30 * 1000 * 10), .HighPart = -1};
LARGE_INTEGER FatOneDay = {.LowPart = 0x2a69c000, .HighPart = 0xc9};
LARGE_INTEGER FatJanOne1980 = {.LowPart = 0xe1d58000, .HighPart = 0x01a8e79f};
LARGE_INTEGER FatDecThirtyOne1979 = {.LowPart = 0xb76bc000, .HighPart = 0x01a8e6d6};
LARGE_INTEGER Fat30Milliseconds = {{(ULONG)(-30 * 1000 * 10), -1}};
LARGE_INTEGER Fat100Milliseconds = {{(ULONG)(-30 * 1000 * 10), -1}};
LARGE_INTEGER FatOneDay = {{0x2a69c000, 0xc9}};
LARGE_INTEGER FatJanOne1980 = {{0xe1d58000,0x01a8e79f}};
LARGE_INTEGER FatDecThirtyOne1979 = {{0xb76bc000,0x01a8e6d6}};
#endif
FAT_TIME_STAMP FatTimeJanOne1980 = {{0,0,0},{1,1,0}};
@ -86,8 +86,8 @@ FAT_TIME_STAMP FatTimeJanOne1980 = {{0,0,0},{1,1,0}};
LARGE_INTEGER FatMagic10000 = {0xe219652c, 0xd1b71758};
LARGE_INTEGER FatMagic86400000 = {0xfa67b90e, 0xc6d750eb};
#else
LARGE_INTEGER FatMagic10000 = {.LowPart = 0xe219652c, .HighPart = 0xd1b71758};
LARGE_INTEGER FatMagic86400000 = {.LowPart = 0xfa67b90e, .HighPart = 0xc6d750eb};
LARGE_INTEGER FatMagic10000 = {{0xe219652c, 0xd1b71758}};
LARGE_INTEGER FatMagic86400000 = {{0xfa67b90e, 0xc6d750eb}};
#endif
#ifdef _MSC_VER

12
drivers/filesystems/fastfat_new/fatinit.c
View file

@ -15,6 +15,10 @@ Abstract:
#include "fatprocs.h"
#ifdef __REACTOS__
#define _Unreferenced_parameter_
#endif
DRIVER_INITIALIZE DriverEntry;
NTSTATUS
@ -28,11 +32,7 @@ _Function_class_(DRIVER_UNLOAD)
VOID
NTAPI
FatUnload(
#ifndef __REACTOS__
_In_ _Unreferenced_parameter_ PDRIVER_OBJECT DriverObject
#else
_In_ PDRIVER_OBJECT DriverObject
#endif
);
NTSTATUS
@ -462,11 +462,7 @@ _Function_class_(DRIVER_UNLOAD)
VOID
NTAPI
FatUnload(
#ifndef __REACTOS__
_In_ _Unreferenced_parameter_ PDRIVER_OBJECT DriverObject
#else
_In_ PDRIVER_OBJECT DriverObject
#endif
)
/*++

3
drivers/filesystems/fastfat_new/fatstruc.h
View file

@ -19,6 +19,9 @@ Abstract:
typedef PVOID PBCB; //**** Bcb's are now part of the cache module
#ifdef __REACTOS__
#define __volatile volatile
#endif
//
// The FAT_DATA record is the top record in the Fat file system in-memory

2
drivers/filesystems/fastfat_new/fileinfo.c
View file

@ -1962,7 +1962,7 @@ Return Value:
#else
FAT_TIME_STAMP LastWriteTime = {{0}};
FAT_TIME_STAMP LastAccessTime = {{0}};
FAT_DATE LastAccessDate = {.Day = 0, .Month = 0, .Year = 0};
FAT_DATE LastAccessDate = {0, 0, 0};
#endif
UCHAR Attributes;