Changeset 52351 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Aug 11, 2014 6:32:17 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95479

Message:

crOpenGL: dump module load

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/GuestHost/OpenGL/include/cr_error.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/util/error.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_error.h

@@ -40 +40 @@
 
 DECLEXPORT(void) crDebug(const char *format, ... ) PRINTF;
+DECLEXPORT(void) crDbgCmdPrint(const char *description1, const char *description2, const char *cmd, ...);
+DECLEXPORT(void) crDbgCmdSymLoadPrint(const char *modName, const void*pvAddress);
 #if defined(DEBUG_misha) && defined(RT_OS_WINDOWS)
 typedef void FNCRDEBUG(const char *format, ... ) PRINTF;

trunk/src/VBox/GuestHost/OpenGL/util/error.c

@@ -32 +32 @@
 #if defined(WINDOWS)
 # define CR_DEBUG_CONSOLE_ENABLE
+
+# include "Shlwapi.h"
 #endif
 
@@ -314 +316 @@
 
 
-#if defined(DEBUG) && defined(WINDOWS) /* && (!defined(DEBUG_misha) || !defined(IN_GUEST) ) */
+#if defined(WINDOWS) /* && (!defined(DEBUG_misha) || !defined(IN_GUEST) ) */
 # define CR_DEBUG_DBGPRINT_ENABLE
 #endif
@@ -324 +326 @@
     OutputDebugString("\n");
 }
+
+static void crDebugDbgPrintF(const char * szString, ...)
+{
+    char szBuffer[4096] = {0};
+    va_list pArgList;
+    va_start(pArgList, szString);
+    vsprintf( szBuffer, szString, pArgList );
+    va_end(pArgList);
+
+    OutputDebugStringA(szBuffer);
+}
+
+static void crDebugDmlPrint(const char* pszDesc, const char* pszCmd)
+{
+    crDebugDbgPrintF("<?dml?><exec cmd=\"%s\">%s</exec>, ( %s )\n", pszCmd, pszDesc, pszCmd);
+}
+
+
+DECLEXPORT(void) crDbgCmdPrint(const char *description1, const char *description2, const char *cmd, ...)
+{
+    va_list args;
+    char aTxt[8092];
+    char aCmd[8092];
+
+    sprintf( aTxt, "%s%s", description1, description2 );
+
+    va_start( args, cmd );
+
+    vsprintf( aCmd, cmd, args );
+
+    va_end( args );
+
+    crDebugDmlPrint(aTxt, aCmd);
+
+    crDebug("%s: %s", aTxt, aCmd);
+}
+
+DECLEXPORT(void) crDbgCmdSymLoadPrint(const char *modName, const void*pvAddress)
+{
+    static bool fEnable = false;
+    static bool fInitialized = false;
+    const char * pszName;
+    static const char * pszModulePath = NULL;
+
+    if (!fInitialized)
+    {
+#ifndef DEBUG_misha
+        if (crGetenv( "CR_DEBUG_MODULE_ENABLE" ))
+#endif
+        {
+            fEnable = true;
+        }
+
+        fInitialized = true;
+    }
+
+    if (!fEnable)
+        return;
+
+    pszName = PathFindFileNameA(modName);
+
+    if (!pszModulePath)
+        pszModulePath = crGetenv("CR_DEBUG_MODULE_PATH");
+    if (!pszModulePath)
+        pszModulePath = "c:\\Users\\senmk\\Downloads\\Data\\Data";
+
+    crDbgCmdPrint("load modules for ", pszName, ".reload /i /f %s\\%s=%#p", pszModulePath, pszName, pvAddress);
+}
+
 #endif
 
@@ -514 +585 @@
     va_end( args );
 }
+
+BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
+{
+    (void) lpvReserved;
+
+    switch (fdwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+        {
+            char aName[MAX_PATH];
+            GetModuleFileNameA(hDLLInst, aName, RT_ELEMENTS(aName));
+            crDbgCmdSymLoadPrint(aName, hDLLInst);
+            break;
+        }
+        default:
+            break;
+    }
+
+    return TRUE;
+}