wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack...

[16.git] / src / lib / 16_pm.c

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 9cbed569789fe81f98190ab2eb152af924206064..7ecab1eb418ee35fb6ef1d30a77ea3e6c53f51c0 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -48,7 +48,8 @@ boolean dbg_debugpm=0;
 //     XMS specific variables\r
        //boolean                       XMSPresent;\r
        //word                  gvar->pm.xmm.XMSAvail,gvar->pm.xmm.XMSPagesAvail,gvar->pm.xmm.XMSHandle;\r
-       dword           XMSDriver;\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
@@ -69,6 +70,26 @@ boolean dbg_debugpm=0;
        PageListStruct  far *gvar->pm.PMPages,\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
+#define geninterrupt(n) int86(n,&CPURegs,&CPURegs);\r
+\r
 static char            *ParmStrings[] = {"nomain","noems","noxms",nil};\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -83,9 +104,9 @@ static       char            *ParmStrings[] = {"nomain","noems","noxms",nil};
 byte\r
 PML_MapEMS(word logical, byte physical, global_game_variables_t *gvar)\r
 {\r
-       byte    err, str[160];\r
+       byte    err=0, str[160];\r
        unsigned        EMShandle;\r
-       int     i;\r
+       //int   i;\r
 \r
        boolean errorflag=false;\r
        EMShandle=gvar->pm.emm.EMSHandle;\r
@@ -140,12 +161,12 @@ PML_StartupEMS(global_game_variables_t *gvar)
 {\r
        int             i;\r
        //long  size;\r
-       byte    err, str[64];\r
+       byte    err=0, str[64];\r
 \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
        gvar->pm.emm.EMSPresent = false;                        // Assume that we'll fail\r
        gvar->pm.emm.EMSAvail = 0;\r
@@ -154,13 +175,13 @@ PML_StartupEMS(global_game_variables_t *gvar)
        __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
@@ -168,13 +189,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
@@ -298,7 +319,7 @@ void
 PML_ShutdownEMS(global_game_variables_t *gvar)\r
 {\r
        word EMSHandle;\r
-       byte err,str[64];\r
+       byte err=0, str[64];\r
 \r
        boolean errorflag=false;\r
        EMSHandle=gvar->pm.emm.EMSHandle;\r
@@ -357,8 +378,7 @@ PML_StartupXMS(global_game_variables_t *gvar)
 //TODO: translate the _REG into working assembly\r
 //#define STARTUPXMSASM\r
        byte err;\r
-       word XMSAvail, XMSHandle;\r
-//++++ word XMSVer;\r
+       word XMSAvail, XMSHandle;//, XMSVer;\r
        boolean errorflag=false;\r
        word e=0;\r
        gvar->pm.xmm.XMSPresent = false;                                        // Assume failure\r
@@ -375,14 +395,15 @@ PML_StartupXMS(global_game_variables_t *gvar)
                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
-//++++         mov     ah,0\r
-//++++         call    [DWORD PTR XMSDriver]                                           //; Get XMS Version Number\r
-//++++         mov     [XMSVer],ax\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]//DWORD PTR\r
+               call    [DWORD PTR XMSDriver]\r
                mov     XMSAvail,ax\r
                or      ax,ax                           // AJR: bugfix 10/8/92\r
                jz      error1\r
@@ -420,8 +441,9 @@ End1:
 #endif\r
 \r
 #ifdef __DEBUG_PM__\r
-//++++ printf("XMSVer=%02X     ", XMSVer);\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
@@ -433,7 +455,7 @@ End1:
        __asm {\r
                mov     dx,XMSAvail\r
                mov     ah,XMS_ALLOC                            // And do the allocation\r
-               call    [DWORD PTR XMSDriver]//DWORD PTR\r
+               call    [DWORD PTR XMSDriver]\r
                mov     XMSHandle,dx\r
                or      ax,ax                           // AJR: bugfix 10/8/92\r
                jz      error2\r
@@ -474,7 +496,7 @@ error:
                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.XMSVer = XMSVer;\r
                gvar->pm.xmm.XMSPresent = true;\r
 #ifdef __DEBUG_PM__\r
                printf("        XMSmem=%lu      XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);\r
@@ -725,7 +747,7 @@ 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
@@ -1283,15 +1305,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
@@ -1489,23 +1511,9 @@ PM_Startup(global_game_variables_t *gvar)
        //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