]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_pm.c
xcrollbroke
[16.git] / src / lib / 16_pm.c
index ea11ac488cca2b2dbc659ed4470f883268dd0763..55a7d3710e96933296e417961cfa348c72b30aac 100755 (executable)
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\r
 \r
-/*\r
 //     Main Mem specific variables\r
-       boolean                 MainPresent;\r
-       memptr                  MainMemPages[PMMaxMainMem];\r
+       //boolean                       MainPresent;\r
+/*     memptr                  MainMemPages[PMMaxMainMem];\r
        PMBlockAttr             gvar->pm.mm.MainMemUsed[PMMaxMainMem];\r
-       int                             gvar->pm.mm.MainPagesAvail;\r
+       int                             gvar->pm.mm.MainPagesAvail;*/\r
 \r
 //     EMS specific variables\r
-       boolean                 gvar->pm.emm.EMSPresent;\r
-       word                    gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle,\r
+       //boolean                       EMSPresent;\r
+/*     word                    gvar->pm.emm.EMSAvail,gvar->pm.emm.EMSPagesAvail,gvar->pm.emm.EMSHandle,\r
                                        gvar->pm.emm.EMSPageFrame,gvar->pm.emm.EMSPhysicalPage;\r
-       gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];\r
+       gvar->pm.emm.EMSListStruct      gvar->pm.emm.EMSList[EMSFrameCount];*/\r
 \r
 //     XMS specific variables\r
-       boolean                 gvar->pm.xmm.XMSPresent;\r
-       word                    gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
-       dword           XMSDriver;\r
-       int                             gvar->pm.xmm.XMSProtectPage = -1;\r
+       //boolean                       XMSPresent;\r
+       //word                  gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
+       dword                   XMSDriver;      //hard to put in gvar\r
+       word                            XMSVer; //hard to put in gvar\r
+/*     int                             gvar->pm.xmm.XMSProtectPage = -1;\r
 \r
 //     File specific variables\r
        char                    gvar->pm.fi.PageFileName[13] = {"VSWAP."};\r
        int                             PageFile = -1;\r
        word                    gvar->pm.fi.ChunksInFile;\r
-       word                    PMSpriteStart,PMSoundStart;\r
+       word                    PMSpriteStart,PMSoundStart;*/\r
 \r
 //     General usage variables\r
-       boolean                 PMStarted,\r
+/*     boolean                 PMStarted,\r
                                        gvar->pm.PMPanicMode,\r
                                        gvar->pm.PMThrashing;\r
        word                    gvar->pm.XMSPagesUsed,\r
                                        gvar->pm.PMNumBlocks;\r
        long                    PMFrameCount;\r
        PageListStruct  far *gvar->pm.PMPages,\r
-                                       _seg *gvar->pm.PMSegPages;\r
-*/\r
+                                       _seg *gvar->pm.PMSegPages;*/\r
+\r
+static union REGS CPURegs;\r
+\r
+#define _AX CPURegs.x.ax\r
+#define _BX CPURegs.x.bx\r
+#define _CX CPURegs.x.cx\r
+#define _DX CPURegs.x.dx\r
+\r
+#define _SI CPURegs.x.si\r
+\r
+#define _AH CPURegs.h.ah\r
+#define _AL CPURegs.h.al\r
+#define _BH CPURegs.h.bh\r
+#define _BL CPURegs.h.bl\r
+#define _CH CPURegs.h.ch\r
+#define _CL CPURegs.h.cl\r
+#define _DH CPURegs.h.dh\r
+#define _DL CPURegs.h.dl\r
+\r
+#ifdef __WATCOMC__\r
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);\r
+#endif\r
+\r
 static char            *ParmStrings[] = {"nomain","noems","noxms",nil};\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -80,11 +102,11 @@ static     char            *ParmStrings[] = {"nomain","noems","noxms",nil};
 byte\r
 PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)\r
 {\r
-       byte    str[160];\r
+       byte    err=0, str[160];\r
        unsigned        EMShandle;\r
-       byte err;\r
+       //int   i;\r
+\r
        boolean errorflag=false;\r
-       int     i;\r
        EMShandle=gvar->pm.emm.EMSHandle;\r
 \r
        __asm {\r
@@ -94,12 +116,12 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
                mov     dx,EMShandle\r
                int     EMS_INT\r
                or      ah,ah\r
-               jnz     error\r
-               jmp End\r
+               jnz     errorme\r
+               jmp     Endme\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-               error:\r
+               errorme:\r
 #ifdef __BORLANDC__\r
        __asm {\r
 #endif\r
@@ -108,7 +130,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
-               End:\r
+               Endme:\r
 #ifdef __WATCOMC__\r
        }\r
 #endif\r
@@ -117,7 +139,7 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
                strcpy(str,"MM_MapEMS: EMS error ");\r
                MM_EMSerr(str, err);\r
                printf("%s\n",str);\r
-               Quit("PML_MapEMS: Page mapping failed\n");\r
+               Quit ("PML_MapEMS: Page mapping failed\n");\r
                return err;\r
        }\r
        return 0;\r
@@ -131,111 +153,134 @@ PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)
 //             If there's more than our minimum (2 pages) available, allocate it (up\r
 //                     to the maximum we need)\r
 //\r
