IT WORKS!!!! cannot multipage yet!

diff --git a/src/lib/modex/demos/c/modex.asm b/src/lib/modex/demos/c/modex.asm
index f7d85801755f0a682079b6e11f583e5d019f4bb3..2cd7c840112a47977b51ed37d797b70f1cf6ac01 100755 (executable)
--- a/src/lib/modex/demos/c/modex.asm
+++ b/src/lib/modex/demos/c/modex.asm
@@ -444,7 +444,7 @@ MODE_360x400:           ; Data for 360 by 400 Pixels
 ;        MaxYpos = The Desired Virtual Screen Height\r
 ;        Pages   = The Desired # of Video Pages\r
 ;\r
-; EXIT:  AX = Success Flag:   0 = Failure / -1= Success\r
+; EXIT:  AX = Success Flag:   >0 = Failure / 0 = Success\r
 ;\r
 \r
 SVM_STACK   STRUC\r
@@ -476,7 +476,7 @@ SET_VGA_MODEX   PROC    FAR
 \r
     MOV     BX, [BP].SVM_Mode   ; Get Requested Mode #\r
     CMP     BX, NUM_MODES       ; Is it 0..7?\r
-    JAE     @SVM_BadModeSetup   ; If Not, Error out\r
+    JAE     @SVM_BadModeSetup1   ; If Not, Error out\r
 \r
     SHL     BX, 1                   ; Scale BX\r
     MOV     SI, w MODE_TABLE[BX]    ; CS:SI -> Mode Info\r
@@ -488,8 +488,8 @@ SET_VGA_MODEX   PROC    FAR
     ;CLR       CH                  ; Set Hi Word = 0!\r
     mov        ch,0                  ; Set Hi Word = 0!\r
     CMP     CL, CS:[SI].M_Pages ; Check # Pages for mode\r
-    JA      @SVM_BadModeSetup   ; Report Error if too Many Pages\r
-    JCXZ    @SVM_BadModeSetup   ; Report Error if 0 Pages\r
+    JA      @SVM_BadModeSetup2   ; Report Error if too Many Pages\r
+    JCXZ    @SVM_BadModeSetup3   ; Report Error if 0 Pages\r
 \r
     ; Check Validity of X Size\r
 \r
@@ -497,17 +497,17 @@ SET_VGA_MODEX   PROC    FAR
 \r
     MOV     AX, [BP].SVM_XSize  ; Get Logical Screen Width\r
     CMP     AX, CS:[SI].M_XSize ; Check against Displayed X\r
-    JB      @SVM_BadModeSetup   ; Report Error if too small\r
+    JB      @SVM_BadModeSetup4   ; Report Error if too small\r
     CMP     AX, CS:[SI].M_XMax  ; Check against Max X\r
-    JA      @SVM_BadModeSetup   ; Report Error if too big\r
+    JA      @SVM_BadModeSetup5   ; Report Error if too big\r
 \r
     ; Check Validity of Y Size\r
 \r
     MOV     BX, [BP].SVM_YSize  ; Get Logical Screen Height\r
     CMP     BX, CS:[SI].M_YSize ; Check against Displayed Y\r
-    JB      @SVM_BadModeSetup   ; Report Error if too small\r
+    JB      @SVM_BadModeSetup6   ; Report Error if too small\r
     CMP     BX, CS:[SI].M_YMax  ; Check against Max Y\r
-    JA      @SVM_BadModeSetup   ; Report Error if too big\r
+    JA      @SVM_BadModeSetup7   ; Report Error if too big\r
 \r
     ; Enough memory to Fit it all?\r
 \r
@@ -521,9 +521,26 @@ SET_VGA_MODEX   PROC    FAR
     OR      DX, AX              ; (DX = 1, AX = 0000)\r
     JZ      @SVM_Continue       ; if so, it's valid...\r
 \r
-@SVM_BadModeSetup:\r
-\r
-    mov ax,0                  ; Return Value = False\r
+@SVM_BadModeSetup1:\r
+    mov ax,1                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup2:\r
+    mov ax,2                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup3:\r
+    mov ax,3                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup4:\r
+    mov ax,4                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup5:\r
+    mov ax,5                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup6:\r
+    mov ax,6                  ; Return Value = False\r
+    JMP     @SVM_Exit           ; Normal Exit\r
+@SVM_BadModeSetup7:\r
+    mov ax,7                  ; Return Value = False\r
     JMP     @SVM_Exit           ; Normal Exit\r
 \r
 @SVM_Continue:\r

diff --git a/src/lib/modex/demos/c/x-demo.c b/src/lib/modex/demos/c/x-demo.c
index 249cbbd7a7c306f8b16face9d172b4eb7f5178de..95d3a1e83c73e05bdf22f5829bd12f18020cc238 100755 (executable)
--- a/src/lib/modex/demos/c/x-demo.c
+++ b/src/lib/modex/demos/c/x-demo.c
@@ -503,12 +503,12 @@ int       r, d;
 void page_demo ()\r
 {\r
 \r
-char   *Error1 = "Failure during SET_VGA_MODEX (4, 320, 240, 2) call";\r
+char   *Error1 = "Failure during SET_VGA_MODEX (0, 320, 200, 2) call";\r
 \r
 int            Last_Objects[2], Visible_Objects;\r
 \r
-int            Screen_X = 352;\r
-int            Screen_Y = 544;\r
+int            Screen_X = 384;\r
+int            Screen_Y = 272;\r
 \r
 int            x, y, z;\r
 int            c, dc;\r
@@ -524,12 +524,16 @@ int               Set_Color, Prev_Color, S_Dir, P_Dir;
 int            Demo_Running = True;\r
 int            redo, code;\r
 \r
-       if (set_vga_modex(Mode_320x240, Screen_X, Screen_Y, 2) == 0)\r
+int pee;\r
+pee = set_vga_modex(Mode_320x240, Screen_X, Screen_Y, 1);\r
+       if ( pee > 0)\r
        {\r
-               set_modex (Mode_320x240);\r
+               set_video_mode (3);\r
+               dos_print (Error1);\r
+               fprintf(stdout, "return value is %d\n", pee);\r
                //error_out (Error1);\r
+               exit (EXIT_SUCCESS);\r
        }\r
-       //set_vga_modex(Mode_320x240, Screen_X, Screen_Y, 2);\r
 \r
        set_active_page (0);\r
        clear_vga_screen (c_BLACK);\r

diff --git a/src/lib/modex/demos/c/x-demo.exe b/src/lib/modex/demos/c/x-demo.exe
index 093be3b39120adb39dcc3433cf98fdcb98b7d723..18f7f39db0e79befd1bafd3f4c8172b243a8ec34 100755 (executable)
Binary files a/src/lib/modex/demos/c/x-demo.exe and b/src/lib/modex/demos/c/x-demo.exe differ