* Sync up to trunk head (r64921).

[reactos.git] / ntoskrnl / io / iomgr / ramdisk.c

diff --git a/ntoskrnl/io/iomgr/ramdisk.c b/ntoskrnl/io/iomgr/ramdisk.c
index 3ca2d03..658b997 100644 (file)
--- a/ntoskrnl/io/iomgr/ramdisk.c
+++ b/ntoskrnl/io/iomgr/ramdisk.c
@@ -37,7 +37,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     PLIST_ENTRY ListHead, NextEntry;
     OBJECT_ATTRIBUTES ObjectAttributes;
     WCHAR SourceString[54];
-    
+
     //
     // Scan memory descriptors
     //
@@ -52,7 +52,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
         MemoryDescriptor = CONTAINING_RECORD(NextEntry,
                                              MEMORY_ALLOCATION_DESCRIPTOR,
                                              ListEntry);
-        
+
         //
         // Needs to be a ROM/RAM descriptor
         //
@@ -63,7 +63,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
         //
         NextEntry = NextEntry->Flink;
     }
-    
+
     //
     // Nothing found?
     //
@@ -78,7 +78,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                      0,
                      0);
     }
-    
+
     //
     // Setup the input buffer
     //
@@ -91,7 +91,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     RamdiskCreate.DiskGuid = RAMDISK_BOOTDISK_GUID;
     RamdiskCreate.DriveLetter = L'C';
     RamdiskCreate.Options.Fixed = TRUE;
-    
+
     //
     // Check for commandline parameters
     //
@@ -102,7 +102,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
         // Make everything upper case
         //
         _strupr(CommandLine);
-        
+
         //
         // Check for offset parameter
         //
@@ -121,12 +121,12 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                 RamdiskCreate.DiskOffset = atol(OffsetValue + 1);
             }
         }
-        
+
         //
         // Reduce the disk length
         //
         RamdiskCreate.DiskLength.QuadPart -= RamdiskCreate.DiskOffset;
-        
+
         //
         // Check for length parameter
         //
@@ -146,7 +146,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
             }
         }
     }
-    
+
     //
     // Setup object attributes
     //
@@ -156,12 +156,12 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                                OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
                                NULL,
                                NULL);
-    
+
     //
     // Open a handle to the driver
     //
     Status = ZwOpenFile(&DriverHandle,
-                        GENERIC_ALL,
+                        GENERIC_ALL | SYNCHRONIZE,
                         &ObjectAttributes,
                         &IoStatusBlock,
                         FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -177,7 +177,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                      0,
                      0);
     }
-    
+
     //
     // Send create command
     //
@@ -203,7 +203,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                      0,
                      0);
     }
-    
+
     //
     // Convert the GUID
     //
@@ -219,18 +219,18 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                      0,
                      0);
     }
-    
+
     //
     // Build the symbolic link name and target
     //
     _snwprintf(SourceString,
-               sizeof(SourceString),
+               sizeof(SourceString)/sizeof(WCHAR),
                L"\\Device\\Ramdisk%wZ",
                &GuidString);
     SymbolicLinkName.Length = 38;
     SymbolicLinkName.MaximumLength = 38 + sizeof(UNICODE_NULL);
     SymbolicLinkName.Buffer = L"\\ArcName\\ramdisk(0)";
-    
+
     //
     // Create the symbolic link
     //
@@ -248,7 +248,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
                      0,
                      0);
     }
-    
+
     //
     // We made it
     //