-\r
-       char    EMMDriverName[9] = "EMMXXXX0";\r
+//     Please call MML_CheckForEMS() before calling this function.\r
+//     MML_CheckForEMS is not local despite the name wwww.\r
+//\r
 \r
 boolean\r
 PML_StartupEMS(global_game_variables_t *gvar)\r
 {\r
        int             i;\r
+#ifdef __PM__NOHOGEMS__\r
        long    size;\r
-       boolean errorflag;\r
+#endif\r
+       byte    err=0, str[64];\r
 \r
+       boolean errorflag=false;\r
+       unsigned        EMSVer;\r
+       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
+       totalEMSpages = freeEMSpages = EMSPageFrame = EMSHandle = EMSAvail = EMSVer = 0;        // set all to 0~\r
        gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
-       gvar->pm.emm.EMSAvail = 0;\r
-       errorflag=0;\r
+       gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0;\r
 \r
-       _DX = (word)EMMDriverName;\r
-       _AX = 0x3d00;\r
-       geninterrupt(0x21);                     // try to open EMMXXXX0 device\r
        __asm {\r
-               jnc     gothandle\r
-               mov     errorflag,1\r
-               gothandle:\r
-       }\r
-       if(errorflag)\r
-               goto error;\r
+               //MML_CheckForEMS() takes care of what the code did here\r
+               mov     ah,EMS_STATUS\r
+               int     EMS_INT\r
+               jc      error1                  // make sure EMS hardware is present\r
 \r
-//gothandle:\r
-       _BX = _AX;\r
-       _AX = 0x4400;\r
-       geninterrupt(0x21);                     // get device info\r
-       __asm {\r
-               jnc     gotinfo\r
-               mov     errorflag,1\r
-               gotinfo:\r
-       }\r
-       if(errorflag)\r
-               goto error;\r
+               mov     ah,EMS_VERSION\r
+               int     EMS_INT                 // only work on EMS 3.2 or greater (silly, but...)\r
+               or      ah,ah\r
+               jnz     error1\r
+               mov     [EMSVer],ax             // set EMSVer\r
+               cmp     al,0x32                 // only work on ems 3.2 or greater\r
+               jb      error1\r
 \r
-//gotinfo:\r
-__asm  and     dx,0x80\r
-       if (!_DX)\r
-               goto error;\r
+               mov     ah,EMS_GETFRAME\r
+               int     EMS_INT                 // find the page frame address\r
+               or      ah,ah\r
+               jnz     error1\r
+               mov     [EMSPageFrame],bx\r
 \r
-       _AX = 0x4407;\r
-       geninterrupt(0x21);                     // get status\r
+               mov     ah,EMS_GETPAGES\r
+               int     EMS_INT                 // find out how much EMS is there\r
+               or      ah,ah\r
+               jnz     error1\r
+               or      bx,bx\r
+               jz      noEMS                   // no EMS at all to allocate\r
+               cmp     bx,2\r
+               jl      noEMS                   // Require at least 2 pages (32k)\r
+               mov     [totalEMSpages],dx\r
+               mov     [freeEMSpages],bx\r
+               mov     [EMSAvail],bx\r
+               jmp     End1\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+       error1:\r
+#ifdef __BORLANDC__\r
        __asm {\r
-               jc      error\r
-               jmp     end\r
-               error:\r
+#endif\r
+               mov     err,ah\r
                mov     errorflag,1\r
-               end:\r
+               jmp     End1\r
+#ifdef __BORLANDC__\r
        }\r
-       if (!_AL)\r
-               goto error;\r
-\r
-       _AH = 0x3e;\r
-       geninterrupt(0x21);                     // close handle\r
-\r
-       _AH = EMS_STATUS;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;                             // make sure EMS hardware is present\r
-\r
-       _AH = EMS_VERSION;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH || (_AL < 0x32))        // only work on EMS 3.2 or greater (silly, but...)\r
-               goto error;\r
-\r
-       _AH = EMS_GETFRAME;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;                             // find the page frame address\r
-       gvar->pm.emm.EMSPageFrame = _BX;\r
-\r
-       _AH = EMS_GETPAGES;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;\r
-       if (_BX < 2)\r
-               goto error;             // Require at least 2 pages (32k)\r
-       gvar->pm.emm.EMSAvail = _BX;\r
-\r
-       // Don't hog all available EMS\r
-       size = gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
-       if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize))\r
+#endif\r
+noEMS:\r
+End1:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
+#ifdef __PM__NOHOGEMS__\r
+       if(errorflag==false)\r
        {\r
-               size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize;\r
-               gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
+               // Don't hog all available EMS\r
+               size = gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
+               if (size - (EMSPageSize * 2) > (gvar->pm.fi.ChunksInFile * (long)PMPageSize))\r
+               {\r
+                       size = (gvar->pm.fi.ChunksInFile * (long)PMPageSize) + EMSPageSize;\r
+                       gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
+               }\r
        }\r
