Changeset 48292 in vbox

Timestamp:

Sep 5, 2013 7:27:54 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: dumper fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_dump.h (modified) (4 diffs)
• state_tracker/dump.cpp (modified) (3 diffs)

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

@@ -32 +32 @@
 RT_C_DECLS_BEGIN
 
+#ifdef RT_OS_WINDOWS
 DECLEXPORT(void) crDmpDumpImgDmlBreak(struct CR_DUMPER * pDumper, CR_BLITTER_IMG *pImg, const char*pszEntryDesc);
 
 DECLEXPORT(void) crDmpDumpStrDbgPrint(struct CR_DUMPER * pDumper, const char*pszStr);
+#endif
 
 struct CR_DUMPER;
@@ -54 +56 @@
             (_pDumper)->pfnDumpStr((_pDumper), (_pDesc)); \
         } while (0)
+
+#ifndef RT_OS_WINDOWS
+# define vsprintf_s vsnprintf
+# define sprintf_s snprintf
+#endif
 
 DECLINLINE(void) crDmpStrV(CR_DUMPER *pDumper, const char *pszStr, va_list pArgList)
@@ -105 +112 @@
 DECLEXPORT(int) crDmpHtmlInit(struct CR_HTML_DUMPER * pDumper, const char *pszDir, const char *pszFile);
 
+#ifdef RT_OS_WINDOWS
 DECLINLINE(void) crDmpDbgPrintInit(CR_DBGPRINT_DUMPER *pDumper)
 {
@@ -110 +118 @@
     pDumper->Base.pfnDumpStr = crDmpDumpStrDbgPrint;
 }
+#endif
 
 typedef struct CR_RECORDER

trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump.cpp

@@ -555 +555 @@
     *pNewLine = '\0';
     *pcbStr = cbStr - (((uintptr_t)pNewLine) - ((uintptr_t)pszStr)) - 1;
-    Assert((*pcbStr) >= 0);
+    Assert((*pcbStr) < UINT32_MAX/2);
     Assert((*pcbStr) < cbStr);
     *ppszStr = pNewLine + 1;
@@ -1421 +1421 @@
 }
 
+#ifdef RT_OS_WINDOWS
 static void crDmpPrint(const char* szString, ...)
 {
@@ -1454 +1455 @@
     OutputDebugStringA(pszStr);
 }
+#endif
 
 static void crDmpHtmlDumpStrExact(struct CR_HTML_DUMPER * pDumper, const char *pszStr)