vbox的更動 46823 路徑 trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

時間撮記:

2013-6-27 上午09:37:07 (12 年 以前)

作者:

vboxsync

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

86765

訊息:

Main: fix breakage in previous client/server separation cleanup

檔案:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (修改) (5 筆差異)

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)