Changeset 22491 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Timestamp:

Aug 26, 2009 9:44:20 PM (15 years ago)

Author:

vboxsync

Message:

netadp/win: actual inf deletion with NetAdpUninstall, (not yet added to win installer)

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• NetAdpUninstall.cpp (modified) (1 diff)
• WinNetConfig.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/NetAdpUninstall.cpp

@@ -44 +44 @@
         if(hr == S_OK)
         {
-            hr = VBoxNetCfgWinUninstallInfs (&GUID_DEVCLASS_NET, L"sun_VBoxNetAdp");
+            hr = VBoxNetCfgWinUninstallInfs (&GUID_DEVCLASS_NET, L"sun_VBoxNetAdp", 0/* could be SUOI_FORCEDELETE */);
             if(hr == S_OK)
             {

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/WinNetConfig.cpp

@@ -81 +81 @@
 #define VBOX_NETCFG_LOCK_TIME_OUT     5000
 
-typedef bool (*ENUMERATION_CALLBACK) (LPWSTR pFileName, PVOID pContext);
+typedef bool (*ENUMERATION_CALLBACK) (LPCWSTR pFileName, PVOID pContext);
+
+typedef struct _INF_INFO
+{
+    LPCWSTR pPnPId;
+}INF_INFO, *PINF_INFO;
+
+typedef struct _INFENUM_CONTEXT
+{
+    INF_INFO InfInfo;
+    DWORD Flags;
+    HRESULT hr;
+} INFENUM_CONTEXT, *PINFENUM_CONTEXT;
+
+static bool vboxNetCfgWinInfEnumerationCallback(LPCWSTR pFileName, PVOID pCtxt);
 
 class VBoxNetCfgStringList
@@ -398 +412 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallInfs (const GUID * pGuid, LPCWSTR pPnPId)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallInfs (const GUID * pGuid, LPCWSTR pPnPId, DWORD Flags)
 {
     VBoxNetCfgStringList list(128);
@@ -404 +418 @@
     if(hr == S_OK)
     {
+        INFENUM_CONTEXT Context;
+        Context.InfInfo.pPnPId = pPnPId;
+        Context.Flags = Flags;
+        Context.hr = S_OK;
         int size = list.size();
         for (int i = 0; i < size; ++i)
         {
-            Log(L"inf : %s\n", list.get(i));
+            LPCWSTR pInf = list.get(i);
+            const WCHAR* pRel = wcsrchr(pInf, '\\');
+            if(pRel)
+                ++pRel;
+            else
+                pRel = pInf;
+
+            vboxNetCfgWinInfEnumerationCallback(pRel, &Context);
+//            Log(L"inf : %s\n", list.get(i));
         }
     }
@@ -461 +487 @@
 }
 
-typedef struct _INF_INFO
-{
-    LPCWSTR pPnPId;
-}INF_INFO, *PINF_INFO;
-
-typedef struct _INFENUM_CONTEXT
-{
-    INF_INFO InfInfo;
-    DWORD Flags;
-    HRESULT hr;
-} INFENUM_CONTEXT, *PINFENUM_CONTEXT;
-
-static bool vboxNetCfgWinInfEnumerationCallback(LPCWSTR pFileName, PINFENUM_CONTEXT pContext)
-{
+static bool vboxNetCfgWinInfEnumerationCallback(LPCWSTR pFileName, PVOID pCtxt)
+{
+    PINFENUM_CONTEXT pContext = (PINFENUM_CONTEXT)pCtxt;
 //    Log(L"vboxNetCfgWinInfEnumerationCallback: pFileName (%s)\n", pFileName);
 
@@ -525 +540 @@
         Context.Flags = Flags;
         Context.hr = S_OK;
-        hr = vboxNetCfgWinEnumFiles(InfDirPath, (ENUMERATION_CALLBACK)vboxNetCfgWinInfEnumerationCallback, (PVOID)&Context);
+        hr = vboxNetCfgWinEnumFiles(InfDirPath, vboxNetCfgWinInfEnumerationCallback, &Context);
         Assert(hr == S_OK);
         if(hr == S_OK)
@@ -1655 +1670 @@
                         //
                         hr = S_FALSE;
-                        Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: !!!REBOOT REQUIRED!!!\n", winEr);
+                        Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: !!!REBOOT REQUIRED!!!\n");
                     }
                 }
@@ -2357 +2372 @@
             {
                 memset(DeviceInstallParams.DriverPath, 0, sizeof(DeviceInstallParams.DriverPath));
-                int pathLenght = wcslen(pInfPath) + 1/* null terminator */;
+                size_t pathLenght = wcslen(pInfPath) + 1/* null terminator */;
                 if(pathLenght < sizeof(DeviceInstallParams.DriverPath)/sizeof(DeviceInstallParams.DriverPath[0]))
                 {