wwww broke zcroll to make it use vrs wwww

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index 9cbed569789fe81f98190ab2eb152af924206064..0d1e2bf9a60694f9c2c145f3eb960d3a918c0194 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
@@ -154,13 +155,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 +169,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
@@ -357,8 +358,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 +375,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 +421,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 +435,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 +476,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