FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11 from LindleyF/git_master

Browse Source 
Avoid invalid stack read
This commit is contained in:
Diederick C. Niehorster 2014-04-11 21:40:38 +08:00
commit 8a906a7525
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freeglut/freeglut/src/x11/fg_window_x11.c
View File

@ -137,7 +137,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
XEvent eventReturnBuffer; /* return buffer required for a call */ XEvent eventReturnBuffer; /* return buffer required for a call */
unsigned long mask; unsigned long mask;
unsigned int current_DisplayMode = fgState.DisplayMode ; unsigned int current_DisplayMode = fgState.DisplayMode ;
XConfigureEvent fakeEvent = {0}; XEvent fakeEvent = {0};
/* Save the display mode if we are creating a menu window */ /* Save the display mode if we are creating a menu window */
if( window->IsMenu && ( ! fgStructure.MenuContext ) ) if( window->IsMenu && ( ! fgStructure.MenuContext ) )
@ -247,14 +247,14 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
/* Fake configure event to force viewport setup /* Fake configure event to force viewport setup
* even with no window manager. * even with no window manager.
*/ */
fakeEvent.type = ConfigureNotify; fakeEvent.xconfigure.type = ConfigureNotify;
fakeEvent.display = fgDisplay.pDisplay.Display; fakeEvent.xconfigure.display = fgDisplay.pDisplay.Display;
fakeEvent.window = window->Window.Handle; fakeEvent.xconfigure.window = window->Window.Handle;
fakeEvent.x = x; fakeEvent.xconfigure.x = x;
fakeEvent.y = y; fakeEvent.xconfigure.y = y;
fakeEvent.width = w; fakeEvent.xconfigure.width = w;
fakeEvent.height = h; fakeEvent.xconfigure.height = h;
XPutBackEvent(fgDisplay.pDisplay.Display, (XEvent*)&fakeEvent); XPutBackEvent(fgDisplay.pDisplay.Display, &fakeEvent);
/* /*
* The GLX context creation, possibly trying the direct context rendering * The GLX context creation, possibly trying the direct context rendering