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

Modified: trunk/reactos/ntoskrnl/include/internal/xhal.h
Modified: trunk/reactos/ntoskrnl/io/disk.c
Modified: trunk/reactos/ntoskrnl/ntoskrnl.def

--- trunk/reactos/ntoskrnl/include/internal/xhal.h	2005-06-17 17:12:17 UTC (rev 15993)
+++ trunk/reactos/ntoskrnl/include/internal/xhal.h	2005-06-17 17:14:57 UTC (rev 15994)
@@ -5,11 +5,12 @@

 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,

--- trunk/reactos/ntoskrnl/io/disk.c	2005-06-17 17:12:17 UTC (rev 15993)
+++ trunk/reactos/ntoskrnl/io/disk.c	2005-06-17 17:14:57 UTC (rev 15994)
@@ -65,7 +65,7 @@

     (pHalSetSystemInformation) NULL,	// HalSetSystemInformation
     (pHalQueryBusSlots) NULL,			// HalQueryBusSlots
     0,

-    (pHalExamineMBR) xHalExamineMBR,

+    (pHalExamineMBR) HalExamineMBR,

     (pHalIoAssignDriveLetters) xHalIoAssignDriveLetters,
     (pHalIoReadPartitionTable) xHalIoReadPartitionTable,
     (pHalIoSetPartitionInformation) xHalIoSetPartitionInformation,
@@ -302,16 +302,16 @@

 
 
 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 @@

     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 @@

     }
 
   /* 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 @@

     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 @@

     }
 
   /* 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 @@

     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 @@

     }
 
   /* 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");

--- trunk/reactos/ntoskrnl/ntoskrnl.def	2005-06-17 17:12:17 UTC (rev 15993)
+++ trunk/reactos/ntoskrnl/ntoskrnl.def	2005-06-17 17:14:57 UTC (rev 15994)
@@ -275,7 +275,7 @@

 FsRtlUninitializeOplock@4
 HalDispatchTable DATA
 HalPrivateDispatchTable DATA

-@HalExamineMBR=@xHalExamineMBR@16

+@HalExamineMBR@16

 InbvAcquireDisplayOwnership@0
 InbvCheckDisplayOwnership@0
 InbvDisplayString@4