Changeset 38791 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Sep 19, 2011 1:21:31 PM (13 years ago)

Author:

vboxsync

Message:

VBoxInstallHelper.cpp,++: Clean up TCHAR/WCHAR mess - just use WCHAR, forget TCHAR.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -274 +274 @@
 }
 
+/** @todo r=bird: This function is not in the header file, why is it
+ *        exported? */
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
-                                                                IN LPCWSTR * apInfPaths, IN UINT cInfPaths,
+                                                                IN LPCWSTR const *apInfPaths, IN UINT cInfPaths,
                                                                 OUT INetCfgComponent **ppComponent)
 {
@@ -1858 +1860 @@
 
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc,
-                                                       IN LPCWSTR * apInfFullPaths, IN UINT cInfFullPaths)
+                                                       IN LPCWSTR const *apInfFullPaths, IN UINT cInfFullPaths)
 {
     HRESULT hr = vboxNetCfgWinNetFltUninstall(pNc, SUOI_FORCEDELETE);
@@ -2056 +2058 @@
 
     /* Build the display name in the form "::{GUID}". */
-    if (wcslen (wGuid) >= MAX_PATH)
+    if (wcslen(wGuid) >= MAX_PATH)
         return E_INVALIDARG;
     WCHAR szAdapterGuid[MAX_PATH + 2] = {0};
-    swprintf (szAdapterGuid, L"::%ls", wGuid);
+    swprintf(szAdapterGuid, L"::%ls", wGuid);
 
     /* Create an instance of the network connections folder. */
-    hr = CoCreateInstance (CLSID_NetworkConnections, NULL,
-                           CLSCTX_INPROC_SERVER, IID_IShellFolder,
-                           reinterpret_cast <LPVOID *> (&pShellFolder));
+    hr = CoCreateInstance(CLSID_NetworkConnections, NULL,
+                          CLSCTX_INPROC_SERVER, IID_IShellFolder,
+                          reinterpret_cast<LPVOID *>(&pShellFolder));
     /* Parse the display name. */
     if (SUCCEEDED (hr))
@@ -2709 +2711 @@
         if (lppszName)
         {
-            *lppszName = ::SysAllocString((const OLECHAR *) DevName);
+            *lppszName = SysAllocString((const OLECHAR *) DevName);
             if (!*lppszName)
             {