Changeset 62847 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2016 9:27:18 PM (8 years ago)

Author:

vboxsync

Message:

VbglR3GuestCtrlFileGetWriteAt: Fixed bug where the offset output parameter wasn't set, causing the caller (vgsvcGstCtrlSessionHandleFileWriteAt) to pass random stack garbage to RTFileWriteAt. (My guess is that we don't really use thie method, as we should've noticed this already.) New MSC warnings founds this problem.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (10 diffs)
• crOpenGL/load.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -736 +736 @@
                                            char     *pszSharing,       uint32_t cbSharing,
                                            uint32_t *puCreationMode,
-                                           uint64_t *puOffset)
+                                           uint64_t *poffAt)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -750 +750 @@
     AssertReturn(cbSharing, VERR_INVALID_PARAMETER);
     AssertPtrReturn(puCreationMode, VERR_INVALID_POINTER);
-    AssertPtrReturn(puOffset, VERR_INVALID_POINTER);
+    AssertPtrReturn(poffAt, VERR_INVALID_POINTER);
 
     HGCMMsgFileOpen Msg;
@@ -779 +779 @@
             Msg.context.GetUInt32(&pCtx->uContextID);
             Msg.creationmode.GetUInt32(puCreationMode);
-            Msg.offset.GetUInt64(puOffset);
+            Msg.offset.GetUInt64(poffAt);
         }
     }
@@ -861 +861 @@
 
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetReadAt(PVBGLR3GUESTCTRLCMDCTX pCtx,
-                                             uint32_t *puHandle, uint32_t *puToRead, uint64_t *puOffset)
+                                             uint32_t *puHandle, uint32_t *puToRead, uint64_t *poffAt)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -893 +893 @@
             Msg.context.GetUInt32(&pCtx->uContextID);
             Msg.handle.GetUInt32(puHandle);
-            Msg.offset.GetUInt64(puOffset);
+            Msg.offset.GetUInt64(poffAt);
             Msg.size.GetUInt32(puToRead);
         }
@@ -944 +944 @@
 
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetWriteAt(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle,
-                                              void *pvData, uint32_t cbData, uint32_t *pcbSize, uint64_t *puOffset)
+                                              void *pvData, uint32_t cbData, uint32_t *pcbSize, uint64_t *poffAt)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -980 +980 @@
             Msg.handle.GetUInt32(puHandle);
             Msg.size.GetUInt32(pcbSize);
+            Msg.offset.GetUInt64(poffAt);
         }
     }
@@ -987 +988 @@
 
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetSeek(PVBGLR3GUESTCTRLCMDCTX pCtx,
-                                           uint32_t *puHandle, uint32_t *puSeekMethod, uint64_t *puOffset)
+                                           uint32_t *puHandle, uint32_t *puSeekMethod, uint64_t *poffAt)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -994 +995 @@
     AssertPtrReturn(puHandle, VERR_INVALID_POINTER);
     AssertPtrReturn(puSeekMethod, VERR_INVALID_POINTER);
-    AssertPtrReturn(puOffset, VERR_INVALID_POINTER);
+    AssertPtrReturn(poffAt, VERR_INVALID_POINTER);
 
     HGCMMsgFileSeek Msg;
@@ -1021 +1022 @@
             Msg.handle.GetUInt32(puHandle);
             Msg.method.GetUInt32(puSeekMethod);
-            Msg.offset.GetUInt64(puOffset);
+            Msg.offset.GetUInt64(poffAt);
         }
     }

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -32 +32 @@
 #include <D3dumddi.h>
 #include "../../WINNT/Graphics/Video/common/wddm/VBoxMPIf.h"
+#endif
+
+#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
+# include <VBox/VBoxCrHgsmi.h>
 #endif