Changeset 41418 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

May 23, 2012 2:44:06 PM (13 years ago)

Author:

vboxsync

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

78140

Message:

wine & crOpenGL: backdoor logging for wine and enhancements for crOpenGL

File:

• trunk/src/VBox/GuestHost/OpenGL/util/error.c (modified) (7 diffs)

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

@@ -29 +29 @@
 
 #if defined(WINDOWS)
-# define CR_DEBUG_TO_CONSOLE_ENABLE
+# define CR_DEBUG_CONSOLE_ENABLE
 #endif
 
 #if defined(WINDOWS) && defined(IN_GUEST)
-# ifndef CR_DEBUG_TO_BACKDOOR_ENABLE
-#  error "CR_DEBUG_TO_BACKDOOR_ENABLE is expected!"
+# ifndef CR_DEBUG_BACKDOOR_ENABLE
+#  error "CR_DEBUG_BACKDOOR_ENABLE is expected!"
 # endif
 #else
-# ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
-#  error "CR_DEBUG_TO_BACKDOOR_ENABLE is NOT expected!"
+# ifdef CR_DEBUG_BACKDOOR_ENABLE
+#  error "CR_DEBUG_BACKDOOR_ENABLE is NOT expected!"
 # endif
 #endif
 
 
-#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
+#ifdef CR_DEBUG_BACKDOOR_ENABLE
 # include <VBoxDispMpLogger.h>
 # include <iprt/err.h>
@@ -301 +301 @@
 }
 
+static DECLCALLBACK(void) crDebugBackdoorRt(char* pcszStr)
+{
+    RTLogBackdoorPrintf("%s", pcszStr);
+}
+
+static DECLCALLBACK(void) crDebugBackdoorDispMp(char* pcszStr)
+{
+    VBoxDispMpLoggerLog(pcszStr);
+}
+
 DECLEXPORT(void) crDebug(const char *format, ... )
 {
@@ -312 +322 @@
     static int first_time = 1;
     static int silent = 0;
-#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
-    static int logBackdoor = 0;
+#ifdef CR_DEBUG_BACKDOOR_ENABLE
+    typedef DECLCALLBACK(void) FNCRGEDUGBACKDOOR(char* pcszStr);
+    typedef FNCRGEDUGBACKDOOR *PFNCRGEDUGBACKDOOR;
+    static PFNCRGEDUGBACKDOOR pfnLogBackdoor = NULL;
 #endif
 
@@ -321 +333 @@
         const char *fnamePrefix = crGetenv( "CR_DEBUG_FILE_PREFIX" );
         char str[2048];
-#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
+#ifdef CR_DEBUG_CONSOLE_ENABLE
         int logToConsole = 0;
 #endif
-#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
-        if (crGetenv( "CR_DEBUG_TO_BACKDOOR" ))
+#ifdef CR_DEBUG_BACKDOOR_ENABLE
+        if (crGetenv( "CR_DEBUG_BACKDOOR" ))
         {
             int rc = VBoxDispMpLoggerInit();
             if (RT_SUCCESS(rc))
-                logBackdoor = 1;
+                pfnLogBackdoor = crDebugBackdoorDispMp;
+            else
+                pfnLogBackdoor = crDebugBackdoorRt;
         }
 #endif
@@ -370 +384 @@
         else
         {
-#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
-            if (crGetenv( "CR_DEBUG_TO_CONSOLE" ))
+#ifdef CR_DEBUG_CONSOLE_ENABLE
+            if (crGetenv( "CR_DEBUG_CONSOLE" ))
             {
                 crRedirectIOToConsole();
@@ -385 +399 @@
          */
         if (!fname && !crGetenv("CR_DEBUG")
-#ifdef CR_DEBUG_TO_CONSOLE_ENABLE
+#ifdef CR_DEBUG_CONSOLE_ENABLE
                     && !logToConsole
 #endif
-#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
-                    && !logBackdoor
+#ifdef CR_DEBUG_BACKDOOR_ENABLE
+                    && !pfnLogBackdoor
 #endif
                 )
@@ -442 +456 @@
     va_start( args, format );
     vsprintf( txt + offset, format, args );
-#ifdef CR_DEBUG_TO_BACKDOOR_ENABLE
-    if (logBackdoor)
-    {
-        VBoxDispMpLoggerLog(txt);
+#ifdef CR_DEBUG_BACKDOOR_ENABLE
+    if (pfnLogBackdoor)
+    {
+        pfnLogBackdoor(txt);
     }
 #endif