-\r
-       _AH = EMS_ALLOCPAGES;\r
-       _BX = gvar->pm.emm.EMSAvail;\r
-       geninterrupt(EMS_INT);\r
-       if (_AH)\r
-               goto error;\r
-       gvar->pm.emm.EMSHandle = _DX;\r
-\r
-       gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
+#endif\r
+       __asm {\r
+               mov     ah,EMS_ALLOCPAGES\r
+               mov     bx,[EMSAvail];\r
+               int     EMS_INT\r
+               or      ah,ah\r
+               jnz     error2\r
+               mov     [EMSHandle],dx\r
+               jmp     End2\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+       error2:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,ah\r
+               mov     errorflag,1\r
+               jmp     End2\r
+#ifdef __BORLANDC__\r
+       }//end of assembly\r
+#endif\r
+End2:\r
+#ifdef __WATCOMC__\r
+       }//end of assembly\r
+#endif\r
+       if(errorflag==true)\r
+       {\r
+               strcpy(str,"PML_StartupEMS: EMS error ");\r
+               MM_EMSerr(str, err);\r
+               printf("%s\n",str);\r
+               return(gvar->pm.emm.EMSPresent);\r
+       }\r
+       gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;\r
 \r
        // Initialize EMS mapping cache\r
        for (i = 0;i < EMSFrameCount;i++)\r
                gvar->pm.emm.EMSList[i].baseEMSPage = -1;\r
 \r
        gvar->pm.emm.EMSPresent = true;                 // We have EMS\r
+       gvar->pm.emm.EMSPageFrame = EMSPageFrame;\r
+       gvar->pm.emm.EMSAvail = EMSAvail;\r
+       gvar->pm.emm.EMSVer = EMSVer;\r
+       gvar->pm.emm.EMSHandle = EMSHandle;\r
+       gvar->pm.emm.freeEMSpages = freeEMSpages;\r
+       gvar->pm.emm.totalEMSpages = totalEMSpages;\r
 \r
-error:\r
        return(gvar->pm.emm.EMSPresent);\r
 }\r
 \r
@@ -246,6 +291,9 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)\r
 {\r
        word EMSHandle;\r
+       byte err=0, str[64];\r
+\r
+       boolean errorflag=false;\r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
 \r
        if (gvar->pm.emm.EMSPresent)\r
@@ -254,10 +302,31 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
                        mov     ah,EMS_FREEPAGES\r
                        mov     dx,[EMSHandle]\r
                        int     EMS_INT\r
+                       jc      errores\r
+                       jmp     Endes\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       errores:\r
+#ifdef __BORLANDC__\r
+               __asm {\r
+#endif\r
+                       mov     err,ah\r
+                       mov     errorflag,1\r
+                       jmp     Endes\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       Endes:\r
+#ifdef __WATCOMC__\r
                }\r
-               if (_AH)\r
+#endif\r
+               if(errorflag==true)\r
                {\r
-                       Quit("PML_ShutdownEMS: Error freeing EMS\n");\r
+                       strcpy(str,"PML_ShutdownEMS: Error freeing EMS ");\r
+                       MM_EMSerr(str, err);\r
+                       printf("%s\n",str);\r
+                       Quit ("PML_ShutdownEMS: Error freeing EMS\n");\r
                        //return;\r
                }\r
        }\r
@@ -278,46 +347,143 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
+//TODO: translate the _REG into working assembly\r
+//#define STARTUPXMSASM\r
+       byte err;\r
+       word XMSAvail, XMSHandle;//, XMSVer;\r
+       boolean errorflag=false;\r
+       word e=0;\r
        gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
-       gvar->pm.xmm.XMSAvail = 0;\r
-\r
-       _AX=0x4300;\r
-       geninterrupt(XMS_INT);                                  // Check for presence of XMS driver\r
-       if (_AL != 0x80)\r
-               goto error;\r
-\r
+       XMSAvail = gvar->mmi.XMSmem = 0;\r
 \r
        __asm {\r
+               mov     ax,0x4300\r
+               int     XMS_INT                                         // Check for presence of XMS driver\r
+               cmp     al,0x80\r
+               jne     error1\r
+               mov     e,1\r
+\r
                mov     ax,0x4310\r
                int     XMS_INT                                                 // Get address of XMS driver\r
                mov     [WORD PTR XMSDriver],bx\r
                mov     [WORD PTR XMSDriver+2],es               // function pointer to XMS driver\r
-       }\r
 \r
