Changeset 57192 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

Timestamp:

Aug 5, 2015 12:51:17 PM (9 years ago)

Author:

vboxsync

Message:

pr7933. Temporary decision: added new function VBoxNetCfgWinNetAdpInstall. Only for testing and using inside NetAdpInstall.exe

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

@@ -19 +19 @@
 #include <VBox/VBoxDrvCfg-win.h>
 #include <stdio.h>
-
 #include <devguid.h>
+
+#define VBOX_NETADP_APP_NAME L"NetAdpInstall"
 
 #define VBOX_NETADP_HWID L"sun_VBoxNetAdp"
@@ -41 +42 @@
     if (SUCCEEDED(hr))
     {
-        printf("adding host-only interface..\n");
+        wprintf(L"adding host-only interface..\n");
 
         DWORD dwErr = ERROR_SUCCESS;
@@ -51 +52 @@
         if (dwErr == ERROR_SUCCESS)
         {
+            INetCfg *pnc;
+            LPWSTR lpszLockedBy = NULL;
+            hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETADP_APP_NAME, 10000, &lpszLockedBy);
+            if(hr == S_OK)
+            {
+
+                hr = VBoxNetCfgWinNetAdpInstall(pnc, MpInf);
+
+                if(hr == S_OK)
+                {
+                    wprintf(L"installed successfully\n");
+                }
+                else
+                {
+                    wprintf(L"error installing VBoxNetAdp (0x%x)\n", hr);
+                }
+
+                VBoxNetCfgWinReleaseINetCfg(pnc, TRUE);
+            }
+            else
+                wprintf(L"VBoxNetCfgWinQueryINetCfg failed: hr = 0x%x\n", hr);
+            /*
             hr = VBoxDrvCfgInfInstall(MpInf);
             if (FAILED(hr))
@@ -65 +88 @@
                 if (SUCCEEDED(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 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);
@@ -81 +104 @@
             else
                 printf("VBoxNetCfgWinCreateHostOnlyNetworkInterface failed: hr = 0x%x\n", hr);
-        }
-        else
-        {
-            printf("GetFullPathNameW failed: winEr = %d\n", dwErr);
+            */
+        }
+        else
+        {
+            wprintf(L"GetFullPathNameW failed: winEr = %d\n", dwErr);
             hr = HRESULT_FROM_WIN32(dwErr);
 
@@ -91 +115 @@
     }
     else
-        printf("Error initializing COM (0x%x)\n", hr);
+        wprintf(L"Error initializing COM (0x%x)\n", hr);
 
     VBoxNetCfgWinSetLogging(NULL);