Changeset 82098 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 22, 2019 8:27:57 AM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: allow to dump surface content to a bitmap on non-Windows hosts

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -28 +28 @@
 #include <iprt/assert.h>
 #include <iprt/mem.h>
+#include <iprt/path.h>
 
 #include <VBox/vmm/pgm.h> /* required by DevVGA.h */
@@ -1798 +1799 @@
 #endif /* VMSVGA3D_DIRECT3D */
 
+#ifndef RT_OS_WINDOWS
+typedef uint16_t WORD;
+typedef uint32_t DWORD;
+typedef int32_t LONG;
+
+#pragma pack(2)
+typedef struct
+{
+    WORD    bfType;
+    DWORD   bfSize;
+    WORD    bfReserved1;
+    WORD    bfReserved2;
+    DWORD   bfOffBits;
+} BITMAPFILEHEADER, *PBITMAPFILEHEADER, *LPBITMAPFILEHEADER;
+
+typedef struct
+{
+    DWORD       biSize;
+    LONG        biWidth;
+    LONG        biHeight;
+    WORD        biPlanes;
+    WORD        biBitCount;
+    DWORD       biCompression;
+    DWORD       biSizeImage;
+    LONG        biXPelsPerMeter;
+    LONG        biYPelsPerMeter;
+    DWORD       biClrUsed;
+    DWORD       biClrImportant;
+} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
+#pragma pack()
+#endif
 
 static int vmsvga3dInfoBmpWrite(const char *pszFilename, const void *pvBits, int w, int h, uint32_t cbPixel, uint32_t u32Mask)
 {
-#ifdef RT_OS_WINDOWS
     if (   cbPixel != 4
         && cbPixel != 2
@@ -1814 +1845 @@
         return VERR_FILE_NOT_FOUND;
 
+#ifdef RT_OS_WINDOWS
     if (cbPixel == 4)
     {
@@ -1850 +1882 @@
     }
     else
+#endif
     {
         BITMAPFILEHEADER bf;
-        bf.bfType = 'MB';
+        bf.bfType = 0x4D42; //'MB'
         bf.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + cbBitmap;
         bf.bfReserved1 = 0;
@@ -1914 +1947 @@
 
     return VINF_SUCCESS;
-#else /* !RT_OS_WINDOWS */
-    RT_NOREF6(pszFilename, pvBits, w, h, cbPixel, u32Mask);
-    return VERR_NOT_SUPPORTED;
-#endif
 }
 
@@ -1933 +1962 @@
         char szFilepath[4096];
         RTStrPrintf(szFilepath, sizeof(szFilepath),
-                    "%s\\%s-%u-sid%u-%u%s.bmp",
+                    "%s" RTPATH_SLASH_STR "%s-%u-sid%u-%u%s.bmp",
                     pszPath, pszNamePrefix, u32Seq, pSurface->id, i, pszNameSuffix);