X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_init.c;h=5b5771b7c8f1e66a359325f2da2c827bc01c0754;hb=34f0aa01c95a8e6843069d5b9e4b2e7a7bbe1e53;hp=d113ab7b095f1d84f5fa850b705d4b132afcec48;hpb=43db91d700145ae03ae7b83308a869aef5bd6eb0;p=freeglut

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index d113ab7..5b5771b 100644
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -86,10 +86,11 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       GL_FALSE,               /* JoysticksInitialised */
                       0,                      /* NumActiveJoysticks */
                       GL_FALSE,               /* InputDevsInitialised */
+                      0,                      /* MouseWheelTicks */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
                       1,                      /* MajorVersion */
-                      0,                      /* MajorVersion */
+                      0,                      /* MinorVersion */
                       0,                      /* ContextFlags */
                       0,                      /* ContextProfile */
                       NULL,                   /* ErrorFunc */
@@ -210,27 +211,27 @@ static int fghNetWMSupported(void)
 /*  Check if "hint" is present in "property" for "window". */
 int fgHintPresent(Window window, Atom property, Atom hint)
 {
-  Atom ** atoms_ptr;
+  Atom *atoms;
   int number_of_atoms;
   int supported;
   int i;
 
   supported = 0;
 
-  atoms_ptr = malloc(sizeof(Atom *));
   number_of_atoms = fghGetWindowProperty(window,
 					 property,
 					 XA_ATOM,
-					 (unsigned char **) atoms_ptr);
+					 (unsigned char **) &atoms);
   for (i = 0; i < number_of_atoms; i++)
-    {
-      if ((*atoms_ptr)[i] == hint)
+  {
+      if (atoms[i] == hint)
       {
           supported = 1;
           break;
       }
-    }
+  }
 
+  XFree(atoms);
   return supported;
 }
 
@@ -313,7 +314,7 @@ static void fghInitialize( const char* displayName )
 
     /* What we need to do is to initialize the fgDisplay global structure here. */
     fgDisplay.Instance = GetModuleHandle( NULL );
-    fgDisplay.DisplayName=strdup(displayName);
+    fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;
     atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
 
     if( atom == 0 )
@@ -390,6 +391,15 @@ static void fghInitialize( const char* displayName )
 
     fgState.Initialised = GL_TRUE;
 
+    /* Avoid registering atexit callback on Win32 as it results in an access
+     * violation due to calling into a module which has been unloaded.
+     * Any cleanup isn't needed on Windows anyway, the OS takes care of it.c
+     * see: http://blogs.msdn.com/b/oldnewthing/archive/2012/01/05/10253268.aspx
+     */
+#if ( TARGET_HOST_MS_WINDOWS == 0 )
+    atexit(fgDeinitialize);
+#endif
+
     /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
     fgInitialiseInputDevices();
 }
@@ -403,11 +413,14 @@ void fgDeinitialize( void )
 
     if( !fgState.Initialised )
     {
-        fgWarning( "fgDeinitialize(): "
-                   "no valid initialization has been performed" );
         return;
     }
 
+	/* If we're in game mode, we want to leave game mode */
+    if( fgStructure.GameModeWindow ) {
+        glutLeaveGameMode();
+    }
+
     /* If there was a menu created, destroy the rendering context */
     if( fgStructure.MenuContext )
     {
@@ -443,6 +456,8 @@ void fgDeinitialize( void )
     fgState.JoysticksInitialised = GL_FALSE;
     fgState.InputDevsInitialised = GL_FALSE;
 
+	fgState.MouseWheelTicks = 0;
+
     fgState.MajorVersion = 1;
     fgState.MinorVersion = 0;
     fgState.ContextFlags = 0;
@@ -1162,7 +1177,7 @@ void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list
 void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
 {
     /* This allows user programs to handle freeglut warnings */
-    fgState.ErrorFunc = vfgWarning;
+    fgState.WarningFunc = vfgWarning;
 }
 
 /*** END OF FILE ***/