NULL pageframe detection added for EMM386 memory manager failing to assign one

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

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index ac77de42fe9aec5066cd848f68d08db77eb9fa1b..f4e150822cfcbd2de679684a4a82fa23705a2315 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -158,17 +158,18 @@ boolean
 PML_StartupEMS(global_game_variables_t *gvar)\r
 {\r
        int             i;\r
-       //long  size;\r
+#ifdef __PM__NOHOGEMS__\r
+       long    size;\r
+#endif\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=0,EMSAvail=0;\r
-       totalEMSpages = freeEMSpages = EMSPageFrame = 0;\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
-       gvar->mmi.EMSmem = 0;\r
+       gvar->pm.emm.EMSAvail = gvar->mmi.EMSmem = 0;\r
 \r
        __asm {\r
                mov     dx,OFFSET emmname       //fix by andrius4669\r
@@ -204,7 +205,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
                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
+               mov     [EMSVer],ax             // set EMSVer\r
                cmp     al,0x32                 // only work on ems 3.2 or greater\r
                jb      error1\r
 \r
@@ -225,7 +226,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
                mov     [totalEMSpages],dx\r
                mov     [freeEMSpages],bx\r
                mov     [EMSAvail],bx\r
-               jmp End1\r
+               jmp     End1\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
@@ -235,7 +236,7 @@ PML_StartupEMS(global_game_variables_t *gvar)
 #endif\r
                mov     err,ah\r
                mov     errorflag,1\r
-               jmp End1\r
+               jmp     End1\r
 #ifdef __BORLANDC__\r
        }\r
 #endif\r
@@ -244,7 +245,7 @@ End1:
 #ifdef __WATCOMC__\r
        }\r
 #endif\r
-/*\r
+#ifdef __PM__NOHOGEMS__\r
        if(errorflag==false)\r
        {\r
                // Don't hog all available EMS\r
@@ -255,7 +256,7 @@ End1:
                        gvar->pm.emm.EMSAvail = size / EMSPageSize;\r
                }\r
        }\r
-*/\r
+#endif\r
        __asm {\r
                mov     ah,EMS_ALLOCPAGES\r
                mov     bx,[EMSAvail];\r
@@ -273,31 +274,26 @@ End1:
 #endif\r
                mov     err,ah\r
                mov     errorflag,1\r
-               jmp End2\r
+               jmp     End2\r
 #ifdef __BORLANDC__\r
-       }\r
+       }//end of assembly\r
 #endif\r
 End2:\r
 #ifdef __WATCOMC__\r
-       }\r
+       }//end of assembly\r
 #endif\r
-\r
-       if(errorflag==false)\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
-       }\r
-       else\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