-       XMS_CALL(XMS_QUERYFREE, gvar);                  // Find out how much XMS is available\r
-       gvar->pm.xmm.XMSAvail = _AX;\r
+               mov     ah,XMS_VERSION\r
+               call    [DWORD PTR XMSDriver]                                           //; Get XMS Version Number\r
+               mov     [XMSVer],ax\r
+               mov     e,2\r
+\r
+#ifdef STARTUPXMSASM\r
+               mov     ah,XMS_QUERYFREE                        // Find out how much XMS is available\r
+               call    [DWORD PTR XMSDriver]\r
+               mov     XMSAvail,ax\r
+               or      ax,ax                           // AJR: bugfix 10/8/92\r
+               jz      error1\r
+               mov     e,3\r
+#endif\r
+               jmp     End1\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+       error1:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,bl\r
+               mov     errorflag,1\r
+               jmp End1\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+End1:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
+       if(errorflag==true) goto error;\r
+#ifndef STARTUPXMSASM\r
+       XMS_CALL(XMS_QUERYFREE);                        // Find out how much XMS is available\r
+       XMSAvail = _AX;\r
        if (!_AX)                               // AJR: bugfix 10/8/92\r
+       {\r
+               errorflag = true;\r
+               err = _BL;\r
                goto error;\r
+       }\r
+       e++;\r
+#endif\r
 \r
-       gvar->pm.xmm.XMSAvail &= ~(PMPageSizeKB - 1);   // Round off to nearest page size\r
-       if (gvar->pm.xmm.XMSAvail < (PMPageSizeKB * 2)) // Need at least 2 pages\r
+#ifdef __DEBUG_PM__\r
+       printf("XMSVer=%02X     ", XMSVer);\r
+       printf("XMSAvail=%u\n", XMSAvail);\r
+       getch();\r
+#endif\r
+       XMSAvail &= ~(PMPageSizeKB - 1);        // Round off to nearest page size\r
+       if (XMSAvail < (PMPageSizeKB * 2))      // Need at least 2 pages\r
+       {\r
+               errorflag=true;\r
                goto error;\r
-\r
-       _DX = gvar->pm.xmm.XMSAvail;\r
-       XMS_CALL(XMS_ALLOC, gvar);                              // And do the allocation\r
-       gvar->pm.xmm.XMSHandle = _DX;\r
-\r
+       }\r
+#ifdef STARTUPXMSASM\r
+       __asm {\r
+               mov     dx,XMSAvail\r
+               mov     ah,XMS_ALLOC                            // And do the allocation\r
+               call    [DWORD PTR XMSDriver]\r
+               mov     XMSHandle,dx\r
+               or      ax,ax                           // AJR: bugfix 10/8/92\r
+               jz      error2\r
+               mov     e,4\r
+               jmp     End2\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+       error2:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
+               mov     err,bl\r
+               mov     errorflag,1\r
+               jmp End2\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
+End2:\r
+#ifdef __WATCOMC__\r
+       }\r
+#endif\r
+#else\r
+       _DX = XMSAvail;\r
+       XMS_CALL(XMS_ALLOC);                            // And do the allocation\r
+       XMSHandle = _DX;\r
        if (!_AX)                               // AJR: bugfix 10/8/92\r
        {\r
-               gvar->pm.xmm.XMSAvail = 0;\r
+               errorflag=true;\r
+               err = _BL;\r
                goto error;\r
        }\r
-\r
-       gvar->mmi.XMSmem += gvar->pm.xmm.XMSAvail * 1024;\r
-\r
-       gvar->pm.xmm.XMSPresent = true;\r
+       e++;\r
+#endif\r
 error:\r
+       if(errorflag==false)\r
+       {\r
+               gvar->mmi.XMSmem = (dword)(XMSAvail) * 1024;\r
+               gvar->pm.xmm.XMSAvail = XMSAvail;\r
+               gvar->pm.xmm.XMSHandle = XMSHandle;\r
+               //gvar->pm.xmm.XMSVer = XMSVer;\r
+               gvar->pm.xmm.XMSPresent = true;\r
+#ifdef __DEBUG_PM__\r
+               printf("        XMSmem=%lu      XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);\r
+#endif\r
+       }\r
+       else\r
+       {\r
+#ifdef __DEBUG_PM__\r
+               //printf("XMSHandle\n");\r
+               //printf("      1=%u    2=%u    3=%u    4=%u\n", XMSHandle1, XMSHandle2, XMSHandle3, XMSHandle4);\r
+               //printf("      2=%u    ", XMSHandle);\r
+               //printf("      %u", gvar->pm.xmm.XMSHandle);\r
+               printf("        err=%02X        e=%u\n", err, e);\r
+#endif\r
+       }\r
        return(gvar->pm.xmm.XMSPresent);\r
 }\r
 \r
@@ -328,7 +494,6 @@ error:
 void\r
 PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
        dword   xoffset;\r
        struct\r
        {\r
@@ -341,8 +506,7 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
 \r
        if (!addr)\r
        {\r
-               Quit("PML_XMSCopy: zero address\n");\r
-               //return;\r
+               Quit ("PML_XMSCopy: zero address\n");\r
        }\r
 \r
        xoffset = (dword)xmspage * PMPageSize;\r
@@ -357,13 +521,13 @@ PML_XMSCopy(boolean toxms,byte far *addr,word xmspage,word length, global_game_v
                push si\r
        }\r
        _SI = (word)&copy;\r
-       XMS_CALL(XMS_MOVE, gvar);\r
+       XMS_CALL(XMS_MOVE);\r
        __asm {\r
                pop     si\r
        }\r
        if (!_AX)\r
        {\r
-               Quit("PML_XMSCopy: Error on copy");\r
+               Quit ("PML_XMSCopy: Error on copy");\r
                //return;\r
        }\r
 }\r
