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

Timestamp:

Jul 10, 2012 12:58:13 PM (12 years ago)

Author:

vboxsync

Message:

Build fix.

Location:

trunk/src/VBox/Main

Files:

• include/GuestFileImpl.h (modified) (1 diff)
• include/GuestFsObjInfoImpl.h (modified) (1 diff)
• include/GuestProcessImpl.h (modified) (1 diff)
• src-client/GuestDirectoryImpl.cpp (modified) (1 diff)
• src-client/GuestFileImpl.cpp (modified) (1 diff)
• src-client/GuestFsObjInfoImpl.cpp (modified) (2 diffs)
• src-client/GuestProcessImpl.cpp (modified) (2 diffs)

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

@@ -60 +60 @@
     STDMETHOD(Read)(ULONG aToRead, ULONG *aRead, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(ReadAt)(LONG64 aOffset, ULONG aToRead, ULONG *aRead, ComSafeArrayOut(BYTE, aData));
-    STDMETHOD(Seek)(LONG64 aOffset, FileSeekType aType);
-    STDMETHOD(SetACL)(BSTR aACL);
+    STDMETHOD(Seek)(LONG64 aOffset, FileSeekType_T aType);
+    STDMETHOD(SetACL)(IN_BSTR aACL);
     STDMETHOD(Write)(ComSafeArrayIn(BYTE, aData), ULONG *aWritten);
     STDMETHOD(WriteAt)(LONG64 aOffset, ComSafeArrayIn(BYTE, aData), ULONG *aWritten);

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

@@ -64 +64 @@
     STDMETHOD(COMGETTER(NodeIDDevice))(ULONG *aNodeIDDevice);
     STDMETHOD(COMGETTER(ObjectSize))(ULONG *aObjectSize);
-    STDMETHOD(COMGETTER(Type))(FsObjType *aType);
+    STDMETHOD(COMGETTER(Type))(FsObjType_T *aType);
     STDMETHOD(COMGETTER(UID))(ULONG *aUID);
     STDMETHOD(COMGETTER(UserFlags))(ULONG *aUserFlags);

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

@@ -53 +53 @@
     STDMETHOD(COMGETTER(ExitCode))(LONG *aExitCode);
     STDMETHOD(COMGETTER(PID))(ULONG *aPID);
-    STDMETHOD(COMGETTER(Status))(ProcessStatus *aStatus);
+    STDMETHOD(COMGETTER(Status))(ProcessStatus_T *aStatus);
 
     STDMETHOD(Read)(ULONG aHandle, ULONG aSize, ULONG aTimeoutMS, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(Terminate)(void);
-    STDMETHOD(WaitFor)(ComSafeArrayOut(ProcessWaitForFlag, aFlags), ULONG aTimeoutMS, ProcessWaitReason *aReason);
+    STDMETHOD(WaitFor)(ComSafeArrayOut(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitReason_T *aReason);
     STDMETHOD(Write)(ULONG aHandle, ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
     /** @}  */

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

@@ -35 +35 @@
 DEFINE_EMPTY_CTOR_DTOR(GuestDirectory)
 
-HRESULT GuestDirectory::FinalConstruct()
+HRESULT GuestDirectory::FinalConstruct(void)
 {
     LogFlowThisFunc(("\n"));

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

@@ -180 +180 @@
 }
 
-STDMETHODIMP GuestFile::Seek(LONG64 aOffset, FileSeekType aType)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFile::SetACL(BSTR aACL)
+STDMETHODIMP GuestFile::Seek(LONG64 aOffset, FileSeekType_T aType)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    ReturnComNotImplemented();
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFile::SetACL(IN_BSTR aACL)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL

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

@@ -35 +35 @@
 DEFINE_EMPTY_CTOR_DTOR(GuestFsObjInfo)
 
-HRESULT GuestFsObjInfo::FinalConstruct()
+HRESULT GuestFsObjInfo::FinalConstruct(void)
 {
     LogFlowThisFunc(("\n"));
@@ -254 +254 @@
 }
 
-STDMETHODIMP GuestFsObjInfo::COMGETTER(Type)(FsObjType *aType)
+STDMETHODIMP GuestFsObjInfo::COMGETTER(Type)(FsObjType_T *aType)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL

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

@@ -143 +143 @@
 }
 
-STDMETHODIMP GuestProcess::COMGETTER(Status)(ProcessStatus *aStatus)
+STDMETHODIMP GuestProcess::COMGETTER(Status)(ProcessStatus_T *aStatus)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -182 +182 @@
 }
 
-STDMETHODIMP GuestProcess::WaitFor(ComSafeArrayOut(ProcessWaitForFlag, aFlags), ULONG aTimeoutMS, ProcessWaitReason *aReason)
+STDMETHODIMP GuestProcess::WaitFor(ComSafeArrayOut(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitReason_T *aReason)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL