Francois Gouget : winedos: Move VGA_SetGraphicMode() up a bit and make it static. VGA_GetModeInfoList() is unused so remove it.
Module: wine Branch: master Commit: c772cdfca545322d8b4ada1a8541b145133d0b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c772cdfca545322d8b4ada1a85... Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:47:17 2009 +0200 winedos: Move VGA_SetGraphicMode() up a bit and make it static. VGA_GetModeInfoList() is unused so remove it. --- dlls/winedos/vga.c | 65 ++++++++++++++++++++++++---------------------------- dlls/winedos/vga.h | 1 - 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 6c9085e..bc3f8c3 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -884,41 +884,7 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode) return NULL; } -const VGA_MODE *VGA_GetModeInfoList(void) -{ - return VGA_modelist; -} - -int VGA_SetMode(WORD mode) -{ - const VGA_MODE *ModeInfo; - /* get info on VGA mode & set appropriately */ - VGA_CurrentMode = mode; - ModeInfo = VGA_GetModeInfo(VGA_CurrentMode); - - /* check if mode is supported */ - if (ModeInfo->Supported) - { - FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes.\n", mode); - } - else - { - FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways.\n", mode); - } - - /* set up graphic or text display */ - if (ModeInfo->ModeType == TEXT) - { - VGA_SetAlphaMode(ModeInfo->TextCols, ModeInfo->TextRows); - } - else - { - return VGA_SetGraphicMode(mode); - } - return 0; /* assume all good & return zero */ -} - -int VGA_SetGraphicMode(WORD mode) +static int VGA_SetGraphicMode(WORD mode) { ModeSet par; int newSize; @@ -1000,6 +966,35 @@ int VGA_SetGraphicMode(WORD mode) return par.ret; } +int VGA_SetMode(WORD mode) +{ + const VGA_MODE *ModeInfo; + /* get info on VGA mode & set appropriately */ + VGA_CurrentMode = mode; + ModeInfo = VGA_GetModeInfo(VGA_CurrentMode); + + /* check if mode is supported */ + if (ModeInfo->Supported) + { + FIXME("Setting VGA mode %i - Supported mode - Improve reporting of missing capabilities for modes & modetypes.\n", mode); + } + else + { + FIXME("Setting VGA mode %i - Unsupported mode - Will doubtfully work at all, but we'll try anyways.\n", mode); + } + + /* set up graphic or text display */ + if (ModeInfo->ModeType == TEXT) + { + VGA_SetAlphaMode(ModeInfo->TextCols, ModeInfo->TextRows); + } + else + { + return VGA_SetGraphicMode(mode); + } + return 0; /* assume all good & return zero */ +} + int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth) { if (!lpddraw) return 1; diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h index f3169f8..5d79567 100644 --- a/dlls/winedos/vga.h +++ b/dlls/winedos/vga.h @@ -55,7 +55,6 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode); int VGA_SetMode(WORD mode); /* graphics mode */ -int VGA_SetGraphicMode(WORD mode); int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth); void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); void VGA_SetColor16(int reg,int color);
participants (1)
-
Alexandre Julliard