merge from UNSTABLE: inthndlr.c (Lucho): added Int 2Fh/26-29h with Eduardo

for NLSFUNC, bug fixes from Michael Devore (add undoc behavior), and
fix MS Format + Ramdisk bug in INT21/5F07 and 5F08


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1037 6ac86273-5f31-0410-b378-82cca8765d1b

docs/history.txt

@@ -11,6 +11,18 @@
 	* fatfs.c:
           - zero creation/access stamp on directory entry write as MS-DOS 7.10
           - prevent removal or renaming of the current directory of that drive
+	* ioctl.c:
+	  - r_si/r_di contents added as documented in PC-DOS Technical Update
+	* inthndlr.c
+	  - fix: for INT21/5F07 and 5F08, before changing bit CDSPHYSDRV,
+	    MS-DOS checks if physical device associated with drive letter. Without
+	    this check MS-FORMAT under FreeDOS was destroys RAMDISK.
+	  - zero serial number of Int 21h/30h (else buggy 32RTM thrashed stack) [& Bart]
+	  - set AX = ES after Int 21h/4Ah (undocumented but expected by BRUN45)
+	    (the last 2 changes needed to fix bugs discovered by Michael Devore)
+	  - added Int 2Fh/2Fh processing to set DOS version as per MS-DOS 4.0
++ Changes Eduardo
+	* inthndlr.c: added Int 2Fh/26-29h processing for NLSFUNC (with Lucho)
 2004 May 30 - Build 2035
 -------- Bart Oldeman (bart@dosemu.org)
 + Changes Lucho + Tom

hdr/portab.h

@@ -260,6 +260,9 @@ typedef signed long LONG;
 #define LONG long
 #endif
 
+#define MK_UWORD(hib,lob) (((UWORD)(hib) <<  8u) | (UBYTE)(lob))
+#define MK_ULONG(hiw,low) (((ULONG)(hiw) << 16u) | (UWORD)(low))
+
 /* General far pointer macros                                           */
 #ifdef I86
 #ifndef MK_FP

kernel/inthndlr.c

@@ -997,6 +997,7 @@ dispatch:
           panic("after 4a: MCB chain corrupted");
         goto error_exit;
       }
+      lr.AX = lr.ES; /* Undocumented MS-DOS behaviour expected by BRUN45! */
       break;
 
       /* Load and Execute Program */
@@ -1238,17 +1239,19 @@ dispatch:
     case 0x5f:
       if (lr.AL == 7 || lr.AL == 8)
       {
-        struct cds FAR *cdsp;
+        if (lr.DL < lastdrive)
-        if (lr.DL >= lastdrive)
         {
-          rc = DE_INVLDDRV;
+          struct cds FAR *cdsp = CDSp + lr.DL;
-          goto error_exit;
+          if (FP_OFF(cdsp->cdsDpb))	/* letter of physical drive?	*/
-        }
+          {
-        cdsp = &CDSp[lr.DL];
+            cdsp->cdsFlags &= ~CDSPHYSDRV;
             if (lr.AL == 7)
               cdsp->cdsFlags |= CDSPHYSDRV;
-        else
+            break;
-          cdsp->cdsFlags &= ~CDSPHYSDRV;
+          }
+        }
+        rc = DE_INVLDDRV;
+        goto error_exit;
       }
       else
       {
@@ -1263,7 +1266,6 @@ dispatch:
         r->AX = -rc;
         goto real_exit;
       }
-      break;
 
     case 0x60:                 /* TRUENAME */
       rc = DosTruename(MK_FP(lr.DS, lr.SI), adjust_far(FP_ES_DI));
@@ -1654,6 +1656,9 @@ struct int2f12regs {
  */
 VOID ASMCFUNC int2F_12_handler(struct int2f12regs r)
 {
+  COUNT rc;
+  long lrc;
+
   if (r.AH == 0x4a)
   {
     size_t size = 0, offs = 0xffff;
@@ -1867,6 +1872,46 @@ VOID ASMCFUNC int2F_12_handler(struct int2f12regs r)
       r.CX = fstrlen(MK_FP(r.DS, r.SI)) + 1;
       break;
 
+    case 0x26:                 /* open file */
+      r.FLAGS &= ~FLG_CARRY;
+      CritErrCode = SUCCESS;
+      lrc = DosOpen(MK_FP(r.DS, r.DX), O_LEGACY | O_OPEN | r.CL, 0);
+      goto long_check;
+
+    case 0x27:                 /* close file */
+      r.FLAGS &= ~FLG_CARRY;
+      CritErrCode = SUCCESS;
+      rc = DosClose(r.BX);
+      goto short_check;
+
+#if 0
+    case 0x28:                 /* move file pointer */
+      /*
+       * RBIL says: "sets user stack frame pointer to dummy buffer,
+       * moves BP to AX, performs LSEEK, and restores frame pointer"
+       * We obviously don't do it like that. Does this do any harm?! --L.G.
+       */
+      r.FLAGS &= ~FLG_CARRY;
+      CritErrCode = SUCCESS;
+      if (r.BP < 0x4200 || r.BP > 0x4202)
+        goto error_invalid;
+      {
+        sft FAR *s = get_sft(r.BX);
+        if ((rc = _SftSeek(s, MK_ULONG(r.CX, r.DX), r.BP & 0xff)) >= SUCCESS)
+        {
+          r.DX = hiword (s->sft_posit);
+          r.AX = loword (s->sft_posit);
+        }
+      }
+      goto short_check;
+#endif
+
+    case 0x29:                 /* read from file */
+      r.FLAGS &= ~FLG_CARRY;
+      CritErrCode = SUCCESS;
+      lrc = DosRead(r.BX, r.CX, MK_FP(r.DS, r.DX));
+      goto long_check;
+
     case 0x2a:                 /* Set FastOpen but does nothing. */
 
       r.FLAGS &= ~FLG_CARRY;
@@ -1886,6 +1931,19 @@ VOID ASMCFUNC int2F_12_handler(struct int2f12regs r)
                                    doesn't work!! */
       break;
 
+    case 0x2f:
+      if (r.DX)
+      {
+        os_setver_major = r.DL;
+        os_setver_minor = r.DH;
+      }
+      else
+      {
+        os_setver_major = os_major;
+        os_setver_minor = os_minor;
+      }
+      break;
+
     default:
       if (r.AL <= 0x31)
       {
@@ -1895,6 +1953,25 @@ VOID ASMCFUNC int2F_12_handler(struct int2f12regs r)
         r.FLAGS |= FLG_CARRY;
       }
   }
+  return;
+long_check:
+  if (lrc >= SUCCESS)
+  {
+    r.AX = (UWORD)lrc;
+    return;
+  }
+  rc = (int)lrc;
+short_check:
+  if (rc < SUCCESS)
+    goto error_exit;
+  return;
+error_invalid:
+  rc = DE_INVLDFUNC;
+error_exit:
+  r.AX = -rc;
+  if (CritErrCode == SUCCESS)
+    CritErrCode = r.AX;      /* Maybe set */
+  r.FLAGS |= FLG_CARRY;
 }
 
 /*