Changeset 52241 in vbox for trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

Timestamp:

Jul 31, 2014 6:27:37 AM (10 years ago)

Author:

vboxsync

Message:

VBoxDrvCfgInfUninstallAllF: Just call GetSystemWindowsDirectory directly instead of the round about way via SHGetFolderPathW and drag in SHELL32.DLL.

File:

• trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -680 +680 @@
 VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllF(LPCWSTR lpszClassName, LPCWSTR lpszPnPId, DWORD Flags)
 {
-    WCHAR InfDirPath[MAX_PATH];
-    HRESULT hr = SHGetFolderPathW(NULL, /*          HWND hwndOwner*/
-            CSIDL_WINDOWS, /* int nFolder*/
-            NULL, /*HANDLE hToken*/
-            SHGFP_TYPE_CURRENT, /*DWORD dwFlags*/
-            InfDirPath);
-    NonStandardAssert(hr == S_OK);
-    if (hr == S_OK)
-    {
-        wcscat(InfDirPath, L"\\inf\\oem*.inf");
+    static WCHAR const s_wszFilter[] = L"\\inf\\oem*.inf";
+    HRESULT hr;
+    WCHAR wszInfDirPath[MAX_PATH];
+    UINT cwcInput = RT_ELEMENTS(wszInfDirPath) - RT_ELEMENTS(s_wszFilter);
+    UINT cwcWindows = GetSystemWindowsDirectory(wszInfDirPath, cwcInput);
+    if (cwcWindows > 0 && cwcWindows < cwcInput)
+    {
+        wcscpy(&wszInfDirPath[cwcWindows], s_wszFilter);
 
         INFENUM_CONTEXT Context;
@@ -696 +694 @@
         Context.Flags = Flags;
         Context.hr = S_OK;
-        hr = vboxDrvCfgEnumFiles(InfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
+        hr = vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
         NonStandardAssert(hr == S_OK);
         if (hr == S_OK)
@@ -709 +707 @@
     else
     {
-        NonStandardLogRelCrap((__FUNCTION__": SHGetFolderPathW failed, hr=0x%x\n", hr));
+        NonStandardLogRelCrap((__FUNCTION__": GetSystemWindowsDirectory failed, cwcWindows=%u lasterr=%u\n", cwcWindows, GetLastError()));
+        NonStandardAssertFailed();
+        hr = E_FAIL;
     }