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 3b19c0ae4388ba89ec75dda3f0db750d5e06efe7..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
@@ -354,16 +355,14 @@ PML_ShutdownEMS(global_game_variables_t *gvar)
 boolean\r
 PML_StartupXMS(global_game_variables_t *gvar)\r
 {\r
+//TODO: translate the _REG into working assembly\r
 //#define STARTUPXMSASM\r
        byte err;\r
-       word XMSAvail, XMSHandle;\r
-#define XMSAVI XMSAvail\r
-#define XMSHAN 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
-       XMSAVI = gvar->mmi.XMSmem = 0;\r
+       XMSAvail = gvar->mmi.XMSmem = 0;\r
 \r
        __asm {\r
                mov     ax,0x4300\r
@@ -376,17 +375,18 @@ 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]\r
-               mov     XMSAVI,ax\r
-               cmp     bl,0xa0                         // AJR: bugfix 10/8/92\r
-               je      error1\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
@@ -410,8 +410,8 @@ End1:
        if(errorflag==true) goto error;\r
 #ifndef STARTUPXMSASM\r
        XMS_CALL(XMS_QUERYFREE);                        // Find out how much XMS is available\r
-       XMSAVI = _AX;\r
-       if (_BL)                                // AJR: bugfix 10/8/92\r
+       XMSAvail = _AX;\r
+       if (!_AX)                               // AJR: bugfix 10/8/92\r
        {\r
                errorflag = true;\r
                err = _BL;\r
@@ -421,28 +421,24 @@ End1:
 #endif\r
 \r
 #ifdef __DEBUG_PM__\r
-//++++ printf("XMSVer=%02X     ", XMSVer);\r
-       printf("XMSAvail=%u\n", (XMSAVI));\r
+       printf("XMSVer=%02X     ", XMSVer);\r
+       printf("XMSAvail=%u\n", XMSAvail);\r
        getch();\r
 #endif\r
-       XMSAVI &= ~(PMPageSizeKB - 1);  // Round off to nearest page size\r
-       if (XMSAVI < (PMPageSizeKB * 2))        // Need at least 2 pages\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
 #ifdef STARTUPXMSASM\r
        __asm {\r
-               mov     dx,XMSAVI\r
+               mov     dx,XMSAvail\r
                mov     ah,XMS_ALLOC                            // And do the allocation\r
                call    [DWORD PTR XMSDriver]\r
-#ifndef BRACKETXMS\r
-               mov     XMSHAN,dx\r
-#else\r
-               mov     [XMSHAN],dx\r
-#endif\r
-               cmp     ax,0                            // AJR: bugfix 10/8/92\r
-               je      error2\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
@@ -463,9 +459,9 @@ End2:
        }\r
 #endif\r
 #else\r
-       _DX = XMSAVI;\r
+       _DX = XMSAvail;\r
        XMS_CALL(XMS_ALLOC);                            // And do the allocation\r
-       XMSHAN = _DX;\r
+       XMSHandle = _DX;\r
        if (!_AX)                               // AJR: bugfix 10/8/92\r
        {\r
                errorflag=true;\r
@@ -477,13 +473,13 @@ End2:
 error:\r
        if(errorflag==false)\r
        {\r
-               gvar->mmi.XMSmem = (XMSAVI) * 1024ul;\r
-               gvar->pm.xmm.XMSAvail = (word)XMSAVI;\r
-               gvar->pm.xmm.XMSHandle = XMSHAN;\r
-//++++         gvar->pm.xmm.XMSVer = XMSVer;\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, XMSAVI);\r
+               printf("        XMSmem=%lu      XMSAvail=%u\n", gvar->mmi.XMSmem, XMSAvail);\r
 #endif\r
        }\r
        else\r
@@ -493,10 +489,7 @@ error:
                //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("XMSerr\n");\r
-               printf("        %u,     %lu\n", (word)XMSAVI, (dword)XMSAVI);\r
                printf("        err=%02X        e=%u\n", err, e);\r
-               getch();\r
 #endif\r
        }\r
        return(gvar->pm.xmm.XMSPresent);\r
@@ -1560,7 +1553,7 @@ PM_Shutdown(global_game_variables_t *gvar)
        if (!gvar->pm.PMStarted)\r
                return;\r
 \r
-       PML_ClosePageFile(gvar);\r
+       //PML_ClosePageFile(gvar);\r
 \r
        PML_ShutdownMainMem(gvar);\r
 }\r