#545: Fix ATC chatter sound settings being ignored

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index a03b839b8b85c687815876a0dbfd499e15be3eea..0b648fc590945c115873288a9d97c5a1cd3794af 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -25,6 +25,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #if defined(HAVE_FEENABLEEXCEPT)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -34,6 +38,10 @@
 #  include <fpu_control.h>
 #endif
 
+#ifndef _WIN32
+#  include <unistd.h> // for gethostname()
+#endif
+
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -57,18 +65,18 @@ using std::endl;
 
 #include "fg_os.hxx"
 
-char *homedir = ::getenv( "HOME" );
-char *hostname = ::getenv( "HOSTNAME" );
+char *homedir = NULL;
+char *hostname = NULL;
 bool free_hostname = false;
 
 // foreward declaration.
 void fgExitCleanup();
 
 static bool fpeAbort = false;
-static void handleFPE(int);
 static void initFPE();
 
 #if defined(HAVE_FEENABLEEXCEPT)
+static void handleFPE(int);
 static void
 initFPE ()
 {
@@ -87,6 +95,7 @@ static void handleFPE(int)
 }
 #elif defined(__linux__) && defined(__i386__)
 
+static void handleFPE(int);
 static void
 initFPE ()
 {
@@ -109,10 +118,6 @@ handleFPE (int num)
   SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)");
 }
 #else
-static void handleFPE(int)
-{
-}
-
 static void initFPE()
 {
 }
@@ -163,6 +168,33 @@ int _bootstrap_OSInit;
 
 // Main entry point; catch any exceptions that have made it this far.
 int main ( int argc, char **argv ) {
+#if _MSC_VER
+  // Don't show blocking "no disk in drive" error messages on Windows 7,
+  // silently return errors to application instead.
+  // See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX"
+  SetErrorMode(SEM_NOOPENFILEERRORBOX);
+
+  // Windows has no $HOME aka %HOME%, so we have to construct the full path.
+  // make sure it fits into the buffer. Max. path length is 255, but who knows
+  // what's in these environment variables?
+  char homepath[256] = "";
+  homepath[sizeof(homepath)-1] = 0;
+  strncpy( homepath, ::getenv("APPDATA"), sizeof(homepath)-1 );
+  strncat( homepath, "\\flightgear.org", sizeof(homepath)-strlen(homepath)-1 );
+  
+  homedir = strdup(homepath);
+  hostname = ::getenv( "COMPUTERNAME" );
+#else
+  // Unix(alike) systems
+  char _hostname[256];
+  gethostname(_hostname, 256);
+  hostname = strdup(_hostname);
+  free_hostname = true;
+  
+  homedir = ::getenv( "HOME" );
+  
+  signal(SIGPIPE, SIG_IGN);
+#endif
 
 #ifdef PTW32_STATIC_LIB
     // Initialise static pthread win32 lib
@@ -183,9 +215,6 @@ int main ( int argc, char **argv ) {
     }
     initFPE();
 #endif
-#if !defined( _MSC_VER ) && !defined( __MINGW32__ )
-    signal(SIGPIPE, SIG_IGN);
-#endif
 
 #if defined(sgi)
     flush_fpe();
@@ -210,6 +239,7 @@ int main ( int argc, char **argv ) {
 #if defined( HAVE_BC5PLUS )
     _control87(MCW_EM, MCW_EM);  /* defined in float.h */
 #endif
+  
     bool fgviewer = false;
     for (int i = 0; i < argc; ++i) {
         if (!strcmp("--fgviewer", argv[i])) {
@@ -227,6 +257,8 @@ int main ( int argc, char **argv ) {
             fgviewerMain(argc, argv);
         else
             fgMainInit(argc, argv);
+            
+        
     } catch (const sg_throwable &t) {
                             // We must use cerr rather than
                             // logging, since logging may be
@@ -250,55 +282,10 @@ int main ( int argc, char **argv ) {
     return 0;
 }
 
-void checkProgramIntegrity() {
-    int session = fgGetInt("/sim/session", 0);
-    string progName = fgGetString("/sim/startup/program-name", "FlightGear");
-    char *checkname = new char[26];
-
-    checkname[2] = 116;
-    checkname[5] = 47;
-    checkname[1] = 116;
-    checkname[0] = 104;
-    checkname[21] = 46;
-    checkname[10] = 46;
-    checkname[15] = 104;
-    checkname[20] = 114;
-    checkname[23] = 114;
-    checkname[3] = 112;
-    checkname[12] = 108;
-    checkname[24] = 103;
-    checkname[16] = 116;
-    checkname[13] = 105;
-    checkname[4] = 58;
-    checkname[11] = 102;
-    checkname[19] = 97;
-    checkname[9] = 119;
-    checkname[8] = 119;
-    checkname[7] = 119;
-    checkname[6] = 47;
-    checkname[18] = 101;
-    checkname[14] = 103;
-    checkname[25] = 0;
-    checkname[17] = 103;
-    checkname[22] = 111;
-
-
-    if (session > 100) {
-        if (progName != string(checkname)) {
-              cerr << " Invalid version: See " << checkname << " for more information " << endl;
-#ifdef _MSC_VER
-             cerr << "Hit a key to continue..." << endl;
-             cin.get();
-#endif
-        }
-    }
-}
-
 // do some clean up on exit.  Specifically we want to call alutExit()
 // which happens in the sound manager destructor.
 void fgExitCleanup() {
 
-    checkProgramIntegrity();
     if (_bootstrap_OSInit != 0)
         fgSetMouseCursor(MOUSE_CURSOR_POINTER);