Changeset 44869 in vbox for trunk/src/VBox

Timestamp:

Feb 28, 2013 3:42:02 PM (12 years ago)

Author:

vboxsync

Message:

Build fix.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• Additions/common/VBoxService/VBoxServiceControl.h (modified) (2 diffs)
• Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)
• HostServices/GuestControl/service.cpp (modified) (2 diffs)
• Main/src-client/GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -455 +455 @@
         PVBOXSERVICECTRLREQUEST pRequest;
         rc = GstCntlProcessRequestAllocEx(&pRequest, VBOXSERVICECTRLREQUEST_PROC_TERM,
-                                          NULL /* pvBuf */, NULL /* cbBuf */, pHostCtx->uContextID);
+                                          NULL /* pvBuf */, 0 /* cbBuf */, pHostCtx->uContextID);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -228 +228 @@
      *  @todo Would be nice to have a RTListGetAnchor(). */
     PRTLISTANCHOR                   pAnchor;
-    /** Node to global guest control file list.
+    /** Node to global guest control file list. */
     /** @todo Use a map later? */
     RTLISTNODE                      Node;
@@ -266 +266 @@
 typedef struct VBOXSERVICECTRLSESSION
 {
-    /** Node to global guest control session list.
+    /** Node to global guest control session list. */
     /** @todo Use a map later? */
     RTLISTNODE                      Node;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -47 +47 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-int                         gstcntlSessionFileDestroy(PVBOXSERVICECTRLFILE pFile);
-int                         gstcntlSessionForkShutdown(uint32_t uClientId, uint32_t cParms);
+static int                  gstcntlSessionFileDestroy(PVBOXSERVICECTRLFILE pFile);
+static int                  gstcntlSessionForkShutdown(uint32_t uClientId, uint32_t cParms);
 static PVBOXSERVICECTRLFILE gstcntlSessionGetFile(uint32_t uHandle);
 static int                  gstcntlSessionHandleFileOpen(uint32_t uClientId, uint32_t cParms);
@@ -970 +970 @@
 }
 
-int gstcntlSessionForkShutdown(uint32_t uClientId, uint32_t cParms)
+static int gstcntlSessionForkShutdown(uint32_t uClientId, uint32_t cParms)
 {
     VBoxServiceVerbose(0, "Session %RU32 is going to shutdown ...\n", g_uSessionID);

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -409 +409 @@
 typedef struct ClientState
 {
+    ClientState(void)
+        : mSvcHelpers(NULL), 
+          mFlags(0), mContextFilter(0), 
+          mpHostCmd(NULL), mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
+          mIsPending(false) {}
+
     ClientState(PVBOXHGCMSVCHELPERS pSvcHelpers)
-        : mSvcHelpers(pSvcHelpers), mpHostCmd(NULL),
-          mFlags(0), mContextFilter(0), mIsPending(false),
-          mHostCmdTries(0), mHostCmdRc(VINF_SUCCESS) {}
-
-    ClientState(void)
-        : mSvcHelpers(NULL), mpHostCmd(NULL),
-          mFlags(0), mContextFilter(0), mIsPending(false),
-          mHostCmdTries(0), mHostCmdRc(VINF_SUCCESS) {}
+        : mSvcHelpers(pSvcHelpers), 
+          mFlags(0), mContextFilter(0), 
+          mpHostCmd(NULL), mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
+          mIsPending(false) {}
 
     bool WantsHostCommand(const HostCommand *pHostCmd) const
@@ -913 +915 @@
                 itContext++;
             }
-            itClientState = mClientStateMap.erase(itClientState);
+            mClientStateMap.erase(itClientState++);
         }
         else

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

@@ -1 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - XXX.
+ * VirtualBox Main - Guest session tasks.
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -139 +138 @@
 HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg)
 {
-    LogFlowFunc(("mProgress=%p, hr=%Rhrc, strMsg=%s\n",
-                 mProgress, hr, strMsg.c_str()));
+    LogFlowFunc(("hr=%Rhrc, strMsg=%s\n",
+                 hr, strMsg.c_str()));
 
     if (mProgress.isNull()) /* Progress is optional. */