phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix boundschecker warning (was resetting gamma ramp after shutdown)

Browse Source 
This was SVN commit r452.
This commit is contained in:
janwas 2004-06-09 15:43:59 +00:00
parent 7e410dffcb
commit 131573f7c4
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source/lib/sysdep/win/wsdl.cpp
View File

@ -50,6 +50,8 @@ static bool app_active; /* is window active & on top?
static bool fullscreen; /* in fullscreen mode? static bool fullscreen; /* in fullscreen mode?
if so, restore mode when app is deactivated */ if so, restore mode when app is deactivated */
static bool is_shutdown;
HWND hWnd = 0; /* available to the app for ShowWindow calls, etc. */ HWND hWnd = 0; /* available to the app for ShowWindow calls, etc. */
static DEVMODE dm; /* current video mode */ static DEVMODE dm; /* current video mode */
@ -70,6 +72,9 @@ static void gamma_swap(bool restore_org);
*/ */
static LRESULT CALLBACK wndproc(HWND hWnd, unsigned int uMsg, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK wndproc(HWND hWnd, unsigned int uMsg, WPARAM wParam, LPARAM lParam)
{ {
if(is_shutdown)
return DefWindowProc(hWnd, uMsg, wParam, lParam);
switch(uMsg) switch(uMsg)
{ {
case WM_PAINT: case WM_PAINT:
@ -394,9 +399,35 @@ static int wsdl_init()
static int wsdl_shutdown() static int wsdl_shutdown()
{ {
is_shutdown = true;
// redirected to stdout.txt in SDL_Init; // redirected to stdout.txt in SDL_Init;
// close to avoid BoundsChecker warning. // close to avoid BoundsChecker warning.
fclose(stdout); fclose(stdout);
gamma_swap(true);
if(hDC != INVALID_HANDLE_VALUE)
{
ReleaseDC(hWnd, hDC);
hDC = (HDC)INVALID_HANDLE_VALUE;
}
if(hWnd != INVALID_HANDLE_VALUE)
{
DestroyWindow(hWnd);
hWnd = (HWND)INVALID_HANDLE_VALUE;
}
if(hGLRC != INVALID_HANDLE_VALUE)
{
wglMakeCurrent(0, 0);
wglDeleteContext(hGLRC);
ChangeDisplaySettings(0, 0);
hGLRC = (HGLRC)INVALID_HANDLE_VALUE;
}
return 0; return 0;
} }
@ -407,7 +438,7 @@ int SDL_Init(Uint32 flags)
} }
#include "ogl.h"
/* /*
* set video mode wxh:bpp if necessary. * set video mode wxh:bpp if necessary.
@ -478,6 +509,11 @@ int SDL_SetVideoMode(int w, int h, int bpp, unsigned long flags)
0, 0, 0, 0 0, 0, 0, 0
}; };
// GDI pixel format functions apparently require opengl to be loaded
// (may not have been done yet, if delay-loaded). call a gl function
// (no-op) to make sure.
glGetError();
int pf = ChoosePixelFormat(hDC, &pfd); int pf = ChoosePixelFormat(hDC, &pfd);
if(!SetPixelFormat(hDC, pf, &pfd)) if(!SetPixelFormat(hDC, pf, &pfd))
return 0; return 0;
@ -602,28 +638,6 @@ u64 SDL_Swap64(const u64 x)
void SDL_Quit() void SDL_Quit()
{ {
gamma_swap(true);
if(hDC != INVALID_HANDLE_VALUE)
{
ReleaseDC(hWnd, hDC);
hDC = (HDC)INVALID_HANDLE_VALUE;
}
if(hWnd != INVALID_HANDLE_VALUE)
{
DestroyWindow(hWnd);
hWnd = (HWND)INVALID_HANDLE_VALUE;
}
if(hGLRC != INVALID_HANDLE_VALUE)
{
wglMakeCurrent(0, 0);
wglDeleteContext(hGLRC);
ChangeDisplaySettings(0, 0);
hGLRC = (HGLRC)INVALID_HANDLE_VALUE;
}
} }