Fix the export of HalExamineMBR. It mustn't be aliased since we need to have it named correctly in the import library.

svn path=/trunk/; revision=15994

reactos/ntoskrnl/include/internal/xhal.h

@@ -5,11 +5,12 @@ NTSTATUS
 xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName,
 		     OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo);
 
+#undef HalExamineMBR
 VOID FASTCALL
-xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
-	       IN ULONG SectorSize,
-	       IN ULONG MBRTypeIdentifier,
-	       OUT PVOID *Buffer);
+HalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
+	      IN ULONG SectorSize,
+	      IN ULONG MBRTypeIdentifier,
+	      OUT PVOID *Buffer);
 
 VOID FASTCALL
 xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock,

reactos/ntoskrnl/io/disk.c

@@ -65,7 +65,7 @@ HAL_DISPATCH EXPORTED HalDispatchTable =
     (pHalSetSystemInformation) NULL,	// HalSetSystemInformation
     (pHalQueryBusSlots) NULL,			// HalQueryBusSlots
     0,
-    (pHalExamineMBR) xHalExamineMBR,
+    (pHalExamineMBR) HalExamineMBR,
     (pHalIoAssignDriveLetters) xHalIoAssignDriveLetters,
     (pHalIoReadPartitionTable) xHalIoReadPartitionTable,
     (pHalIoSetPartitionInformation) xHalIoSetPartitionInformation,
@@ -302,16 +302,16 @@ xHalpWriteSector (IN PDEVICE_OBJECT DeviceObject,
 
 
 VOID FASTCALL
-xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
-	       IN ULONG SectorSize,
-	       IN ULONG MBRTypeIdentifier,
-	       OUT PVOID *Buffer)
+HalExamineMBR(IN PDEVICE_OBJECT DeviceObject,
+	      IN ULONG SectorSize,
+	      IN ULONG MBRTypeIdentifier,
+	      OUT PVOID *Buffer)
 {
   LARGE_INTEGER SectorOffset;
   PPARTITION_SECTOR Sector;
   NTSTATUS Status;
 
-  DPRINT("xHalExamineMBR()\n");
+  DPRINT("HalExamineMBR()\n");
 
   *Buffer = NULL;
 
@@ -760,10 +760,10 @@ xHalIoReadPartitionTable(PDEVICE_OBJECT DeviceObject,
     SectorSize = 4096;
 
   /* Check for 'Ontrack Disk Manager' */
-  xHalExamineMBR(DeviceObject,
-		 SectorSize,
-		 0x54,
-		 &MbrBuffer);
+  HalExamineMBR(DeviceObject,
+		SectorSize,
+		0x54,
+		&MbrBuffer);
   if (MbrBuffer != NULL)
     {
       DPRINT("Found 'Ontrack Disk Manager'\n");
@@ -772,10 +772,10 @@ xHalIoReadPartitionTable(PDEVICE_OBJECT DeviceObject,
     }
 
   /* Check for 'EZ-Drive' */
-  xHalExamineMBR(DeviceObject,
-		 SectorSize,
-		 0x55,
-		 &MbrBuffer);
+  HalExamineMBR(DeviceObject,
+		SectorSize,
+		0x55,
+		&MbrBuffer);
   if (MbrBuffer != NULL)
     {
       DPRINT("Found 'EZ-Drive'\n");
@@ -1012,10 +1012,10 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
     SectorSize = 4096;
 
   /* Check for 'Ontrack Disk Manager' */
-  xHalExamineMBR (DeviceObject,
-		  SectorSize,
-		  0x54,
-		  (PVOID*)(PVOID)&PartitionSector);
+  HalExamineMBR (DeviceObject,
+		 SectorSize,
+		 0x54,
+		 (PVOID*)(PVOID)&PartitionSector);
   if (PartitionSector != NULL)
     {
       DPRINT ("Found 'Ontrack Disk Manager'\n");
@@ -1024,10 +1024,10 @@ xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject,
     }
 
   /* Check for 'EZ-Drive' */
-  xHalExamineMBR (DeviceObject,
-		  SectorSize,
-		  0x55,
-		  (PVOID*)(PVOID)&PartitionSector);
+  HalExamineMBR (DeviceObject,
+		 SectorSize,
+		 0x55,
+		 (PVOID*)(PVOID)&PartitionSector);
   if (PartitionSector != NULL)
     {
       DPRINT ("Found 'EZ-Drive'\n");
@@ -1224,10 +1224,10 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
     SectorSize = 4096;
 
   /* Check for 'Ontrack Disk Manager' */
-  xHalExamineMBR (DeviceObject,
-		  SectorSize,
-		  0x54,
-		  (PVOID*)(PVOID)&PartitionSector);
+  HalExamineMBR (DeviceObject,
+		 SectorSize,
+		 0x54,
+		 (PVOID*)(PVOID)&PartitionSector);
   if (PartitionSector != NULL)
     {
       DPRINT ("Found 'Ontrack Disk Manager'\n");
@@ -1236,10 +1236,10 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
     }
 
   /* Check for 'EZ-Drive' */
-  xHalExamineMBR (DeviceObject,
-		  SectorSize,
-		  0x55,
-		  (PVOID*)(PVOID)&PartitionSector);
+  HalExamineMBR (DeviceObject,
+		 SectorSize,
+		 0x55,
+		 (PVOID*)(PVOID)&PartitionSector);
   if (PartitionSector != NULL)
     {
       DPRINT ("Found 'EZ-Drive'\n");

reactos/ntoskrnl/ntoskrnl.def

@@ -275,7 +275,7 @@ FsRtlUninitializeMcb@4
 FsRtlUninitializeOplock@4
 HalDispatchTable DATA
 HalPrivateDispatchTable DATA
-@HalExamineMBR=@xHalExamineMBR@16
+@HalExamineMBR@16
 InbvAcquireDisplayOwnership@0
 InbvCheckDisplayOwnership@0
 InbvDisplayString@4