[ros-diffs] [rharabien] 52546: [CDFS][FASTFAT][NPFS] - Fix MSVC warnings

Author: rharabien
Date: Tue Jul  5 13:55:39 2011
New Revision: 52546

URL: http://svn.reactos.org/svn/reactos?rev=52546&view=rev
Log:
[CDFS][FASTFAT][NPFS]
- Fix MSVC warnings

Modified:
    trunk/reactos/drivers/filesystems/cdfs/cdfs.h
    trunk/reactos/drivers/filesystems/cdfs/create.c
    trunk/reactos/drivers/filesystems/cdfs/dirctl.c
    trunk/reactos/drivers/filesystems/cdfs/finfo.c
    trunk/reactos/drivers/filesystems/cdfs/fsctl.c
    trunk/reactos/drivers/filesystems/fastfat/finfo.c
    trunk/reactos/drivers/filesystems/npfs/dirctl.c
    trunk/reactos/drivers/filesystems/npfs/rw.c

Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -143,7 +143,7 @@
   ULONG RootStart;
   ULONG RootSize;
   WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)];
-  ULONG VolumeLabelLength;
+  USHORT VolumeLabelLength;
   ULONG SerialNumber;
 } CDINFO, *PCDINFO;
 

Modified: trunk/reactos/drivers/filesystems/cdfs/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -40,7 +40,7 @@
                          PUNICODE_STRING RelativeFileName,
                          PUNICODE_STRING AbsoluteFileName)
 {
-    ULONG Length;
+    USHORT Length;
     PFCB Fcb;
     NTSTATUS Status;
 

Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -533,7 +533,7 @@
 
     /* Copy short name */
     ASSERT(Fcb->ShortNameU.Length / sizeof(WCHAR) <= 12);
-    Info->ShortNameLength = Fcb->ShortNameU.Length;
+    Info->ShortNameLength = (CCHAR)Fcb->ShortNameU.Length;
     RtlCopyMemory(Info->ShortName, Fcb->ShortNameU.Buffer,
Fcb->ShortNameU.Length);
 
     return(STATUS_SUCCESS);

Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -153,7 +153,7 @@
     ASSERT(Fcb != NULL);
 
     /* If buffer can't hold at least the file name length, bail out */
-    if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]))
+    if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]))
         return STATUS_BUFFER_OVERFLOW;
 
     /* Calculate file name length in bytes */

Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f…
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -46,7 +46,7 @@
                PCDINFO CdInfo)
 {
     PPVD Pvd;
-    ULONG i;
+    USHORT i;
     PUCHAR pc;
     PWCHAR pw;
 

Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Tue Jul  5 13:55:39
2011
@@ -379,7 +379,7 @@
   ASSERT(FCB != NULL);
 
   /* If buffer can't hold at least the file name length, bail out */
-  if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]))
+  if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]))
     return STATUS_BUFFER_OVERFLOW;
 
   /* Save file name length, and as much file len, as buffer length allows */

Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -21,7 +21,7 @@
                    PULONG Size)
 {
     PIO_STACK_LOCATION Stack;
-    LONG BufferLength = 0;
+    ULONG BufferLength = 0;
     PUNICODE_STRING SearchPattern = NULL;
     FILE_INFORMATION_CLASS FileInformationClass;
     ULONG FileIndex = 0;

Modified: trunk/reactos/drivers/filesystems/npfs/rw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r…
==============================================================================
--- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Tue Jul  5 13:55:39 2011
@@ -21,7 +21,7 @@
     CHAR Line[65];
     UCHAR ch;
     const char Hex[] = "0123456789ABCDEF";
-    int i, j;
+    ULONG i, j;
 
     DbgPrint("---------------\n");