@@ -399,14 +563,38 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void\r
 PML_ShutdownXMS(global_game_variables_t *gvar)\r
 {\r
-       XMSD;\r
+       boolean errorflag=false;\r
+       word XMSHandle = gvar->pm.xmm.XMSHandle;\r
        if (gvar->pm.xmm.XMSPresent)\r
        {\r
-               _DX = gvar->pm.xmm.XMSHandle;\r
-               XMS_CALL(XMS_FREE, gvar);\r
-               if (_BL)\r
+               __asm {\r
+                       mov     dx,[XMSHandle]\r
+                       //XMS_CALL(XMS_FREE);\r
+                       mov     ah,XMS_FREE\r
+                       call    [DWORD PTR XMSDriver]\r
+                       or      bl,bl\r
+                       jz      errorxs\r
+                       jmp     Endxs\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       errorxs:\r
+#ifdef __BORLANDC__\r
+               __asm {\r
+#endif\r
+                       //mov   err,ah\r
+                       mov     errorflag,1\r
+                       jmp     Endxs\r
+#ifdef __BORLANDC__\r
+               }\r
+#endif\r
+                       Endxs:\r
+#ifdef __WATCOMC__\r
+               }\r
+#endif\r
+               if(errorflag==true)\r
                {\r
-                       Quit("PML_ShutdownXMS: Error freeing XMS");\r
+                       Quit ("PML_ShutdownXMS: Error freeing XMS");\r
                        //return;\r
                }\r
        }\r
@@ -428,15 +616,22 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
+       if(gvar->pm.mm.MainPresent)\r
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\r
+#ifdef __DEBUG_PM_MAIN__\r
                printf("PM_SetMainMemPurge()    info of gvar->pm.mm.MainMemPages[i]\n");\r
-               printf("        %Fp,    %Fp\n", gvar->pm.mm.MainMemPages[i],            (gvar->pm.mm.MainMemPages[i]));\r
                printf("&       %Fp,    %Fp\n", &gvar->pm.mm.MainMemPages[i],   &(gvar->pm.mm.MainMemPages[i]));\r
+#endif\r
 #endif\r
                if (gvar->pm.mm.MainMemPages[i])\r
-                       MM_SetPurge((gvar->pm.mm.MainMemPages[i]),level, gvar);\r
+                       MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
+       }\r
+\r
+       else\r
+       {\r
+               Quit ("MainPresent IS NULL\n");\r
        }\r
 }\r
 \r
