Fix symbol path for osgeo4w installs

qgis · May 5, 2017 · 52093a5 · 52093a5
1 parent 3e05bd8
commit 52093a5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -470,6 +470,12 @@ int main( int argc, char *argv[] )
 #endif
 
 #ifdef Q_OS_WIN
+  if ( !QgsApplication::isRunningFromBuildDir() )
+  {
+    QString symbolPath( getenv( "QGIS_PREFIX_PATH" ) );
+    symbolPath = symbolPath + "\\pdb;http://msdl.microsoft.com/download/symbols;http://download.osgeo.org/osgeo4w/symstore ";
+    QgsStackTrace::setSymbolPath( symbolPath );
+  }
   SetUnhandledExceptionFilter( QgsCrashHandler::handle );
 #endif
 

diff --git a/src/core/qgsstacktrace.cpp b/src/core/qgsstacktrace.cpp
@@ -37,9 +37,19 @@ QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( _EXCEPTION_POINTERS *Exc
 #endif
 
   HANDLE process = GetCurrentProcess();
-  // TOOD Pull symbols from symbol server.
   SymSetOptions( SYMOPT_DEFERRED_LOADS | SYMOPT_INCLUDE_32BIT_MODULES | SYMOPT_UNDNAME );
-  SymInitialize( process, NULL, TRUE );
+
+  PCSTR paths;
+  if ( QgsStackTrace::mSymbolPaths.isEmpty() )
+  {
+    paths = NULL;
+  }
+  else
+  {
+    paths = QgsStackTrace::mSymbolPaths.toStdString().c_str();
+  }
+
+  BOOL success = SymInitialize( process, paths, TRUE );
 
   // StackWalk64() may modify context record passed to it, so we will
   // use a copy.
@@ -121,10 +131,19 @@ QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( _EXCEPTION_POINTERS *Exc
   qgsFree( symbol );
   qgsFree( line );
   qgsFree( module );
+  SymCleanup( process );
   return stack;
 
 }
-#endif
+
+QString QgsStackTrace::mSymbolPaths;
+
+void QgsStackTrace::setSymbolPath( QString symbolPaths )
+{
+  mSymbolPaths = symbolPaths;
+}
+
+#endif // Q_OS_WIN
 
 #ifdef Q_OS_LINUX
 QVector<QgsStackTrace::StackLine> QgsStackTrace::trace( unsigned int maxFrames )

diff --git a/src/core/qgsstacktrace.h b/src/core/qgsstacktrace.h
@@ -67,6 +67,12 @@ class CORE_EXPORT QgsStackTrace
      * \note Added in QGIS 3.0
      */
     static QVector<QgsStackTrace::StackLine> trace( struct _EXCEPTION_POINTERS *ExceptionInfo );
+
+    /**
+     * Set the paths to load the PDB symbols from on Windows.
+     * @param paths The path, or series of paths separated by a semicolon (;), that is used to search for symbol files.
+     */
+    static void setSymbolPath( QString searchPath );
 #endif
 
 #ifdef Q_OS_LINUX
@@ -81,6 +87,7 @@ class CORE_EXPORT QgsStackTrace
 
   private:
     QgsStackTrace();
+    static QString mSymbolPaths;
 
 };