Changeset 66279 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Mar 28, 2017 7:23:33 AM (8 years ago)

Author:

vboxsync

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

114203

Message:

Main/Frontends/Installer: bugref:3300: tabs, spaces, doxygen

File:

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

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

@@ -1016 +1016 @@
  * @returns Windows error code (errors are rememberd in the state).
  * @param   pState              The registry modifier state.
+ * @param   pszModuleName       The module name.
  * @param   pszAppId            The application UUID string.
  * @param   pszDescription      The description string.
- * @param   bIsService          The application is windows service
- */
-LSTATUS VbpsRegisterAppId(
-    VBPSREGSTATE *pState, 
-    const char *pszModuleName, 
-    const char *pszAppId, 
-    const char *pszDescription, 
-    bool bIsService)
+ * @param   fIsService          The application is windows service
+ */
+LSTATUS VbpsRegisterAppId(VBPSREGSTATE *pState, const char *pszModuleName, const char *pszAppId,
+                          const char *pszDescription, bool fIsService)
 {
     LSTATUS rc;
@@ -1052 +1049 @@
         rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"AppID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
                              pState->fSamBoth, NULL /*pSecAttr*/, &hkeyAppIds, NULL /*pdwDisposition*/);
-
     else
     {
@@ -1067 +1063 @@
     }
 
-        if (pState->fUpdate)
+    if (pState->fUpdate)
+    {
+        vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyAppIds, pszAppId, pszDescription, __LINE__);
+
+        if (fIsService)
         {
-            //HKEY hkeyApp;
-            HKEY hkeyServiceExe;
-    
-            vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyAppIds, pszAppId, pszDescription, __LINE__);
-    
-            if (bIsService)
-            {
-                HKEY hkeyApp;
-
-                char szModule[MAX_PATH + 2];
-                size_t len = RTStrNLen(pszModuleName, MAX_PATH);
-                Assert(len);
-                Assert(len < MAX_PATH);
-                rc = RTStrCopy(szModule, sizeof(szModule), pszModuleName); 
-                AssertRC(rc);
-                szModule[len - 4] = '\0';
-
-                rc = RegOpenKeyExA(hkeyAppIds, pszAppId, 0 /*fOptions*/, pState->fSamBoth, &hkeyApp);
-                if (rc == ERROR_FILE_NOT_FOUND)
-                    return ERROR_SUCCESS;
-                // create the value "Service" with the service name
-                vbpsSetRegValueAA(pState, hkeyApp, "LocalService", szModule, __LINE__);
-                vbpsCloseKey(pState, hkeyApp, __LINE__);
-            }
-    
-            vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyAppIds, pszModuleName, "", __LINE__);
-            rc = RegOpenKeyExA(hkeyAppIds, pszModuleName, 0 /*fOptions*/, pState->fSamBoth, &hkeyServiceExe);
+            char szModule[MAX_PATH + 2];
+            size_t len = RTStrNLen(pszModuleName, MAX_PATH);
+            Assert(len);
+            Assert(len < MAX_PATH);
+            rc = RTStrCopy(szModule, sizeof(szModule), pszModuleName);
+            AssertRC(rc);
+            szModule[len - 4] = '\0';
+
+            HKEY hkeyApp;
+            rc = RegOpenKeyExA(hkeyAppIds, pszAppId, 0 /*fOptions*/, pState->fSamBoth, &hkeyApp);
             if (rc == ERROR_FILE_NOT_FOUND)
                 return ERROR_SUCCESS;
-            vbpsSetRegValueAA(pState, hkeyServiceExe, "AppID", pszAppId, __LINE__);
-            vbpsCloseKey(pState, hkeyServiceExe, __LINE__);
+            // create the value "Service" with the service name
+            vbpsSetRegValueAA(pState, hkeyApp, "LocalService", szModule, __LINE__);
+            vbpsCloseKey(pState, hkeyApp, __LINE__);
         }
+
+        vbpsCreateRegKeyWithDefaultValueAA(pState, hkeyAppIds, pszModuleName, "", __LINE__);
+
+        HKEY hkeyServiceExe;
+        rc = RegOpenKeyExA(hkeyAppIds, pszModuleName, 0 /*fOptions*/, pState->fSamBoth, &hkeyServiceExe);
+        if (rc == ERROR_FILE_NOT_FOUND)
+            return ERROR_SUCCESS;
+        vbpsSetRegValueAA(pState, hkeyServiceExe, "AppID", pszAppId, __LINE__);
+        vbpsCloseKey(pState, hkeyServiceExe, __LINE__);
+    }
 
     vbpsCloseKey(pState, hkeyAppIds, __LINE__);
@@ -1288 +1282 @@
 
             /* AppID = pszAppId */
-            if(pszAppId && fQuoteIt)
+            if (pszAppId && fQuoteIt)
                 vbpsSetRegValueAA(pState, hkeyClass, "AppID", pszAppId, __LINE__);
 
@@ -1339 +1333 @@
     const char *pszInprocDll = !fIs32On64 ? "VBoxC.dll" : "x86\\VBoxClient-x86.dll";
     const char *pszLocalServer      = "VBoxSVC.exe";
-        
+
     VbpsRegisterAppId(pState, pszLocalServer, pszAppId, "VirtualBox Application", false);