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

Timestamp:

Aug 26, 2009 6:57:05 PM (15 years ago)

Author:

vboxsync

Message:

netadp/win: functionality to uninstall NetAdp packages (second step in making a pure non-difx install), qgl framebuffer: adjust to save state API changes

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• NetAdpUninstall.cpp (modified) (4 diffs)
• WinNetConfig.cpp (modified) (7 diffs)

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

@@ -23 +23 @@
 #include <stdio.h>
 
+#include <devguid.h>
+
+
 static VOID winNetCfgLogger (LPCWSTR szString)
 {
@@ -30 +33 @@
 static int UninstallNetAdp()
 {
-    int r = 0;
+    int r = 1;
     VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
@@ -41 +44 @@
         if(hr == S_OK)
         {
-            printf("uninstalled successfully\n");
+            hr = VBoxNetCfgWinUninstallInfs (&GUID_DEVCLASS_NET, L"sun_VBoxNetAdp");
+            if(hr == S_OK)
+            {
+                printf("uninstalled successfully\n");
+            }
+            else
+            {
+                printf("uninstalled successfully, but failed to remove infs\n");
+            }
+            r = 0;
         }
         else
@@ -53 +65 @@
     {
         wprintf(L"Error initializing COM (0x%x)\n", hr);
-        r = 1;
     }
 

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

@@ -83 +83 @@
 typedef bool (*ENUMERATION_CALLBACK) (LPWSTR pFileName, PVOID pContext);
 
-static HRESULT vboxNetCfgWinCollectInfs(LPCWSTR pPnPId)
+class VBoxNetCfgStringList
+{
+public:
+    VBoxNetCfgStringList(int aSize);
+
+    ~VBoxNetCfgStringList();
+
+    HRESULT add(LPWSTR pStr);
+
+    int size() {return mSize;}
+
+    LPWSTR get(int i) {return maList[i];}
+private:
+    HRESULT resize(int newSize);
+
+    LPWSTR *maList;
+    int mBufSize;
+    int mSize;
+};
+
+VBoxNetCfgStringList::VBoxNetCfgStringList(int aSize)
+{
+    maList = (LPWSTR*)CoTaskMemAlloc( sizeof(maList[0]) * aSize);
+    mBufSize = aSize;
+    mSize = 0;
+}
+
+VBoxNetCfgStringList::~VBoxNetCfgStringList()
+{
+    if(!mBufSize)
+        return;
+
+    for(int i = 0; i < mSize; ++i)
+    {
+        CoTaskMemFree(maList[i]);
+    }
+
+    CoTaskMemFree(maList);
+}
+
+HRESULT VBoxNetCfgStringList::add(LPWSTR pStr)
+{
+    if(mSize == mBufSize)
+    {
+        int hr = resize(mBufSize+10);
+        if(SUCCEEDED(hr))
+            return hr;
+    }
+    size_t cStr = wcslen(pStr) + 1;
+    LPWSTR str = (LPWSTR)CoTaskMemAlloc( sizeof(maList[0][0]) * cStr);
+    memcpy(str, pStr, sizeof(maList[0][0]) * cStr);
+    maList[mSize] = str;
+    ++mSize;
+    return S_OK;
+}
+
+HRESULT VBoxNetCfgStringList::resize(int newSize)
+{
+    Assert(newSize >= mSize);
+    if(newSize < mSize)
+        return E_FAIL;
+    LPWSTR* pOld = maList;
+    maList = (LPWSTR*)CoTaskMemAlloc( sizeof(maList[0]) * newSize);
+    mBufSize = newSize;
+    memcpy(maList, pOld, mSize*sizeof(maList[0]));
+    CoTaskMemFree(pOld);
+    return S_OK;
+}
+
+static HRESULT vboxNetCfgWinCollectInfs(const GUID * pGuid, LPCWSTR pPnPId, VBoxNetCfgStringList & list)
 {
     DWORD winEr = ERROR_SUCCESS;
+    int counter = 0;
     HDEVINFO hDevInfo = SetupDiCreateDeviceInfoList(
-                            &GUID_DEVCLASS_NETSERVICE, /* IN LPGUID  ClassGuid,  OPTIONAL */
+                            pGuid, /* IN LPGUID  ClassGuid,  OPTIONAL */
                             NULL /*IN HWND  hwndParent  OPTIONAL */
                             );
@@ -124 +194 @@
                         for(WCHAR * pHwId = pDrvDetail->HardwareID; pHwId && *pHwId && pHwId < (TCHAR*)(DetailBuf + sizeof(DetailBuf)/sizeof(DetailBuf[0])) ;pHwId += _tcslen(pHwId) + 1)
                         {
-                            //TODO:
+                            if(!wcsicmp(pHwId, pPnPId))
+                            {
+                                Assert(pDrvDetail->InfFileName[0]);
+                                if(pDrvDetail->InfFileName)
+                                {
+                                    list.add(pDrvDetail->InfFileName);
+                                }
+                            }
                         }
                     }
@@ -321 +398 @@
 }
 
-//VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallInfs (LPCWSTR pPnPId)
-//{
-//    std::list<std::wstring> InfList;
-//    HRESULT hr = vboxNetCfgWinCollectInfs(pPnPId, &InfList);
-//    if(hr == S_OK)
-//    {
-//        std::list <std::wstring>::iterator it;
-//        for (it = InfList.begin(); it != InfList.end(); ++it)
-//        {
-//            Log(L"inf : %s\n", (*it).c_str());
-//        }
-//    }
-//    return hr;
-//}
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUninstallInfs (const GUID * pGuid, LPCWSTR pPnPId)
+{
+    VBoxNetCfgStringList list(128);
+    HRESULT hr = vboxNetCfgWinCollectInfs(pGuid, pPnPId, list);
+    if(hr == S_OK)
+    {
+        int size = list.size();
+        for (int i = 0; i < size; ++i)
+        {
+            Log(L"inf : %s\n", list.get(i));
+        }
+    }
+    return hr;
+}
 
 static HRESULT vboxNetCfgWinEnumFiles(LPCWSTR pPattern, ENUMERATION_CALLBACK pCallback, PVOID pContext)
@@ -1555 +1632 @@
     HRESULT hr = S_OK;
     SP_REMOVEDEVICE_PARAMS rmdParams;
-    SP_DEVINSTALL_PARAMS devParams;
     rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
     rmdParams.ClassInstallHeader.InstallFunction = DIF_REMOVE;
@@ -1562 +1638 @@
     if(SetupDiSetClassInstallParams(hDevInfo,pDev,&rmdParams.ClassInstallHeader,sizeof(rmdParams)))
     {
-        if(SetupDiCallClassInstaller(DIF_REMOVE,hDevInfo,pDev))
-        {
-            /*
-             * see if device needs reboot
-             */
-            devParams.cbSize = sizeof(devParams);
-            if(SetupDiGetDeviceInstallParams(hDevInfo,pDev,&devParams))
-            {
-                if(devParams.Flags & (DI_NEEDRESTART|DI_NEEDREBOOT))
+        if(SetupDiSetSelectedDevice (hDevInfo, pDev))
+        {
+            if(SetupDiCallClassInstaller(DIF_REMOVE,hDevInfo,pDev))
+            {
+                SP_DEVINSTALL_PARAMS devParams;
+                /*
+                 * see if device needs reboot
+                 */
+                devParams.cbSize = sizeof(devParams);
+                if(SetupDiGetDeviceInstallParams(hDevInfo,pDev,&devParams))
+                {
+                    if(devParams.Flags & (DI_NEEDRESTART|DI_NEEDREBOOT))
+                    {
+                        //
+                        // reboot required
+                        //
+                        hr = S_FALSE;
+                        Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: !!!REBOOT REQUIRED!!!\n", winEr);
+                    }
+                }
+                else
                 {
                     //
-                    // reboot required
+                    // appears to have succeeded
                     //
-                    hr = S_FALSE;
                 }
             }
             else
             {
-                //
-                // appears to have succeeded
-                //
+                winEr = GetLastError();
+                Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed (0x%08X)\n", winEr);
+                hr = HRESULT_FROM_WIN32(winEr);
             }
         }
@@ -1588 +1675 @@
         {
             winEr = GetLastError();
+            Log(L"vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetSelectedDevice failed (0x%08X)\n", winEr);
             hr = HRESULT_FROM_WIN32(winEr);
         }
@@ -1677 +1765 @@
                 if(!wcsnicmp(pCurId, pPnPId, cPnPId))
                 {
+
                     if(!callback(hDevInfo,&Dev,pContext))
                         break;