Changeset 49790 in vbox for trunk/src

Timestamp:

Dec 5, 2013 1:08:04 PM (11 years ago)

Author:

vboxsync

Message:

Main: unsigned width/height

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (3 diffs)
• src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -85 +85 @@
         uint32_t bpp;
         uint32_t cbLine;
-        int w;
-        int h;
+        uint32_t w;
+        uint32_t h;
         uint16_t flags;
     } pendingResize;
@@ -143 +143 @@
 
     // public methods only for internal purposes
-    int  handleDisplayResize(unsigned uScreenId, uint32_t bpp, void *pvVRAM, uint32_t cbLine, int w, int h, uint16_t flags);
+    int  handleDisplayResize(unsigned uScreenId, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t w, uint32_t h, uint16_t flags);
     void handleDisplayUpdateLegacy(int x, int y, int cx, int cy);
     void handleDisplayUpdate(unsigned uScreenId, int x, int y, int w, int h);
@@ -268 +268 @@
     uint32_t    mLastBytesPerLine;
     uint32_t    mLastBitsPerPixel;
-    int         mLastWidth;
-    int         mLastHeight;
+    uint32_t    mLastWidth;
+    uint32_t    mLastHeight;
     uint16_t    mLastFlags;
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -634 +634 @@
                                   ULONG pixelFormat, void *pvVRAM,
                                   uint32_t bpp, uint32_t cbLine,
-                                  int w, int h)
+                                  uint32_t w, uint32_t h)
 {
     Assert (pFramebuffer);
@@ -666 +666 @@
  */
 int Display::handleDisplayResize (unsigned uScreenId, uint32_t bpp, void *pvVRAM,
-                                  uint32_t cbLine, int w, int h, uint16_t flags)
+                                  uint32_t cbLine, uint32_t w, uint32_t h, uint16_t flags)
 {
     LogRel(("Display::handleDisplayResize(): uScreenId = %d, pvVRAM=%p "
@@ -3239 +3239 @@
         AssertComRC (rc);
 
-        if (   (width != mLastWidth && mLastWidth != 0)
+        if (   (width  != mLastWidth  && mLastWidth != 0)
             || (height != mLastHeight && mLastHeight != 0))
         {