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
This commit is contained in:
Filip Navara 2005-06-17 17:14:57 +00:00
parent b4a5cd914f
commit 580b785a18
3 changed files with 36 additions and 35 deletions

View file

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

View file

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

View file

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