[FREELDR] Re-integrate the ASM files (and corresponding C code) in MSVC builds, that...

[reactos.git] / boot / freeldr / freeldr / arch / i386 / drivemap.c

diff --git a/boot/freeldr/freeldr/arch/i386/drivemap.c b/boot/freeldr/freeldr/arch/i386/drivemap.c
index 177e470..c1ea587 100644 (file)
--- a/boot/freeldr/freeldr/arch/i386/drivemap.c
+++ b/boot/freeldr/freeldr/arch/i386/drivemap.c
@@ -20,26 +20,24 @@
 #include <freeldr.h>
 #include <debug.h>
 
-DBG_DEFAULT_CHANNEL(WARNING);
+DBG_DEFAULT_CHANNEL(DISK);
 
 BOOLEAN      DriveMapInstalled = FALSE;    // Tells us if we have already installed our drive map int 13h handler code
 ULONG        OldInt13HandlerAddress = 0;   // Address of BIOS int 13h handler
 ULONG        DriveMapHandlerAddress = 0;   // Linear 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)
 {
-    CHAR            SettingName[80];
-    CHAR            SettingValue[80];
-    CHAR            ErrorText[260];
-    CHAR            Drive1[80];
-    CHAR            Drive2[80];
-    ULONG                SectionId;
-    ULONG                SectionItemCount;
-    ULONG                Index;
-    ULONG                Index2;
-    DRIVE_MAP_LIST    DriveMapList;
+    CHAR           SettingName[80];
+    CHAR           SettingValue[80];
+    CHAR           Drive1[80];
+    CHAR           Drive2[80];
+    ULONG_PTR      SectionId;
+    ULONG          SectionItemCount;
+    ULONG          Index;
+    ULONG          Index2;
+    DRIVE_MAP_LIST DriveMapList;
 
     RtlZeroMemory(&DriveMapList, sizeof(DRIVE_MAP_LIST));
 
@@ -62,8 +60,7 @@ VOID DriveMapMapDrivesInSection(PCSTR SectionName)
                 // Make sure we haven't exceeded the drive map max count
                 if (DriveMapList.DriveMapCount >= 4)
                 {
-                    sprintf(ErrorText, "Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue);
-                    UiMessageBox(ErrorText);
+                    UiMessageBox("Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue);
                     continue;
                 }
 
@@ -88,8 +85,7 @@ VOID DriveMapMapDrivesInSection(PCSTR SectionName)
                 // Make sure we got good values before we add them to the map
                 if (!DriveMapIsValidDriveString(Drive1) || !DriveMapIsValidDriveString(Drive2))
                 {
-                    sprintf(ErrorText, "Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue);
-                    UiMessageBox(ErrorText);
+                    UiMessageBox("Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue);
                     continue;
                 }
 
@@ -117,11 +113,12 @@ VOID DriveMapMapDrivesInSection(PCSTR SectionName)
 
 BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString)
 {
-    ULONG        Index;
+    ULONG Index;
 
     // Now verify that the user has given us appropriate strings
     if ((strlen(DriveString) < 3) ||
-        ((DriveString[0] != 'f') && (DriveString[0] != 'F') && (DriveString[0] != 'h') && (DriveString[0] != 'H')) ||
+        ((DriveString[0] != 'f') && (DriveString[0] != 'F') &&
+         (DriveString[0] != 'h') && (DriveString[0] != 'H')) ||
         ((DriveString[1] != 'd') && (DriveString[1] != 'D')))
     {
         return FALSE;
@@ -129,13 +126,14 @@ BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString)
 
     // Now verify that the user has given us appropriate numbers
     // Make sure that only numeric characters were given
-    for (Index=2; Index<strlen(DriveString); Index++)
+    for (Index = 2; Index < strlen(DriveString); Index++)
     {
         if (DriveString[Index] < '0' || DriveString[Index] > '9')
         {
             return FALSE;
         }
     }
+
     // Now make sure that they are not outrageous values (i.e. hd90874)
     if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff))
     {
@@ -144,17 +142,18 @@ BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString)
 
     return TRUE;
 }
-#endif
 
 UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName)
 {
-    UCHAR        BiosDriveNumber = 0;
+    UCHAR BiosDriveNumber = 0;
+
+    TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName);
 
     // If they passed in a number string then just
     // convert it to decimal and return it
     if (DeviceName[0] >= '0' && DeviceName[0] <= '9')
     {
-        return atoi(DeviceName);
+        return (UCHAR)strtoul(DeviceName, NULL, 0);
     }
 
     // Convert the drive number string into a number
@@ -171,11 +170,10 @@ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName)
     return BiosDriveNumber;
 }
 
-#ifndef _MSC_VER
 VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap)
 {
-    ULONG*    RealModeIVT = (ULONG*)0x00000000;
-    USHORT*    BiosLowMemorySize = (USHORT*)0x00000413;
+    ULONG*  RealModeIVT = (ULONG*)0x00000000;
+    USHORT* BiosLowMemorySize = (USHORT*)0x00000413;
 
     if (!DriveMapInstalled)
     {
@@ -210,8 +208,8 @@ VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap)
 
 VOID DriveMapRemoveInt13Handler(VOID)
 {
-    ULONG*    RealModeIVT = (ULONG*)0x00000000;
-    USHORT*    BiosLowMemorySize = (USHORT*)0x00000413;
+    ULONG*  RealModeIVT = (ULONG*)0x00000000;
+    USHORT* BiosLowMemorySize = (USHORT*)0x00000413;
 
     if (DriveMapInstalled)
     {
@@ -225,4 +223,3 @@ VOID DriveMapRemoveInt13Handler(VOID)
         DriveMapInstalled = FALSE;
     }
 }
-#endif