Changeset 53849 in vbox

Timestamp:

Jan 16, 2015 9:34:59 AM (10 years ago)

Author:

vboxsync

Message:

Attempt to fix Windows burns.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (2 diffs)

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

@@ -170 +170 @@
     void i_handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp);
     void i_handleVRecCompletion();
-    HRESULT notifyScaleFactorChange(uint32_t uScreen, uint32_t u32ScaleFactorWMultiplied, uint32_t u32ScaleFactorHMultiplied);
+    HRESULT notifyScaleFactorChange(ULONG uScreen, ULONG u32ScaleFactorWMultiplied, ULONG u32ScaleFactorHMultiplied);
 #endif
 

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

@@ -3400 +3400 @@
 }
 
-HRESULT Display::notifyScaleFactorChange(uint32_t uScreen, uint32_t u32ScaleFactorWMultiplied, uint32_t u32ScaleFactorHMultiplied)
+HRESULT Display::notifyScaleFactorChange(ULONG uScreen, ULONG u32ScaleFactorWMultiplied, ULONG u32ScaleFactorHMultiplied)
 {
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
@@ -3424 +3424 @@
                     int rc;
 
-                    pData->u32Screen                 = uScreen;
-                    pData->u32ScaleFactorWMultiplied = u32ScaleFactorWMultiplied;
-                    pData->u32ScaleFactorHMultiplied = u32ScaleFactorHMultiplied;
+                    pData->u32Screen                 = (uint32_t)uScreen;
+                    pData->u32ScaleFactorWMultiplied = (uint32_t)u32ScaleFactorWMultiplied;
+                    pData->u32ScaleFactorHMultiplied = (uint32_t)u32ScaleFactorHMultiplied;
 
                     pCtl->Hdr.enmType              = VBOXCRCMDCTL_TYPE_HGCM;