Changeset 96123 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 8, 2022 11:13:44 PM (3 years ago)

Author:

vboxsync

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

152925

Message:

Add/3D/win: Added a VbglR3WriteLog implementation to the VBoxMpLogger.cpp code. bugref:10261

File:

• trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp

@@ -2 +2 @@
 /** @file
  * VBox WDDM Display logger implementation
+ *
+ * We're unable to use standard r3 vbgl-based backdoor logging API because
+ * win8 Metro apps can not do CreateFile/Read/Write by default.  This is why
+ * we use miniport escape functionality to issue backdoor log string to the
+ * miniport and submit it to host via standard r0 backdoor logging api
+ * accordingly
  */
 
@@ -16 +22 @@
  */
 
-/* We're unable to use standard r3 vbgl-based backdoor logging API because win8 Metro apps
- * can not do CreateFile/Read/Write by default.
- * This is why we use miniport escape functionality to issue backdoor log string to the miniport
- * and submit it to host via standard r0 backdoor logging api accordingly
- */
-
 #define IPRT_NO_CRT_FOR_3RD_PARTY /* To get malloc and free wrappers in IPRT_NO_CRT mode. Doesn't link with IPRT in non-no-CRT mode. */
 #include "UmHlpInternal.h"
@@ -33 +33 @@
 # include <stdio.h>
 #endif
+#include <VBox/VBoxGuestLib.h>
 
-DECLCALLBACK(void) VBoxDispMpLoggerLog(const char *pszString)
+
+static void VBoxDispMpLoggerLogN(const char *pchString, size_t cchString)
 {
     D3DKMTFUNCTIONS const *d3dkmt = D3DKMTFunctions();
@@ -45 +47 @@
     if (Status == 0)
     {
-        uint32_t cbString = (uint32_t)strlen(pszString) + 1;
-        uint32_t cbCmd = RT_UOFFSETOF_DYN(VBOXDISPIFESCAPE_DBGPRINT, aStringBuf[cbString]);
+        uint32_t cchString2 = (uint32_t)RT_MIN(cchString, _64K - 1U);
+        uint32_t cbCmd = RT_UOFFSETOF_DYN(VBOXDISPIFESCAPE_DBGPRINT, aStringBuf[cchString2 + 1]);
         PVBOXDISPIFESCAPE_DBGPRINT pCmd = (PVBOXDISPIFESCAPE_DBGPRINT)malloc(cbCmd);
         Assert(pCmd);
@@ -53 +55 @@
             pCmd->EscapeHdr.escapeCode = VBOXESC_DBGPRINT;
             pCmd->EscapeHdr.u32CmdSpecific = 0;
-            memcpy(pCmd->aStringBuf, pszString, cbString);
+            memcpy(pCmd->aStringBuf, pchString, cchString2);
+            pCmd->aStringBuf[cchString2] = '\0';
 
             D3DKMT_ESCAPE EscapeData;
@@ -76 +79 @@
 }
 
+
+DECLCALLBACK(void) VBoxDispMpLoggerLog(const char *pszString)
+{
+    VBoxDispMpLoggerLogN(pszString, strlen(pszString));
+}
+
+
 DECLCALLBACK(void) VBoxDispMpLoggerLogF(const char *pszFormat, ...)
 {
@@ -94 +104 @@
     VBoxDispMpLoggerLog(szBuffer);
 }
+
+
+/* Interface used for backdoor logging.  In no-CRT mode we will drag in IPRT
+   logging and it will be used on assertion in the no-CRT and IPRT code. */
+VBGLR3DECL(int) VbglR3WriteLog(const char *pch, size_t cch)
+{
+    VBoxDispMpLoggerLogN(pch, cch);
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -135 +155 @@
     VBoxDispMpLoggerLog(szBuffer);
 }
+