Changeset 22472 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Aug 26, 2009 2:19:20 PM (15 years ago)

Author:

vboxsync

Message:

netadp/win: install from specified inf (first step to pure non-DIFX install)

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• NetAdpInstall.cpp (modified) (4 diffs)
• WinNetConfig.cpp (modified) (2 diffs)

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

@@ -23 +23 @@
 #include <stdio.h>
 
+#define VBOX_NETADP_INF L".\\VBoxNetAdp.inf"
+
 static VOID winNetCfgLogger (LPCWSTR szString)
 {
@@ -30 +32 @@
 static int InstallNetAdp()
 {
-    int r = 0;
+    int r = 1;
     VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
@@ -46 +48 @@
         BSTR name, errMsg;
         printf("adding host-only interface..\n");
-        hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface (&guid, &name, &errMsg);
-        if(hr == S_OK)
+        DWORD WinEr;
+        WCHAR MpInf[MAX_PATH];
+        GetFullPathNameW(VBOX_NETADP_INF, sizeof(MpInf)/sizeof(MpInf[0]), MpInf, NULL);
+        WinEr = GetLastError();
+        if(WinEr == ERROR_SUCCESS)
         {
-            ULONG ip, mask;
-            hr = VBoxNetCfgWinGenHostOnlyNetworkNetworkIp(&ip, &mask);
+            hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface (MpInf, true, &guid, &name, &errMsg);
             if(hr == S_OK)
             {
-                /* ip returned by VBoxNetCfgWinGenHostOnlyNetworkNetworkIp is a network ip,
-                 * i.e. 192.168.xxx.0, assign  192.168.xxx.1 for the hostonly adapter */
-                ip = ip | (1 << 24);
-                hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
-                if(hr != S_OK)
+                ULONG ip, mask;
+                hr = VBoxNetCfgWinGenHostOnlyNetworkNetworkIp(&ip, &mask);
+                if(hr == S_OK)
                 {
-                    printf("VBoxNetCfgWinEnableStaticIpConfig failed: hr = 0x%x\n", hr);
+                    /* ip returned by VBoxNetCfgWinGenHostOnlyNetworkNetworkIp is a network ip,
+                     * i.e. 192.168.xxx.0, assign  192.168.xxx.1 for the hostonly adapter */
+                    ip = ip | (1 << 24);
+                    hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
+                    if(hr != S_OK)
+                    {
+                        printf("VBoxNetCfgWinEnableStaticIpConfig failed: hr = 0x%x\n", hr);
+                    }
+                    else
+                    {
+                        r = 0;
+                    }
+                }
+                else
+                {
+                    printf("VBoxNetCfgWinGenHostOnlyNetworkNetworkIp failed: hr = 0x%x\n", hr);
                 }
             }
             else
             {
-                printf("VBoxNetCfgWinGenHostOnlyNetworkNetworkIp failed: hr = 0x%x\n", hr);
+                printf("VBoxNetCfgWinCreateHostOnlyNetworkInterface failed: hr = 0x%x\n", hr);
             }
         }
         else
         {
-            printf("VBoxNetCfgWinCreateHostOnlyNetworkInterface failed: hr = 0x%x\n", hr);
+            printf("GetFullPathNameW failed: winEr = %d\n", WinEr);
         }
 #endif
-
-        r = 1;
 
         CoUninitialize();
@@ -80 +95 @@
     {
         wprintf(L"Error initializing COM (0x%x)\n", hr);
-        r = 1;
     }
 

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

@@ -2192 +2192 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface (GUID *pGuid, BSTR *lppszName, BSTR *pErrMsg)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface (LPCWSTR pInfPath, bool bIsInfPathFile, /* <- input params */
+        GUID *pGuid, BSTR *lppszName, BSTR *pErrMsg) /* <- output params */
 {
     HRESULT hrc = S_OK;
@@ -2257 +2258 @@
             SetErrBreak ((L"SetupDiSetSelectedDevice failed (0x%08X)",
                           GetLastError()));
+
+        if(pInfPath)
+        {
+            /* get the device install parameters and disable filecopy */
+            DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+            ok = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+                                                &DeviceInstallParams);
+            if (ok)
+            {
+                memset(DeviceInstallParams.DriverPath, 0, sizeof(DeviceInstallParams.DriverPath));
+                int pathLenght = wcslen(pInfPath) + 1/* null terminator */;
+                if(pathLenght < sizeof(DeviceInstallParams.DriverPath)/sizeof(DeviceInstallParams.DriverPath[0]))
+                {
+                    memcpy(DeviceInstallParams.DriverPath, pInfPath, pathLenght*sizeof(DeviceInstallParams.DriverPath[0]));
+
+                    if(bIsInfPathFile)
+                    {
+                        DeviceInstallParams.Flags |= DI_ENUMSINGLEINF;
+                    }
+
+                    ok = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+                                                        &DeviceInstallParams);
+                    if(!ok)
+                    {
+                        DWORD winEr = GetLastError();
+                        Log(L"SetupDiSetDeviceInstallParams: SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr);
+                        Assert(0);
+                        break;
+                    }
+                }
+                else
+                {
+                    Log(L"SetupDiSetDeviceInstallParams: inf path is too long\n");
+                    Assert(0);
+                    break;
+                }
+            }
+            else
+            {
+                DWORD winEr = GetLastError();
+                Assert(0);
+                Log(L"VBoxNetCfgWinCreateHostOnlyNetworkInterface: SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr);
+            }
+
+        }
 
         /* build a list of class drivers */