From 31f35146b975f93d9369ab6153e82fa76ca6ee2f Mon Sep 17 00:00:00 2001 From: Jukka Heinonen Date: Tue, 8 Apr 2003 19:41:03 +0000 Subject: [PATCH] Return correct segment for VESA information. Check oem number/version flag first and after that overwrite condition code. --- dlls/winedos/int10.c | 4 ++-- dlls/winedos/int21.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index 720fc536e40..f28fd72a0e4 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -607,8 +607,8 @@ INT10_HEAP *INT10_GetHeap( void ) 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 */ diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index de9de7fcc9a..b7338a21ac2 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -1585,15 +1585,15 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) 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;