@@ -525,10 +720,11 @@ PM_CheckMainMem(global_game_variables_t *gvar)
 void\r
 PML_StartupMainMem(global_game_variables_t *gvar)\r
 {\r
-       int             i,n;\r
+       int             i;//,n;\r
        memptr  *p;\r
 \r
        gvar->pm.mm.MainPagesAvail = 0;\r
+       gvar->pm.mm.MainPresent = false;\r
        MM_BombOnError(false, gvar);\r
        for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
        {\r
@@ -544,7 +740,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                gvar->mm.mmerror = false;\r
        if (gvar->pm.mm.MainPagesAvail < PMMinMainMem)\r
        {\r
-               Quit("PM_SetupMainMem: Not enough main memory");\r
+               Quit ("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
        gvar->pm.mm.MainPresent = true;\r
@@ -580,22 +776,22 @@ PML_ReadFromFile(byte far *buf,long offset,word length, global_game_variables_t
 {\r
        if (!buf)\r
        {\r
-               Quit("PML_ReadFromFile: Null pointer");\r
+               Quit ("PML_ReadFromFile: Null pointer");\r
                //return;\r
        }\r
        if (!offset)\r
        {\r
-               Quit("PML_ReadFromFile: Zero offset");\r
+               Quit ("PML_ReadFromFile: Zero offset");\r
                //return;\r
        }\r
        if (lseek(gvar->pm.fi.PageFile,offset,SEEK_SET) != offset)\r
        {\r
-               Quit("PML_ReadFromFile: Seek failed");\r
+               Quit ("PML_ReadFromFile: Seek failed");\r
                //return;\r
        }\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,buf,length, gvar))\r
        {\r
-               Quit("PML_ReadFromFile: Read failed");\r
+               Quit ("PML_ReadFromFile: Read failed");\r
                //return;\r
        }\r
 }\r
@@ -608,8 +804,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 {\r
        int                             i;\r
        long                    size;\r
-                               //__SEGA buf;\r
-       memptr          buf;\r
+       void                    _seg *buf;\r
        dword           far *offsetptr;\r
        word                    far *lengthptr;\r
        PageListStruct  far *page;\r
@@ -617,7 +812,7 @@ PML_OpenPageFile(global_game_variables_t *gvar)
        gvar->pm.fi.PageFile = open(gvar->pm.fi.PageFileName,O_RDONLY + O_BINARY);\r
        if (gvar->pm.fi.PageFile == -1)\r
        {\r
-               Quit("PML_OpenPageFile: Unable to open page file");\r
+               Quit ("PML_OpenPageFile: Unable to open page file");\r
                //return;\r
        }\r
 \r
@@ -628,36 +823,36 @@ PML_OpenPageFile(global_game_variables_t *gvar)
 \r
        // Allocate and clear the page list\r
        gvar->pm.PMNumBlocks = gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr((memptr *)gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
-       MM_SetLock((memptr *)gvar->pm.PMSegPages,true, gvar);\r
+       MM_GetPtr((memptr *)&gvar->pm.PMSegPages, sizeof(PageListStruct) * (gvar->pm.PMNumBlocks), gvar);\r
+       MM_SetLock((memptr *)&gvar->pm.PMSegPages,true, gvar);\r
        gvar->pm.PMPages = (PageListStruct far *)gvar->pm.PMSegPages;\r
        _fmemset(gvar->pm.PMPages,0,sizeof(PageListStruct) * gvar->pm.PMNumBlocks);\r
 \r
        // Read in the chunk offsets\r
        size = sizeof(dword) * gvar->pm.fi.ChunksInFile;\r
-       MM_GetPtr(&buf, size, gvar);\r
+       MM_GetPtr((memptr *)&buf, size, gvar);\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
-               Quit("PML_OpenPageFile: Offset read failed");\r
+               Quit ("PML_OpenPageFile: Offset read failed");\r
                //return;\r
        }\r
        offsetptr = (dword far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->offset = *offsetptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 \r
        // Read in the chunk lengths\r
        size = sizeof(word) * gvar->pm.fi.ChunksInFile;\r
        MM_GetPtr(&buf,size, gvar);\r
        if (!CA_FarRead(gvar->pm.fi.PageFile,(byte far *)buf,size, gvar))\r
        {\r
-               Quit("PML_OpenPageFile: Length read failed");\r
+               Quit ("PML_OpenPageFile: Length read failed");\r
                //return;\r
        }\r
        lengthptr = (word far *)buf;\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
                page->length = *lengthptr++;\r
-       MM_FreePtr(&buf, gvar);\r
+       MM_FreePtr((memptr *)&buf, gvar);\r
 }\r
 \r
 //\r
@@ -670,8 +865,8 @@ PML_ClosePageFile(global_game_variables_t *gvar)
                close(gvar->pm.fi.PageFile);\r
        if (gvar->pm.PMSegPages)\r
        {\r
-               MM_SetLock((memptr)gvar->pm.PMSegPages,false, gvar);\r
-               MM_FreePtr((memptr)gvar->pm.PMSegPages, gvar);\r
+               MM_SetLock((memptr *)&gvar->pm.PMSegPages,false, gvar);\r
+               MM_FreePtr((void _seg *)&gvar->pm.PMSegPages, gvar);\r
        }\r
 }\r
 \r
@@ -728,7 +923,7 @@ PML_GetEMSAddress(int page,PMLockType lock, global_game_variables_t *gvar)
        }\r
 \r
        if (emspage == -1)\r
-               Quit("PML_GetEMSAddress: EMS find failed");\r
+               Quit ("PML_GetEMSAddress: EMS find failed");\r
 \r
        gvar->pm.emm.EMSList[emspage].lastHit = gvar->pm.PMFrameCount;\r
        offset = emspage * EMSPageSizeSeg;\r
@@ -797,14 +992,14 @@ PML_GiveLRUPage(boolean mainonly, global_game_variables_t *gvar)
        }\r
 \r
        if (lru == -1)\r
-               Quit("PML_GiveLRUPage: LRU Search failed");\r
+               Quit ("PML_GiveLRUPage: LRU Search failed");\r
        return(lru);\r
 }\r
 \r
 //\r
 //     PML_GiveLRUXMSPage() - Returns the page # of the least recently used\r
 //             (and present) XMS page.\r
-//     This routine won't return the XMS page protected (by gvar->pm.xmm.XMSProtectPage)\r
+//     This routine won't return the XMS page protected (by XMSProtectPage)\r
 //\r
 int\r
 PML_GiveLRUXMSPage(global_game_variables_t *gvar)\r
@@ -852,7 +1047,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        {\r
                usexms = PML_GiveLRUXMSPage(gvar);\r
                if (usexms == -1)\r
-                       Quit("PML_PutPageInXMS: No XMS LRU");\r
+                       Quit ("PML_PutPageInXMS: No XMS LRU");\r
                page->xmsPage = gvar->pm.PMPages[usexms].xmsPage;\r
                gvar->pm.PMPages[usexms].xmsPage = -1;\r
        }\r
@@ -870,16 +1065,16 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
        PageListStruct  far *origpage,far *newpage;\r
 \r
        if (orig == new)\r
-               Quit("PML_TransferPageSpace: Identity replacement");\r
+               Quit ("PML_TransferPageSpace: Identity replacement");\r
 \r
        origpage = &gvar->pm.PMPages[orig];\r
        newpage = &gvar->pm.PMPages[new];\r
 \r
        if (origpage->locked != pml_Unlocked)\r
