WebSVN – SvarDOS – Diff – /install/trunk/install.c

 /* keyboard layouts and locales */
 #include "keylay.h"
 #include "keyoff.h"
-/* prototype of the int24hdl() function defined in int24hdl.asm */
-void int24hdl(void);
 /* color scheme (preset for color) */
 static unsigned char COLOR_TITLEBAR  = 0x70;
 static unsigned char COLOR_TITLEVER  = 0x78;
 static unsigned char COLOR_BODY      = 0x17;
   unsigned short keybid;
   unsigned short countryid; /* 1=USA, 33=FR, 48=PL, etc */
 };
+/* install a dummy int24h handler that always fails. this is to avoid the
+ * annoying "abort, retry, fail... DOS messages. */
+static void install_int24(void) {
+  static unsigned char handler[] = { /* contains machine code instructions */
+xB0, 0x03,  /* mov al, 3   ; tell DOS the action has to FAIL   */
+xCF};       /* ret         ; return from the interrupt handler */
+  /* install the handler */
+  _asm {
+    push dx
+    mov ax, 0x2524          /* set INT vector 0x24 (to DS:DX)   */
+    mov dx, offset handler  /* DS:DX points at my dummy handler */
+    int 0x21
+    pop dx
+  }
+}
+static void exec(const char *s) {
+  system(s);
+  install_int24(); /* reinstall my int24 handler, apparently system() reverts
+                      the original (DOS) one */
+}
 /* put a string on screen and fill it until w chars with white space */
 static void video_putstringfix(unsigned char y, unsigned char x, unsigned char attr, const char *s, unsigned char w) {
   unsigned char i;
   /* print the string up to w characters */
       list[3] = NULL;
       snprintf(buff, sizeof(buff), svarlang_strid(0x0300), cselecteddrive, SVARDOS_DISK_REQ); /* "ERROR: Drive %c: could not be found. Note, that SvarDOS requires at least %d MiB of available disk space */
       switch (menuselect(6 + putstringwrap(4, 1, COLOR_BODY, buff), 3, list, -1)) {
         case 0:
           sprintf(buff, "FDISK /PRI:MAX %d", driveid);
-          system(buff);
+          exec(buff);
           break;
         case 1:
           mdr_cout_cls(0x07);
           mdr_cout_locate(0, 0);
           sprintf(buff, "FDISK %d", driveid);
-          system(buff);
+          exec(buff);
           break;
         case 2:
           return(MENUQUIT);
         default:
           return(-1);
+      }
       /* write a temporary MBR which only skips the drive (in case BIOS would
        * try to boot off the not-yet-ready C: disk) */
       sprintf(buff, "FDISK /LOADIPL %d", driveid);
-      system(buff); /* writes BOOT.MBR into actual MBR */
+      exec(buff); /* writes BOOT.MBR into actual MBR */
       newscreen(2);
       putstringnls(10, 10, COLOR_BODY, 3, 1); /* "Your computer will reboot now." */
       putstringnls(12, 10, COLOR_BODY, 0, 5); /* "Press any key..." */
       mdr_dos_getkey();
       reboot();
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
       mdr_cout_cls(0x07);
       mdr_cout_locate(0, 0);
       snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
-      system(buff);
+      exec(buff);
       continue;
+    }
     /* check total disk space */
     ds = disksize(selecteddrive);
     if (ds < SVARDOS_DISK_REQ) {
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
       mdr_cout_cls(0x07);
       mdr_cout_locate(0, 0);
       snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
-      system(buff);
+      exec(buff);
       continue;
     } else {
       /* final confirmation */
       const char *list[3];
       list[0] = svarlang_strid(0x0001); /* Install SvarDOS */
       mdr_cout_str(7, 40 - (strlen(buff) / 2), buff, COLOR_BODY, 80);
       choice = menuselect(10, 2, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
       snprintf(buff, sizeof(buff), "SYS %c: %c: > NUL", sourcedrv, cselecteddrive);
-      system(buff);
+      exec(buff);
       sprintf(buff, "FDISK /MBR %d", driveid);
-      system(buff);
+      exec(buff);
       snprintf(buff, sizeof(buff), "%c:\\TEMP", cselecteddrive);
       mkdir(buff);
       return(cselecteddrive);
+    }
+  }
   if (locales->egafile == 1) {
     snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA.CPX) > NUL", locales->codepage);
   } else {
     snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA%d.CPX) > NUL", locales->codepage, locales->egafile);
+  }
-  system(buff);
+  exec(buff);
   snprintf(buff, sizeof(buff), "MODE CON CP SEL=%u > NUL", locales->codepage);
-  system(buff);
+  exec(buff);
   /* below I re-init the video controller - apparently this is required if
    * I want the new glyph symbols to be actually applied, at least some
    * (broken?) BIOSes, like VBox, apply glyphs only at next video mode change */
   _asm {
     push bx
   int sourcedrv;
   int action;
   /* setup an internal int 24h handler ("always fail") so DOS does not output
    * the ugly "abort, retry, fail" messages */
-  int24hdl();
+  install_int24();
   /* read the svardos build revision (from floppy label) */
+  {
     const char *fspec = "*.*";
     const char *res = (void*)0x9E; /* default DTA is at PSP:80h, field 1Eh of DTA is the ASCIZ file name */

Subversion Repositories SvarDOS

(root)/install/trunk/install.c – Rev 1911 → 1918