]> 4ch.mooo.com Git - 16.git/blobdiff - src/lib/16_pm.c
ok wwwww zscroll and scroll compile disabled due to me being too tired to whack at...
[16.git] / src / lib / 16_pm.c
index 030a47b62d3f6093b17ffe167b286a910d55528d..3a125111d1068557dd8fc20f53b5169d73cb206b 100755 (executable)
 #include "src/lib/16_pm.h"\r
 #pragma hdrstop\r
 \r
-#ifdef __DEBUG__\r
-boolean debugpm=0;\r
-#endif\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                 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                 XMSPresent;\r
-       word                    gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;*/\r
-       word            XMSDriver;\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
@@ -67,9 +64,30 @@ boolean debugpm=0;
                                        gvar->pm.PMNumBlocks;\r
        long                    PMFrameCount;\r
        PageListStruct  far *gvar->pm.PMPages,\r
-                                       _seg *gvar->pm.PMSegPages;\r
-*/\r
-boolean                PMStarted, MainPresent, EMSPresent, XMSPresent;\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
@@ -84,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
@@ -98,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
@@ -112,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
@@ -140,28 +158,28 @@ boolean
 PML_StartupEMS(global_game_variables_t *gvar)\r
 {\r
        int             i;\r
-       long    size;\r
-       byte    str[160];\r
-       byte err;\r
+       //long  size;\r
+       byte    err=0, str[64];\r
 \r
-       boolean errorflag=0;\r
+       boolean errorflag=false;\r
        static char     emmname[] = "EMMXXXX0"; //fix by andrius4669\r
        unsigned int EMSVer = 0;\r
-       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle,EMSAvail;\r
+       unsigned        totalEMSpages,freeEMSpages,EMSPageFrame,EMSHandle=0,EMSAvail=0;\r
        totalEMSpages = freeEMSpages = EMSPageFrame = 0;\r
-       EMSPresent = false;                     // Assume that we'll fail\r
+       gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
+       gvar->mmi.EMSmem = 0;\r
 \r
        __asm {\r
                mov     dx,OFFSET emmname       //fix by andrius4669\r
                mov     ax,0x3d00\r
-               int     EMS_INT         // try to open EMMXXXX0 device\r
+               int     EMM_INT         // try to open EMMXXXX0 device\r
                jc      error1\r
 \r
                mov     bx,ax\r
                mov     ax,0x4400\r
 \r
-               int     EMS_INT         // get device info\r
+               int     EMM_INT         // get device info\r
                jc      error1\r
 \r
                and     dx,0x80\r
@@ -169,13 +187,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
 \r
                mov     ax,0x4407\r
 \r
-               int     EMS_INT         // get status\r
+               int     EMM_INT         // get status\r
                jc      error1\r
                or      al,al\r
                jz      error1\r
 \r
                mov     ah,0x3e\r
-               int     EMS_INT         // close handle\r
+               int     EMM_INT         // close handle\r
                jc      error1\r
 \r
                mov     ah,EMS_STATUS\r
@@ -226,6 +244,7 @@ End1:
 #ifdef __WATCOMC__\r
        }\r
 #endif\r
+/*\r
        if(errorflag==false)\r
        {\r
                // Don't hog all available EMS\r
@@ -236,7 +255,7 @@ End1:
                        gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
                }\r
        }\r
-\r
+*/\r
        __asm {\r
                mov     ah,EMS_ALLOCPAGES\r
                mov     bx,[EMSAvail];\r
@@ -265,7 +284,7 @@ End2:
 \r
        if(errorflag==false)\r
        {\r
-       gvar->mmi.EMSmem += gvar->pm.emm.EMSAvail * (long)EMSPageSize;\r
+       gvar->mmi.EMSmem = EMSAvail * (dword)EMSPageSize;\r
 \r
        // Initialize EMS mapping cache\r
        for (i = 0;i < EMSFrameCount;i++)\r
@@ -277,16 +296,18 @@ End2:
                strcpy(str,"PML_StartupEMS: EMS error ");\r
                MM_EMSerr(str, err);\r
                printf("%s\n",str);\r
-               return(EMSPresent);\r
+               return(gvar->pm.emm.EMSPresent);\r
        }\r
 \r
-       EMSPresent = true;                      // We have EMS\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
-       return(EMSPresent);\r
+       return(gvar->pm.emm.EMSPresent);\r
 }\r
 \r
 //\r
@@ -296,17 +317,41 @@ 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 (EMSPresent)\r
+       if (gvar->pm.emm.EMSPresent)\r
        {\r
                __asm {\r
                        mov     ah,EMS_FREEPAGES\r
                        mov     dx,[EMSHandle]\r
                        int     EMS_INT\r
+                       jc      errores\r
+                       jmp     Endes\r
+#ifdef __BORLANDC__\r
                }\r
-               if (_AH)\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
+#endif\r
+               if(errorflag==true)\r
                {\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
@@ -328,46 +373,144 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
-       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
+//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
+       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
+               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
-       gvar->pm.xmm.XMSAvail = _AX;\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
+       }\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
-       gvar->pm.xmm.XMSHandle = _DX;\r
-\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
-       XMSPresent = true;\r
+       e++;\r
+#endif\r
 error:\r
-       return(XMSPresent);\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
 //\r
@@ -447,11 +590,36 @@ PML_CopyFromXMS(byte far *target,int sourcepage,word length, global_game_variabl
 void\r
 PML_ShutdownXMS(global_game_variables_t *gvar)\r
 {\r
-       if (XMSPresent)\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);\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
                        //return;\r
@@ -475,16 +643,12 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 {\r
        int     i;\r
 \r
-       if(MainPresent)\r
+       if(gvar->pm.mm.MainPresent)\r
        for (i = 0;i < PMMaxMainMem;i++)\r
        {\r
 #ifdef __DEBUG_PM__\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
-               //MM_ShowMemory(gvar);\r
-               //MM_DumpData(gvar);\r
-               //MM_Report_(gvar);\r
 #endif\r
                if (gvar->pm.mm.MainMemPages[i])\r
                        MM_SetPurge(&(gvar->pm.mm.MainMemPages[i]),level, gvar);\r
@@ -492,9 +656,7 @@ PM_SetMainMemPurge(int level, global_game_variables_t *gvar)
 \r
        else\r
        {\r
-               printf("MainPresent IS NULL\n");\r
-               printf("%x      ", MainPresent);\r
-               exit(-4);\r
+               Quit("MainPresent IS NULL\n");\r
        }\r
 }\r
 \r
@@ -520,7 +682,7 @@ PM_CheckMainMem(global_game_variables_t *gvar)
        PMBlockAttr             *used;\r
        PageListStruct  far *page;\r
 \r
-       if (!MainPresent)\r
+       if (!gvar->pm.mm.MainPresent)\r
                return;\r
 \r
        for (i = 0,page = gvar->pm.PMPages;i < gvar->pm.fi.ChunksInFile;i++,page++)\r
@@ -583,15 +745,12 @@ 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
-       MainPresent = false;\r
+       gvar->pm.mm.MainPresent = false;\r
        MM_BombOnError(false, gvar);\r
-       printf("PML_StartupMainMem()\n");\r
-       printf("        p=%04x  MainMemPages=%04x\n", p, gvar->pm.mm.MainMemPages);\r
-       printf("        p=%Fp   MainMemPages=%Fp\n", p, gvar->pm.mm.MainMemPages);\r
        for (i = 0,p = gvar->pm.mm.MainMemPages;i < PMMaxMainMem;i++,p++)\r
        {\r
                MM_GetPtr(p,PMPageSize, gvar);\r
@@ -609,7 +768,7 @@ PML_StartupMainMem(global_game_variables_t *gvar)
                Quit("PM_SetupMainMem: Not enough main memory");\r
                //return;\r
        }\r
-       MainPresent = true;\r
+       gvar->pm.mm.MainPresent = true;\r
 }\r
 \r
 //\r
@@ -901,7 +1060,7 @@ PML_PutPageInXMS(int pagenum, global_game_variables_t *gvar)
        int                             usexms;\r
        PageListStruct  far *page;\r
 \r
-       if (!XMSPresent)\r
+       if (!gvar->pm.xmm.XMSPresent)\r
                return;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
@@ -1030,7 +1189,7 @@ PML_GetPageFromXMS(int pagenum,boolean mainonly, global_game_variables_t *gvar)
        PageListStruct  far *page;\r
 \r
        page = &gvar->pm.PMPages[pagenum];\r
-       if (XMSPresent && (page->xmsPage != -1))\r
+       if (gvar->pm.xmm.XMSPresent && (page->xmsPage != -1))\r
        {\r
                gvar->pm.xmm.XMSProtectPage = pagenum;\r
                checkaddr = PML_GetAPageBuffer(pagenum,mainonly, gvar);\r
@@ -1144,15 +1303,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
@@ -1344,32 +1503,15 @@ PM_Startup(global_game_variables_t *gvar)
        boolean nomain,noems,noxms;\r
        int             i;\r
 \r
-       if (PMStarted)\r
-       {\r
-               printf("pee\n");\r
+       if (gvar->pm.PMStarted)\r
                return;\r
-       }\r
 \r
-       strcat(&(gvar->pm.fi.PageFileName), "VSWAP.");\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
@@ -1383,24 +1525,24 @@ 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 && !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
                //return;\r
        }\r
-       printf("PML_StartupMainMem\n");\r
-       PML_StartupMainMem(gvar);\r
 \r
        PM_Reset(gvar);\r
 \r
-       PMStarted = true;\r
+       gvar->pm.PMStarted = true;\r
 }\r
 \r
 //\r
@@ -1409,13 +1551,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 (!PMStarted)\r
+       if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       PML_ClosePageFile(gvar);\r
+       //PML_ClosePageFile(gvar);\r
 \r
        PML_ShutdownMainMem(gvar);\r
 }\r