-               Quit("PML_TransferPageSpace: Killing locked page");\r
+               Quit ("PML_TransferPageSpace: Killing locked page");\r
 \r
        if ((origpage->emsPage == -1) && (origpage->mainPage == -1))\r
-               Quit("PML_TransferPageSpace: Reusing non-existent page");\r
+               Quit ("PML_TransferPageSpace: Reusing non-existent page");\r
 \r
        // Copy page that's about to be purged into XMS\r
        PML_PutPageInXMS(orig, gvar);\r
@@ -895,7 +1090,7 @@ PML_TransferPageSpace(int orig,int new, global_game_variables_t *gvar)
        origpage->mainPage = origpage->emsPage = -1;\r
 \r
        if (!addr)\r
-               Quit("PML_TransferPageSpace: Zero replacement");\r
+               Quit ("PML_TransferPageSpace: Zero replacement");\r
 \r
        return(addr);\r
 }\r
@@ -936,10 +1131,10 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                        }\r
                }\r
                if (n == -1)\r
-                       Quit("PML_GetPageBuffer: MainPagesAvail lied");\r
+                       Quit ("PML_GetPageBuffer: MainPagesAvail lied");\r
                addr = gvar->pm.mm.MainMemPages[n];\r
                if (!addr)\r
-                       Quit("PML_GetPageBuffer: Purged main block");\r
+                       Quit ("PML_GetPageBuffer: Purged main block");\r
                page->mainPage = n;\r
                gvar->pm.MainPagesUsed++;\r
        }\r
@@ -947,7 +1142,7 @@ PML_GetAPageBuffer(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                addr = PML_TransferPageSpace(PML_GiveLRUPage(mainonly, gvar),pagenum, gvar);\r
 \r
        if (!addr)\r
-               Quit("PML_GetPageBuffer: Search failed");\r
+               Quit ("PML_GetPageBuffer: Search failed");\r
        return(addr);\r
 }\r
 \r
@@ -973,7 +1168,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
                if (FP_OFF(checkaddr))\r
-                       Quit("PML_GetPageFromXMS: Non segment pointer");\r
+                       Quit ("PML_GetPageFromXMS: Non segment pointer");\r
                addr = (memptr)FP_SEG(checkaddr);\r
                PML_CopyFromXMS(addr,page->xmsPage,page->length, gvar);\r
                gvar->pm.xmm.XMSProtectPage = -1;\r
@@ -1011,9 +1206,9 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
        memptr  result;\r
 \r
        if (pagenum >= gvar->pm.fi.ChunksInFile)\r
-               Quit("PM_GetPage: Invalid page request");\r
+               Quit ("PM_GetPage: Invalid page request");\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm {\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1023,7 +1218,7 @@ PM_GetPage(int pagenum, global_game_variables_t *gvar)
                mov     al,10   // bright green\r
                out     dx,al\r
        }\r
-#endif\r
+//#endif\r
 \r
        if (!(result = PM_GetPageAddress(pagenum, gvar)))\r
        {\r
@@ -1041,7 +1236,7 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
        }\r
        gvar->pm.PMPages[pagenum].lastHit =  gvar->pm.PMFrameCount;\r
 \r
-#ifdef __DEBUG_2__     // for debugging\r
+//#ifdef __DEBUG_2__   // for debugging\r
        __asm{\r
                mov     dx,STATUS_REGISTER_1\r
                in      al,dx\r
@@ -1052,7 +1247,8 @@ if (!gvar->pm.PMPages[pagenum].offset)    // JDC: sparse page
                out     dx,al\r
                mov     al,0x20 // normal\r
                out     dx,al\r
-#endif\r
+       }\r
+//#endif\r
 \r
        return(result);\r
 }\r
@@ -1069,7 +1265,7 @@ void
 PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)\r
 {\r
        if (pagenum < gvar->pm.fi.PMSoundStart)\r
-               Quit("PM_SetPageLock: Locking/unlocking non-sound page");\r
+               Quit ("PM_SetPageLock: Locking/unlocking non-sound page");\r
 \r
        gvar->pm.PMPages[pagenum].locked = lock;\r
 }\r
