Changeset 98371 in vbox

Timestamp:

Jan 31, 2023 6:12:13 PM (22 months ago)

Author:

vboxsync

Message:

FE/SDL: bugref:9449. Some cleanup for MacOS build. Still getting some compilation errors in objective-c files.

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (1 diff)
• VBoxSDL.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -336 +336 @@
         return E_POINTER;
 #ifdef RT_OS_DARWIN
-    if (mWinId == NULL) /* (In case it failed the first time.) */
+    if (mWinId == 0) /* (In case it failed the first time.) */
         mWinId = (intptr_t)VBoxSDLGetDarwinWindowId();
 #endif

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -203 +203 @@
 static BOOL gfGuestScrollLockPressed = FALSE;
 static BOOL gfACPITerm = FALSE;
-static BOOL gfXCursorEnabled = FALSE;
+#if defined(VBOXSDL_WITH_X11) && !defined(VBOX_WITHOUT_XCURSOR)
+ static BOOL gfXCursorEnabled = FALSE;
+#endif
 static int  gcGuestNumLockAdaptions = 2;
 static int  gcGuestCapsLockAdaptions = 2;
@@ -3544 +3546 @@
         bool ok = false;
 
-        uint32_t andMaskSize = (data->width + 7) / 8 * data->height;
-        uint32_t srcShapePtrScan = data->width * 4;
-
-        const uint8_t* shape = data->shape.raw();
-        const uint8_t *srcAndMaskPtr = shape;
-        const uint8_t *srcShapePtr = shape + ((andMaskSize + 3) & ~3);
-
 #if 0
         /* pointer debugging code */
@@ -3570 +3565 @@
 
 #if defined(RT_OS_WINDOWS)
-
+        uint32_t srcShapePtrScan = data->width * 4;
+        const uint8_t *srcAndMaskPtr = shape;
+        const uint8_t *srcShapePtr = shape + ((andMaskSize + 3) & ~3);
+        uint32_t andMaskSize = (data->width + 7) / 8 * data->height;
+        const uint8_t* shape = data->shape.raw();
         BITMAPV5HEADER bi;
         HBITMAP hBitmap;