Changeset 42702 in vbox

Timestamp:

Aug 9, 2012 6:11:32 AM (13 years ago)

Author:

vboxsync

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

79908

Message:

Main/GuestSession: build fix (please review).

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (2 diffs)
• src-client/GuestSessionImpl.cpp (modified) (1 diff)
• src-client/RemoteEmulatedUSBDeviceImpl.cpp (copied) (copied from trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp )

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

@@ -71 +71 @@
 
     SessionTaskCopyTo(GuestSession *pSession,
-                      PRTFILE pSourceFile, size_t cbSourceOffset, size_t cbSourceSize,
+                      PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize,
                       const Utf8Str &strDest, uint32_t uFlags);
 

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

@@ -725 +725 @@
 
         if (   pCallbackData->u32Status == PROC_STS_ERROR
-            && pCallbackData->u32Flags  == VERR_TOO_MUCH_DATA)
+            && ((int)pCallbackData->u32Flags)  == VERR_TOO_MUCH_DATA)
         {
             LogFlowFunc(("Requested command with too much data, skipping dispatching ...\n"));
@@ -2702 +2702 @@
     else
     {
-        AssertPtr(!pSession.isNull());
+        Assert(!pSession.isNull());
         rc = pSession->queryInfo();
         if (RT_FAILURE(rc))

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

@@ -134 +134 @@
 SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession,
                                      const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags)
-                                     : mSourceFile(NULL),
+                                     : mSource(strSource),
+                                       mDest(strDest),
+                                       mSourceFile(NULL),
                                        mSourceOffset(0),
                                        mSourceSize(0),
                                        GuestSessionTask(pSession)
 {
-    mSource = strSource;
-    mDest   = strDest;
     mCopyFileFlags = uFlags;
 }