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

Timestamp:

Sep 5, 2013 11:07:08 AM (12 years ago)

Author:

vboxsync

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

88716

Message:

SessionImpl.cpp: VBoxClient-x86.so fixes.

Location:

trunk/src/VBox/Main

Files:

• src-client/SessionImpl.cpp (modified) (12 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -289 +289 @@
 
 #else  /* VBOX_COM_INPROC_API_CLIENT */
+    AssertFailed();
     return VBOX_E_INVALID_OBJECT_STATE;
 #endif /* VBOX_COM_INPROC_API_CLIENT */
@@ -322 +323 @@
     }
 
-    HRESULT rc = E_FAIL;
-
     /* query IInternalMachineControl interface */
     mControl = aMachine;
@@ -329 +328 @@
 
 #ifndef VBOX_COM_INPROC_API_CLIENT
-    rc = mConsole.createObject();
+    HRESULT rc = mConsole.createObject();
     AssertComRCReturn(rc, rc);
 
     rc = mConsole->init(aMachine, mControl, aLockType);
     AssertComRCReturn(rc, rc);
+#else
+    HRESULT rc = S_OK;
+    mRemoteMachine = aMachine;
 #endif
 
@@ -900 +902 @@
                                           BOOL aIsSetter, BSTR *aRetValue, LONG64 *aRetTimestamp, BSTR *aRetFlags)
 {
-#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_COM_INPROC_API_CLIENT)
+#ifdef VBOX_WITH_GUEST_PROPS
+# ifndef VBOX_COM_INPROC_API_CLIENT
     AutoCaller autoCaller(this);
     AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
@@ -932 +935 @@
     else
         return mConsole->setGuestProperty(aName, aValue, aFlags);
-#else /* VBOX_WITH_GUEST_PROPS not defined */
+
+# else  /* VBOX_COM_INPROC_API_CLIENT */
+    /** @todo This is nonsense, non-VM API users shouldn't need to deal with this
+     *        method call, VBoxSVC should be clever enough to see that the
+     *        session doesn't have a console! */
+    return E_ACCESSDENIED;
+# endif /* VBOX_COM_INPROC_API_CLIENT */
+
+#else  /* VBOX_WITH_GUEST_PROPS */
     ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_PROPS not defined */
+#endif /* VBOX_WITH_GUEST_PROPS */
 }
 
@@ -998 +1009 @@
                                        aProgress);
 #else
+    AssertFailed();
     return E_NOTIMPL;
 #endif
@@ -1017 +1029 @@
     return S_OK;
 #else
+    AssertFailed();
     return E_NOTIMPL;
 #endif
@@ -1034 +1047 @@
     return mConsole->pause(aReason);
 #else
+    AssertFailed();
     return E_NOTIMPL;
 #endif
@@ -1051 +1065 @@
     return mConsole->resume(aReason);
 #else
+    AssertFailed();
     return E_NOTIMPL;
 #endif
@@ -1068 +1083 @@
     return mConsole->saveState(aReason, aProgress);
 #else
+    AssertFailed();
     return E_NOTIMPL;
 #endif
@@ -1131 +1147 @@
             mConsole.setNull();
         }
+#else
+        mRemoteMachine.setNull();
 #endif
     }
@@ -1136 +1154 @@
     {
         mRemoteMachine.setNull();
-#ifndef VBOX_COM_INPROC_API_CLIENT
         mRemoteConsole.setNull();
-#endif
     }
 

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5935 +5935 @@
      * silly race condition. */
 
+    /** @todo This code is bothering API clients (like python script clients) with
+     *        the AccessGuestProperty call, creating unncessary IPC.  Need to
+     *        have a way of figuring out which kind of direct session it is... */
     if (!directControl)
         rc = E_ACCESSDENIED;