Changeset 46823 in vbox

Timestamp:

Jun 27, 2013 9:37:07 AM (11 years ago)

Author:

vboxsync

Message:

Main: fix breakage in previous client/server separation cleanup

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackManagerImpl.h (modified) (3 diffs)
• src-all/ExtPackManagerImpl.cpp (modified) (5 diffs)

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

@@ -23 +23 @@
 #include <iprt/fs.h>
 
+#if !defined(VBOX_COM_INPROC)
 /**
  * An extension pack file.
@@ -85 +86 @@
     friend class ExtPackManager;
 };
+#endif
 
 
@@ -215 +217 @@
     /** @name Internal interfaces used by other Main classes.
      * @{ */
+#if !defined(VBOX_COM_INPROC)
     static DECLCALLBACK(int) doInstallThreadProc(RTTHREAD hThread, void *pvJob);
     HRESULT     doInstall(ExtPackFile *a_pExtPackFile, bool a_fReplace, Utf8Str const *a_pstrDisplayInfo);
     static DECLCALLBACK(int) doUninstallThreadProc(RTTHREAD hThread, void *pvJob);
     HRESULT     doUninstall(const Utf8Str *a_pstrName, bool a_fForcedRemoval, const Utf8Str *a_pstrDisplayInfo);
+#endif
     void        callAllVirtualBoxReadyHooks(void);
     void        callAllConsoleReadyHooks(IConsole *a_pConsole);

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -2039 +2039 @@
 }
 
-#if !defined(VBOX_COM_INPROC)
 STDMETHODIMP ExtPackManager::OpenExtPackFile(IN_BSTR a_bstrTarballAndDigest, IExtPackFile **a_ppExtPackFile)
 {
@@ -2046 +2045 @@
     AssertReturn(m->enmContext == VBOXEXTPACKCTX_PER_USER_DAEMON, E_UNEXPECTED);
 
+#if !defined(VBOX_COM_INPROC)
     /* The API can optionally take a ::SHA-256=<hex-digest> attribute at the
        end of the file name.  This is just a temporary measure for
@@ -2069 +2069 @@
 
     return hrc;
+#else
+    return E_NOTIMPL;
+#endif
 }
 
@@ -2079 +2082 @@
     Assert(m->enmContext == VBOXEXTPACKCTX_PER_USER_DAEMON);
 
+#if !defined(VBOX_COM_INPROC)
     AutoCaller autoCaller(this);
     HRESULT hrc = autoCaller.rc();
@@ -2127 +2131 @@
 
     return hrc;
-}
+#else
+    return E_NOTIMPL;
 #endif
+}
 
 STDMETHODIMP ExtPackManager::Cleanup(void)