[2/3] krnl386.exe16: Make VGA_[Set/Get]Mode return TRUE on success

Frédéric Delanoy frederic.delanoy at gmail.com
Tue Dec 10 04:52:37 CST 2013


These functions previously returned 1/0 on failure/success respectively
which is inconsistent with the rest of the codebase.
---
 dlls/krnl386.exe16/int10.c |  2 +-
 dlls/krnl386.exe16/int33.c |  2 +-
 dlls/krnl386.exe16/vga.c   | 12 ++++++------
 dlls/krnl386.exe16/vga.h   |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c
index dfba761..2ac9703 100644
--- a/dlls/krnl386.exe16/int10.c
+++ b/dlls/krnl386.exe16/int10.c
@@ -750,7 +750,7 @@ static BOOL INT10_SetVideoMode( BIOSDATA *data, WORD mode )
                ptr->Width, ptr->Height, ptr->Depth,
                clearScreen ? "cleared" : "preserved" );
 
-        if ( VGA_SetMode(mode) )
+        if (!VGA_SetMode(mode))
             return FALSE;
     }
 
diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c
index 7226816..0f03ac7 100644
--- a/dlls/krnl386.exe16/int33.c
+++ b/dlls/krnl386.exe16/int33.c
@@ -295,7 +295,7 @@ void DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam)
   WORD mask = 0;
   unsigned Height, Width, SX=1, SY=1;
 
-  if (!VGA_GetMode(&Height,&Width,NULL)) {
+  if (VGA_GetMode(&Height, &Width, NULL)) {
     /* may need to do some coordinate scaling */
     if (Width)
       SX = 640/Width;
diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c
index f1b632e..d60d16a 100644
--- a/dlls/krnl386.exe16/vga.c
+++ b/dlls/krnl386.exe16/vga.c
@@ -954,7 +954,7 @@ static int VGA_SetGraphicMode(WORD mode)
     return par.ret;
 }
 
-int VGA_SetMode(WORD mode)
+BOOL VGA_SetMode(WORD mode)
 {
     const VGA_MODE *ModeInfo;
     /* get info on VGA mode & set appropriately */
@@ -980,17 +980,17 @@ int VGA_SetMode(WORD mode)
     {
        return VGA_SetGraphicMode(mode);
     }
-    return 0; /* assume all good & return zero */
+    return TRUE; /* assume all good & return TRUE */
 }
 
-int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth)
+BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth)
 {
-    if (!lpddraw) return 1;
-    if (!lpddsurf) return 1;
+    if (!lpddraw) return FALSE;
+    if (!lpddsurf) return FALSE;
     if (Height) *Height=sdesc.dwHeight;
     if (Width) *Width=sdesc.dwWidth;
     if (Depth) *Depth=sdesc.ddpfPixelFormat.u1.dwRGBBitCount;
-    return 0;
+    return TRUE;
 }
 
 static void VGA_Exit(void)
diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h
index 5d79567..b4976f6 100644
--- a/dlls/krnl386.exe16/vga.h
+++ b/dlls/krnl386.exe16/vga.h
@@ -52,10 +52,10 @@ extern const VGA_MODE VGA_modelist[];
 
 /* all vga modes */
 const VGA_MODE *VGA_GetModeInfo(WORD mode);
-int VGA_SetMode(WORD mode);
+BOOL VGA_SetMode(WORD mode);
 
 /* graphics mode */
-int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth);
+BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth);
 void VGA_SetPalette(PALETTEENTRY*pal,int start,int len);
 void VGA_SetColor16(int reg,int color);
 char VGA_GetColor16(int reg);
-- 
1.8.5




More information about the wine-patches mailing list