Changeset 59391 in vbox

Timestamp:

Jan 19, 2016 1:38:54 AM (9 years ago)

Author:

vboxsync

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

105088

Message:

VBoxProxyStub.c: Ignore NdrDllUnregisterProxy return value REGDB_E_INVALIDVALUE.

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (3 diffs)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -540 +540 @@
         if (pState->fSamUpdate)
             rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                                 pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyClsidRootDst, NULL /*pdwDisposition*/);
+                                 pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyInterfaceRootDst, NULL /*pdwDisposition*/);
         else
             rc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*fOptions*/, pState->fSamBoth,
@@ -1313 +1313 @@
         {
             RTUTF16 wszBuf[MAX_PATH * 2];
+#if 0
             size_t  off;
+#endif
 
             /* {UUID}/Major.Minor/0. */
@@ -2182 +2184 @@
     hrc2 = NdrDllUnregisterProxy(g_hDllSelf, &g_apProxyFiles[0], &g_ProxyClsId);      /* see DLLREGISTRY_ROUTINES in RpcProxy.h */
     AssertMsgStmt(   SUCCEEDED(hrc2)
-                  || hrc2 == MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_FILE_NOT_FOUND),
+                  || hrc2 == MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_FILE_NOT_FOUND)
+                  || hrc2 == REGDB_E_INVALIDVALUE,
                   ("%Rhrc\n", hrc2), if (SUCCEEDED(hrc)) hrc = hrc2);