valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Enable SETMODE_SAVES_CLEAR for now. Fix compilation with SETMODE_SAVES set to 0. Use safe_strncpy for resolution lines.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3922
This commit is contained in:
Peter Veenstra 2015-07-07 11:06:27 +00:00
parent db0a72cd4d
commit b0c72903e4
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/sdlmain.cpp
View file

@ -221,7 +221,7 @@ struct SDL_Block {
static SDL_Block sdl;
#define SETMODE_SAVES 1 //Don't set Video Mode if nothing changes.
#define SETMODE_SAVES_CLEAR 0 //Clear the screen, when the Video Mode is reused
#define SETMODE_SAVES_CLEAR 1 //Clear the screen, when the Video Mode is reused
SDL_Surface* SDL_SetVideoMode_Wrap(int width,int height,int bpp,Bit32u flags){
#if SETMODE_SAVES
static int i_height = 0;
@ -243,7 +243,7 @@ SDL_Surface* SDL_SetVideoMode_Wrap(int width,int height,int bpp,Bit32u flags){
return sdl.surface;
}
#endif
#ifdef WIN32
//SDL seems to crash if we are in OpenGL mode currently and change to exactly the same size without OpenGL.
//This happens when DOSBox is in textmode with aspect=true and output=opengl and the mapper is started.
@ -260,7 +260,8 @@ SDL_Surface* SDL_SetVideoMode_Wrap(int width,int height,int bpp,Bit32u flags){
if ((i_flags&SDL_OPENGL) && !(flags&SDL_OPENGL) && height==i_height && width==i_width && height==480) {
height++;
}
#endif
#endif //WIN32
#endif //SETMODE_SAVES
SDL_Surface* s = SDL_SetVideoMode(width,height,bpp,flags);
#if SETMODE_SAVES
if (s == NULL) return s; //Only store when successful
@ -1197,7 +1198,7 @@ static void GUI_StartUp(Section * sec) {
sdl.desktop.full.height = 0;
if(fullresolution && *fullresolution) {
char res[100];
strncpy( res, fullresolution, sizeof( res ));
safe_strncpy( res, fullresolution, sizeof( res ));
fullresolution = lowcase (res);//so x and X are allowed
if (strcmp(fullresolution,"original")) {
sdl.desktop.full.fixed = true;
@ -1217,7 +1218,7 @@ static void GUI_StartUp(Section * sec) {
const char* windowresolution=section->Get_string("windowresolution");
if(windowresolution && *windowresolution) {
char res[100];
strncpy( res,windowresolution, sizeof( res ));
safe_strncpy( res,windowresolution, sizeof( res ));
windowresolution = lowcase (res);//so x and X are allowed
if(strcmp(windowresolution,"original")) {
char* height = const_cast<char*>(strchr(windowresolution,'x'));