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

Timestamp:

Feb 28, 2011 2:34:48 PM (14 years ago)

Author:

vboxsync

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

70255

Message:

Build fix.

Location:

trunk/src/VBox/Main

Files:

• include/GuestImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (5 diffs)

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

@@ -94 +94 @@
     STDMETHOD(GetProcessOutput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, LONG64 aSize, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
-    STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ExecuteProcessStatus *aStatus);
+    STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ExecuteProcessStatus_T *aStatus);
     STDMETHOD(CopyToGuest)(IN_BSTR aSource, IN_BSTR aDest, IN_BSTR aUserName, IN_BSTR aPassword, ULONG aFlags, IProgress **aProgress);
     STDMETHOD(CreateDirectory)(IN_BSTR aDirectory, IN_BSTR aUserName, IN_BSTR aPassword, ULONG aMode, ULONG aFlags, IProgress **aProgress);

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

@@ -379 +379 @@
                              * canceled or we simply got all stuff transferred.
                              */
-                            ExecuteProcessStatus retStatus;
+                            ExecuteProcessStatus_T retStatus;
                             ULONG uRetExitCode;
                             rc = pGuest->waitForProcessStatusChange(uPID, &retStatus, &uRetExitCode, 10 * 1000 /* 10s timeout. */);
@@ -787 +787 @@
                     }
 
-                    ExecuteProcessStatus retStatus;
+                    ExecuteProcessStatus_T retStatus;
                     ULONG uRetExitCode, uRetFlags;
                     rc = pGuest->GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &retStatus);
@@ -1427 +1427 @@
 }
 
-HRESULT Guest::waitForProcessStatusChange(ULONG uPID, ExecuteProcessStatus *pRetStatus, ULONG *puRetExitCode, ULONG uTimeoutMS)
+HRESULT Guest::waitForProcessStatusChange(ULONG uPID, ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode, ULONG uTimeoutMS)
 {
     AssertPtr(pRetStatus);
@@ -2202 +2202 @@
 }
 
-STDMETHODIMP Guest::GetProcessStatus(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ExecuteProcessStatus *aStatus)
+STDMETHODIMP Guest::GetProcessStatus(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ExecuteProcessStatus_T *aStatus)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2442 +2442 @@
             if (fCompleted)
             {
-                ExecuteProcessStatus retStatus;
+                ExecuteProcessStatus_T retStatus;
                 ULONG uRetExitCode, uRetFlags;
                 if (SUCCEEDED(rc))