Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:56:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
Disable DriveMapMapDrivesInSection on MSVC builds, freeldr works basically without it

svn path=/trunk/; revision=52322
This commit is contained in:
Timo Kreuzer 2011-06-17 20:02:37 +00:00
parent 2f6b794fc4
commit d017f0fe2b
4 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/boot/freeldr/freeldr/arch/i386/drivemap.c
View file

@ -25,6 +25,7 @@ ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler
ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler
ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler
#ifndef _MSC_VER
VOID DriveMapMapDrivesInSection(PCSTR SectionName) VOID DriveMapMapDrivesInSection(PCSTR SectionName)
{ {
CHAR SettingName[80]; CHAR SettingName[80];
@ -141,6 +142,7 @@ BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString)
return TRUE; return TRUE;
} }
#endif
ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName) ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName)
{ {
@ -167,6 +169,7 @@ ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName)
return BiosDriveNumber; return BiosDriveNumber;
} }
#ifndef _MSC_VER
VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap)
{ {
ULONG* RealModeIVT = (ULONG*)0x00000000; ULONG* RealModeIVT = (ULONG*)0x00000000;
@ -220,3 +223,4 @@ VOID DriveMapRemoveInt13Handler(VOID)
DriveMapInstalled = FALSE; DriveMapInstalled = FALSE;
} }
} }
#endif

1
reactos/boot/freeldr/freeldr/arch/i386/drvmap.S
View file

@ -139,4 +139,3 @@ Int13HandlerDriveNew4:
PUBLIC _DriveMapInt13HandlerEnd PUBLIC _DriveMapInt13HandlerEnd
_DriveMapInt13HandlerEnd: _DriveMapInt13HandlerEnd:
.byte 0

12
reactos/boot/freeldr/freeldr/arch/i386/realmode.S
View file

@ -26,16 +26,4 @@ _BootOldLinuxKernel:
PUBLIC _BootNewLinuxKernel PUBLIC _BootNewLinuxKernel
_BootNewLinuxKernel: _BootNewLinuxKernel:
PUBLIC _DriveMapOldInt13HandlerAddress
_DriveMapOldInt13HandlerAddress:
PUBLIC _DriveMapInt13HandlerStart
_DriveMapInt13HandlerStart:
PUBLIC _DriveMapInt13HandlerEnd
_DriveMapInt13HandlerEnd:
PUBLIC _DriveMapInt13HandlerMapList
_DriveMapInt13HandlerMapList:
END END

2
reactos/boot/freeldr/freeldr/bootmgr.c
View file

@ -228,7 +228,7 @@ VOID RunLoader(VOID)
#ifndef _M_ARM #ifndef _M_ARM
// Install the drive mapper according to this sections drive mappings // Install the drive mapper according to this sections drive mappings
#ifdef __i386__ #if defined(__i386__) && !defined(_MSC_VER)
DriveMapMapDrivesInSection(SectionName); DriveMapMapDrivesInSection(SectionName);
#endif #endif
if (_stricmp(BootType, "ReactOS") == 0) if (_stricmp(BootType, "ReactOS") == 0)