winedos / Small bug fixes

[Jukka Heinonen]

This patch fixes a few bugs in winedos.




Changelog:
    Return correct segment for VESA information.
    Check oem number/version flag first and after that overwrite
    condition code.




Index: dlls/winedos/int10.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/int10.c,v
retrieving revision 1.30
diff -u -r1.30 int10.c
--- dlls/winedos/int10.c	26 Feb 2003 05:02:54 -0000	1.30
+++ dlls/winedos/int10.c	6 Apr 2003 13:33:43 -0000
@@ -607,8 +607,8 @@
         int  i;
 
         heap_pointer = DOSVM_AllocDataUMB( sizeof(INT10_HEAP), 
-                                           0,
-                                           &segment );
+                                           &segment,
+                                           0 );
 
         for (i = 0; i < 7; i++)
             heap_pointer->StaticModeSupport[i] = 0xff; /* FIXME */




Index: dlls/winedos/int21.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/int21.c,v
retrieving revision 1.27
diff -u -r1.27 int21.c
--- dlls/winedos/int21.c	30 Mar 2003 03:04:37 -0000	1.27
+++ dlls/winedos/int21.c	6 Apr 2003 13:33:47 -0000
@@ -1585,15 +1585,15 @@
         TRACE( "GET DOS VERSION - %s requested\n",
                (AL_reg(context) == 0x00) ? "OEM number" : "version flag" );
 
-        SET_AL( context, HIBYTE(HIWORD(GetVersion16())) ); /* major version */
-        SET_AH( context, LOBYTE(HIWORD(GetVersion16())) ); /* minor version */
-
         if (AL_reg(context) == 0x00)
             SET_BH( context, 0xff ); /* OEM number => undefined */
         else
             SET_BH( context, 0x08 ); /* version flag => DOS is in ROM */
 
-        SET_BL( context, 0x12 );     /* 0x123456 is Wine's serial # */
+        SET_AL( context, HIBYTE(HIWORD(GetVersion16())) ); /* major version */
+        SET_AH( context, LOBYTE(HIWORD(GetVersion16())) ); /* minor version */
+
+        SET_BL( context, 0x12 );     /* 0x123456 is 24-bit Wine's serial # */
         SET_CX( context, 0x3456 );
         break;
 



-- 
Jukka Heinonen <http://www.iki.fi/jhei/>