@@ -1082,15 +1278,15 @@ PM_SetPageLock(int pagenum,PMLockType lock, global_game_variables_t *gvar)
 void\r
 PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *gvar)\r
 {\r
-       int                             i,j,\r
+       int                             i,//j,\r
                                        page,oogypage;\r
        word                    current,total,\r
-                                       totalnonxms,totalxms,\r
+                                       //totalnonxms,totalxms,\r
                                        mainfree,maintotal,\r
-                                       emsfree,emstotal,\r
+                                       //emstotal,emsfree,\r
                                        xmsfree,xmstotal;\r
        memptr                  addr;\r
-       PageListStruct  far *p;\r
+       PageListStruct  __far *p;\r
 \r
        mainfree = (gvar->pm.mm.MainPagesAvail - gvar->pm.MainPagesUsed) + (gvar->pm.emm.EMSPagesAvail - gvar->pm.EMSPagesUsed);\r
        xmsfree = (gvar->pm.xmm.XMSPagesAvail - gvar->pm.XMSPagesUsed);\r
@@ -1155,7 +1351,7 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
                ;\r
                addr = PM_GetPage(oogypage, gvar);\r
                if (!addr)\r
-                       Quit("PM_Preload: XMS buffer failed");\r
+                       Quit ("PM_Preload: XMS buffer failed");\r
 \r
                while (xmstotal)\r
                {\r
@@ -1169,9 +1365,9 @@ PM_Preload(boolean (*update)(word current,word total), global_game_variables_t *
 \r
                        p->xmsPage = gvar->pm.XMSPagesUsed++;\r
                        if (gvar->pm.XMSPagesUsed > gvar->pm.xmm.XMSPagesAvail)\r
-                               Quit("PM_Preload: Exceeded XMS pages");\r
+                               Quit ("PM_Preload: Exceeded XMS pages");\r
                        if (p->length > PMPageSize)\r
-                               Quit("PM_Preload: Page too long");\r
+                               Quit ("PM_Preload: Page too long");\r
 \r
                        PML_ReadFromFile((byte far *)addr,p->offset,p->length, gvar);\r
                        PML_CopyToXMS((byte far *)addr,p->xmsPage,p->length, gvar);\r
@@ -1224,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar)
                {\r
                        char buf[40];\r
                        sprintf(buf,"PM_NextFrame: Page %d is locked",i);\r
-                       Quit(buf);\r
+                       Quit (buf);\r
                }\r
        }\r
 //#endif\r
@@ -1260,6 +1456,9 @@ PM_Reset(global_game_variables_t *gvar)
 \r
        gvar->pm.PMPanicMode = false;\r
 \r
+       gvar->pm.fi.PageFile = -1;\r
+       gvar->pm.xmm.XMSProtectPage = -1;\r
+\r
        // Initialize page list\r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.PMNumBlocks;i++,page++)\r
        {\r
@@ -1282,28 +1481,12 @@ PM_Startup(global_game_variables_t *gvar)
        if (gvar->pm.PMStarted)\r
                return;\r
 \r
-       strcat(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
-       gvar->pm.fi.PageFile = -1;\r
-       gvar->pm.xmm.XMSProtectPage = -1;\r
+       //0000+=+=strcpy(&(gvar->pm.fi.PageFileName), "VSWAP.");\r
 \r
        nomain = noems = noxms = false;\r
-       for (i = 1;i <\r
-#ifdef __WATCOMC__\r
-       __argc\r
-#endif\r
-#ifdef __BORLANDC__\r
-       _argc\r
-#endif\r
-       ;i++)\r
+       for (i = 1;i < _argc;i++)\r
        {\r
-               switch (US_CheckParm(\r
-#ifdef __WATCOMC__\r
-       __argv[i]\r
-#endif\r
-#ifdef __BORLANDC__\r
-       _argv[i]\r
-#endif\r
-               ,ParmStrings))\r
+               switch (US_CheckParm(_argv[i],ParmStrings))\r
                {\r
                case 0:\r
                        nomain = true;\r
@@ -1317,20 +1500,20 @@ PM_Startup(global_game_variables_t *gvar)
                }\r
        }\r
 \r
-       PML_OpenPageFile(gvar);\r
+       //0000+=+=PML_OpenPageFile(gvar);\r
 \r
-       if (!noems)\r
+       if (!noems && MML_CheckForEMS())\r
                PML_StartupEMS(gvar);\r
-       if (!noxms)\r
+       if (!noxms && MML_CheckForXMS())\r
                PML_StartupXMS(gvar);\r
+       if(!nomain)\r
+               PML_StartupMainMem(gvar);\r
 \r
-       if (nomain && !gvar->pm.emm.EMSPresent)\r
+       if (!gvar->pm.mm.MainPresent && !gvar->pm.emm.EMSPresent && !gvar->pm.xmm.XMSPresent)\r
        {\r
-               Quit("PM_Startup: No main or EMS\n");\r
+               Quit ("PM_Startup: No main or EMS\n");\r
                //return;\r
        }\r
-       else\r
-               PML_StartupMainMem(gvar);\r
 \r
        PM_Reset(gvar);\r
 \r
@@ -1343,13 +1526,13 @@ PM_Startup(global_game_variables_t *gvar)
 void\r
 PM_Shutdown(global_game_variables_t *gvar)\r
 {\r
-       PML_ShutdownXMS(gvar);\r
-       PML_ShutdownEMS(gvar);\r
+       if(MML_CheckForXMS()) PML_ShutdownXMS(gvar);\r
+       if(MML_CheckForEMS()) PML_ShutdownEMS(gvar);\r
 \r
        if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       PML_ClosePageFile(gvar);\r
+       //0000+=+=PML_ClosePageFile(gvar);\r
 \r
        PML_ShutdownMainMem(gvar);\r
 }\r