Changeset 143 in vbox for trunk

Timestamp:

Jan 18, 2007 3:44:52 PM (18 years ago)

Author:

vboxsync

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

17594

Message:

64-bit

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (7 diffs)
• Framebuffer.h (modified) (1 diff)
• Helper.cpp (modified) (1 diff)

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

@@ -71 +71 @@
  * @param fResizable     flag whether the SDL window should be resizable
  * @param fShowSDLConfig flag whether we print out SDL settings
- * @param ulFixedWith    fixed SDL width (~0 means not set)
- * @param ulFixedHeight  fixed SDL height (~0 means not set)
+ * @param iFixedWidth   fixed SDL width (-1 means not set)
+ * @param iFixedHeight  fixed SDL height (-1 means not set)
  */
 VBoxSDLFB::VBoxSDLFB(bool fFullscreen, bool fResizable, bool fShowSDLConfig,
-                     int ulFixedWidth, int ulFixedHeight, int ulFixedBPP)
+                     uint32_t u32FixedWidth, uint32_t u32FixedHeight, uint32_t u32FixedBPP)
 {
     int rc;
@@ -91 +91 @@
     mfResizable     = fResizable;
     mfShowSDLConfig = fShowSDLConfig;
-    mFixedSDLWidth  = ulFixedWidth;
-    mFixedSDLHeight = ulFixedHeight;
-    mFixedSDLBPP    = ulFixedBPP;
+    mFixedSDLWidth  = u32FixedWidth;
+    mFixedSDLHeight = u32FixedHeight;
+    mFixedSDLBPP    = u32FixedBPP;
     mCenterXOffset  = 0;
     mCenterYOffset  = 0;
@@ -506 +506 @@
 
     /* are constraints set? */
-    if (   (   (mMaxScreenWidth != ~0UL)
+    if (   (   (mMaxScreenWidth != ~(uint32_t)0)
             && (width > mMaxScreenWidth)
-        || (   (mMaxScreenHeight != ~0UL)
+        || (   (mMaxScreenHeight != ~(uint32_t)0)
             && (height > mMaxScreenHeight))))
     {
@@ -677 +677 @@
     {
         /* no restriction */
-        mMaxScreenWidth  = ~0;
-        mMaxScreenHeight = ~0;
+        mMaxScreenWidth  = ~(uint32_t)0;
+        mMaxScreenHeight = ~(uint32_t)0;
     }
 
@@ -689 +689 @@
 
     /* we either have a fixed SDL resolution or we take the guest's */
-    if (mFixedSDLWidth != ~0U)
+    if (mFixedSDLWidth != ~(uint32_t)0)
     {
         newWidth  = mFixedSDLWidth;
@@ -718 +718 @@
      * code will try again with the original guest resolution.
      */
-    if (mFixedSDLWidth == ~0U)
+    if (mFixedSDLWidth == ~(uint32_t)0)
     {
         /* if it didn't work, then we have to go for the original resolution and paint over the guest */
@@ -1218 +1218 @@
     if (!address)
         return E_INVALIDARG;
-    *address = (ULONG) mOverlayBits->pixels;
+    *address = (uintptr_t) mOverlayBits->pixels;
     return S_OK;
 }

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

@@ -49 +49 @@
 public:
     VBoxSDLFB(bool fFullscreen = false, bool fResizable = true, bool fShowSDLConfig = false,
-              int ulFixedWidth = ~0, int ulFixedHeight = ~0, int ulFixedBPP = ~0);
+              uint32_t u32FixedWidth = ~(uint32_t)0, uint32_t u32FixedHeight = ~(uint32_t)0, uint32_t u32FixedBPP = ~(uint32_t)0);
     virtual ~VBoxSDLFB();
 

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

@@ -53 +53 @@
 DECLCALLBACK(int) xpcomEventThread(RTTHREAD thread, void *pvUser)
 {
-    int eqFD = (int)pvUser;
+    int eqFD = (intptr_t)pvUser;
     unsigned cErrors = 0;
     int rc;