Changeset 108458 in vbox for trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

Timestamp:

Mar 5, 2025 4:57:50 PM (2 months ago)

Author:

vboxsync

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

167832

Message:

Windows host installer: Internal NetCfg functions renaming to match the rest. bugref:10873

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (16 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -1730 +1730 @@
 }
 
-static DECLCALLBACK(void) netCfgLoggerCallback(const char *pszString)
-{
-    if (g_hCurrentModule)
-        logStringF(g_hCurrentModule, "%s", pszString);
-}
-
-static VOID netCfgLoggerDisable()
-{
-    if (g_hCurrentModule)
-    {
-        VBoxNetCfgWinSetLogging(NULL);
-        g_hCurrentModule = NULL;
-    }
-}
-
-static VOID netCfgLoggerEnable(MSIHANDLE hModule)
-{
-    NonStandardAssert(hModule);
-
-    if (g_hCurrentModule)
-        netCfgLoggerDisable();
-
-    g_hCurrentModule = hModule;
-
-    VBoxNetCfgWinSetLogging(netCfgLoggerCallback);
-    /* uncomment next line if you want to add logging information from VBoxDrvCfg.cpp */
-//    VBoxDrvCfgLoggerSet(vboxDrvLoggerCallback, NULL);
-}
-
 static UINT errorConvertFromHResult(MSIHANDLE hModule, HRESULT hr)
 {
@@ -1785 +1756 @@
 }
 
-static MSIHANDLE createNetCfgLockedMsgRecord(MSIHANDLE hModule)
+static DECLCALLBACK(void) netCfgLoggerCallback(const char *pszString)
+{
+    if (g_hCurrentModule)
+        logStringF(g_hCurrentModule, "%s", pszString);
+}
+
+static VOID netCfgLoggerDisable()
+{
+    if (g_hCurrentModule)
+    {
+        VBoxNetCfgWinSetLogging(NULL);
+        g_hCurrentModule = NULL;
+    }
+}
+
+static VOID netCfgLoggerEnable(MSIHANDLE hModule)
+{
+    NonStandardAssert(hModule);
+
+    if (g_hCurrentModule)
+        netCfgLoggerDisable();
+
+    g_hCurrentModule = hModule;
+
+    VBoxNetCfgWinSetLogging(netCfgLoggerCallback);
+    /* uncomment next line if you want to add logging information from VBoxDrvCfg.cpp */
+//    VBoxDrvCfgLoggerSet(vboxDrvLoggerCallback, NULL);
+}
+
+static MSIHANDLE netCfgCreateLockedMsgRecord(MSIHANDLE hModule)
 {
     MSIHANDLE hRecord = MsiCreateRecord(2);
@@ -1793 +1793 @@
         if (uErr != ERROR_SUCCESS)
         {
-            logStringF(hModule, "createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = %#x", uErr);
+            logStringF(hModule, "netCfgCreateLockedMsgRecord: MsiRecordSetInteger failed, error = %#x", uErr);
             MsiCloseHandle(hRecord);
             hRecord = NULL;
@@ -1799 +1799 @@
     }
     else
-        logStringF(hModule, "createNetCfgLockedMsgRecord: Failed to create a record");
+        logStringF(hModule, "netCfgCreateLockedMsgRecord: Failed to create a record");
 
     return hRecord;
 }
 
-static UINT doNetCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite)
+static UINT netCfgInit(MSIHANDLE hModule, INetCfg **ppnc, BOOL bWrite)
 {
     MSIHANDLE hMsg = NULL;
@@ -1818 +1818 @@
         {
             if (FAILED(hr))
-                logStringF(hModule, "doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = %#x", hr);
+                logStringF(hModule, "netCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = %#x", hr);
             uErr = errorConvertFromHResult(hModule, hr);
             break;
@@ -1827 +1827 @@
         if (!lpszLockedBy)
         {
-            logStringF(hModule, "doNetCfgInit: lpszLockedBy == NULL, breaking");
+            logStringF(hModule, "netCfgInit: lpszLockedBy == NULL, breaking");
             break;
         }
@@ -1841 +1841 @@
         {
             cRetries++;
-            logStringF(hModule, "doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d", cRetries, VBOX_NETCFG_MAX_RETRIES);
+            logStringF(hModule, "netCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d", cRetries, VBOX_NETCFG_MAX_RETRIES);
             MsgResult = IDRETRY;
         }
@@ -1848 +1848 @@
             if (!hMsg)
             {
-                hMsg = createNetCfgLockedMsgRecord(hModule);
+                hMsg = netCfgCreateLockedMsgRecord(hModule);
                 if (!hMsg)
                 {
-                    logStringF(hModule, "doNetCfgInit: Failed to create a message record, breaking");
+                    logStringF(hModule, "netCfgInit: Failed to create a message record, breaking");
                     CoTaskMemFree(lpszLockedBy);
                     break;
@@ -1861 +1861 @@
             if (rTmp != ERROR_SUCCESS)
             {
-                logStringF(hModule, "doNetCfgInit: MsiRecordSetStringW failed, error = #%x", rTmp);
+                logStringF(hModule, "netCfgInit: MsiRecordSetStringW failed, error = #%x", rTmp);
                 CoTaskMemFree(lpszLockedBy);
                 break;
@@ -1868 +1868 @@
             MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg);
             NonStandardAssert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
-            logStringF(hModule, "doNetCfgInit: MsiProcessMessage returned (%#x)", MsgResult);
+            logStringF(hModule, "netCfgInit: MsiProcessMessage returned (%#x)", MsgResult);
         }
         CoTaskMemFree(lpszLockedBy);
@@ -1924 +1924 @@
         logStringF(hModule, "Uninstalling NetLwf");
 
-        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        uErr = netCfgInit(hModule, &pNetCfg, TRUE);
         if (uErr == ERROR_SUCCESS)
         {
@@ -1938 +1938 @@
         }
         else
-            logStringF(hModule, "UninstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "UninstallNetLwf: netCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1980 +1980 @@
         logStringF(hModule, "InstallNetLwf: Installing NetLwf");
 
-        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        uErr = netCfgInit(hModule, &pNetCfg, TRUE);
         if (uErr == ERROR_SUCCESS)
         {
@@ -2019 +2019 @@
         }
         else
-            logStringF(hModule, "InstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "InstallNetLwf: netCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -2357 +2357 @@
         logStringF(hModule, "Uninstalling NetAdp");
 
-        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        uErr = netCfgInit(hModule, &pNetCfg, TRUE);
         if (uErr == ERROR_SUCCESS)
         {
@@ -2371 +2371 @@
         }
         else
-            logStringF(hModule, "UninstallNetAdp: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "UninstallNetAdp: netCfgInit failed, error = %#x", uErr);
     }
     __finally