Changeset 42358 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 24, 2012 12:35:19 PM (12 years ago)

Author:

vboxsync

Message:

build fix

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• include/GuestProcessImpl.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)
• src-client/GuestProcessImpl.cpp (modified) (2 diffs)

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

@@ -173 +173 @@
     GuestProcessWaitResult GetResult(void) { return mWaitResult; }
 
-    int Signal(ProcessWaitResult enmResult, int rc = VINF_SUCCESS);
+    int Signal(ProcessWaitResult_T enmResult, int rc = VINF_SUCCESS);
 
 protected:

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

@@ -94 +94 @@
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, ULONG *pcbList, ULONG *pcEnvVars);
     int sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
-    int signalWaiters(ProcessWaitResult enmWaitResult, int rc = VINF_SUCCESS);
+    int signalWaiters(ProcessWaitResult_T enmWaitResult, int rc = VINF_SUCCESS);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
     /** @}  */

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

@@ -63 +63 @@
     }
 
-    LogFlowThisFuncLeaveRC(rc);
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -120 +120 @@
 
 GuestCtrlCallback::GuestCtrlCallback(void)
-    : mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
-      uFlags(0),
-      pvData(NULL),
-      cbData(0)
+    : pvData(NULL),
+      cbData(0),
+     mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
+      uFlags(0)
 {
 }
 
 GuestCtrlCallback::GuestCtrlCallback(eVBoxGuestCtrlCallbackType enmType)
-    : mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
-      uFlags(0),
-      pvData(NULL),
-      cbData(0)
+    : pvData(NULL),
+      cbData(0),
+      mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
+      uFlags(0)
 {
     int rc = Init(enmType);
@@ -234 +234 @@
 }
 
-int GuestProcessEvent::Signal(ProcessWaitResult enmResult, int rc /*= VINF_SUCCESS*/)
+int GuestProcessEvent::Signal(ProcessWaitResult_T enmResult, int rc /*= VINF_SUCCESS*/)
 {
     mWaitResult.mRC = rc;

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

@@ -544 +544 @@
 
     BOOL fSignal = FALSE;
-    ProcessWaitResult enmWaitResult;
+    ProcessWaitResult_T enmWaitResult;
     uint32_t uWaitFlags = mData.mWaitEvent
                         ? mData.mWaitEvent->GetWaitFlags() : 0;
@@ -762 +762 @@
 }
 
-int GuestProcess::signalWaiters(ProcessWaitResult enmWaitResult, int rc /*= VINF_SUCCESS*/)
+int GuestProcess::signalWaiters(ProcessWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS*/)
 {
     LogFlowFunc(("enmWaitResult=%d, rc=%Rrc, mWaitCount=%RU32, mWaitEvent=%p\n",