Changeset 41418 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine

Files:

• Makefile.kmk (modified) (3 diffs)
• vbox/libWineStub/debug.c (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk

@@ -187 +187 @@
   wined3dwddm_DEBUG_INSTTYPE.win = both
  endif
-wined3dwddm_INCS           = vbox/libWineStub/include
+wined3dwddm_INCS           = $(wined3d_INCS) \
+                                $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
 wined3dwddm_DEFS           = $(subst VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT,,$(wined3d_DEFS))
 wined3dwddm_DEFS          += VBOX_WITH_WDDM VBOX_WINE_WITH_SINGLE_CONTEXT IN_VBOXLIBWINE
 wined3dwddm_SOURCES        = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES)) vbox/VBoxDbgGl.c
+wined3dwddm_LIBS          += $(wined3d_LIBS)\
+                                $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+                                $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
 
 DLLS.amd64 += wined3dwddm-x86
-wined3dwddm-x86_EXTENDS    = wined3dwddm
+wined3dwddm-x86_EXTENDS      = wined3dwddm
 wined3dwddm-x86_BLD_TRG_ARCH = x86
 # wined3d now using iprt/asm.h, which includes iprt/assert.h, so iprt is required
-wined3dwddm-x86_LIBS = \
-                                                $(VBOX_LIB_IPRT_GUEST_R3_X86) \
-                                                $(VBOX_LIB_VBGL_R3_X86)
-
+wined3dwddm-x86_LIBS       = \
+                                                        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+                                                        $(VBOX_LIB_VBGL_R3_X86)
+wined3dwddm-x86_LIBS      += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+                                $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
 wined3dwddm-x86_DEFS       = $(wined3dwddm_DEFS) VBOX_WDDM_WOW64
 endif # ifdef VBOX_WITH_WDDM
@@ -297 +302 @@
   VBoxD3D9wddm_DEBUG_INSTTYPE = both
  endif
-VBoxD3D9wddm_INCS           = vbox/libWineStub/include
+VBoxD3D9wddm_INCS           = $(VBoxD3D9_INCS) \
+                                $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
 VBoxD3D9wddm_DEFS          += $(VBoxD3D9_DEFS) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE IN_VBOXWINEEX
 VBoxD3D9wddm_SOURCES        = $(subst d3d9xpdm.def,d3d9wddm.def,$(VBoxD3D9_SOURCES))
-VBoxD3D9wddm_LIBS           = $(subst $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS)) 
+VBoxD3D9wddm_LIBS           = $(subst $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS))
+VBoxD3D9wddm_LIBS          += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+                                $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
 
 DLLS.amd64 += VBoxD3D9wddm-x86
@@ -312 +320 @@
                                                 $(VBOX_LIB_VBGL_R3_X86)
  endif
+VBoxD3D9wddm-x86_LIBS        += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+                                $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
 endif # ifdef VBOX_WITH_WDDM
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/debug.c

@@ -42 +42 @@
 //#include "wine/library.h"
 
+#ifdef VBOX_WITH_WDDM
+#include <VBoxDispMpLogger.h>
+#include <iprt/err.h>
+#else
+#include <iprt/log.h>
+#endif
+
 static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" };
 
 #define MAX_DEBUG_OPTIONS 256
 
+typedef DECLCALLBACK(void) FNVBOXWINELOGBACKDOOR(char* pcszStr);
+typedef FNVBOXWINELOGBACKDOOR *PFNVBOXWINELOGBACKDOOR;
+static PFNVBOXWINELOGBACKDOOR vbox_log_backdoor = NULL;
 static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME) | (1 << __WINE_DBCL_WARN);
 static int nb_debug_options = -1;
@@ -193 +203 @@
 }
 
+#ifndef VBOX_WITH_WDDM
+static DECLCALLBACK(void) vbox_log_backdoor_rt(char* pcszStr)
+{
+    RTLogBackdoorPrintf("%s", pcszStr);
+}
+#else
+static DECLCALLBACK(void) vbox_log_backdoor_dispmp(char* pcszStr)
+{
+    VBoxDispMpLoggerLog(pcszStr);
+}
+#endif
+static void vbox_log_v(const char *pszFormat, va_list args)
+{
+    if (vbox_log_backdoor)
+    {
+        static char buf[8092];
+        int offset = sprintf(buf, "[0x%lx.0x%lx] Wine Debug: ", GetCurrentProcessId(), GetCurrentThreadId());
+        vsprintf(buf + offset, pszFormat, args);
+        vbox_log_backdoor(buf);
+    }
+}
 
 /* initialize all options at startup */
@@ -203 +234 @@
     if ((wine_debug = getenv("WINEDEBUG")))
     {
-        if (!strcmp( wine_debug, "help" )) debug_usage();
+        Assert(0);
+        if (!strcmp( wine_debug, "help" ))
+            debug_usage();
+        else if (getenv("WINEDEBUG_BACKDOOR"))
+        {
+#ifdef VBOX_WITH_WDDM
+            int rc = VBoxDispMpLoggerInit();
+            if (RT_SUCCESS(rc))
+                vbox_log_backdoor = vbox_log_backdoor_dispmp;
+//            else
+#else
+                vbox_log_backdoor = vbox_log_backdoor_rt;
+#endif
+        }
         parse_options( wine_debug );
     }
@@ -395 +439 @@
 static int default_dbg_vprintf( const char *format, va_list args )
 {
+    vbox_log_v(format, args);
 #ifdef DEBUG_leo
     static FILE *output=NULL;