Changeset 50174 in vbox for trunk/src/VBox/Main/src-server/win

Timestamp:

Jan 23, 2014 9:22:22 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91738

Message:

Main/src-server: unify {p,m}VBox => {p,m}VirtualBox

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -1110 +1110 @@
 }
 
-int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVBox,
+int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
                                         IHostNetworkInterface **aHostNetworkInterface,
                                         IProgress **aProgress,
@@ -1123 +1123 @@
 
     ComPtr<IHost> host;
-    HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
+    HRESULT rc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
     if (SUCCEEDED(rc))
     {
-        rc = progress->init(pVBox, host,
+        rc = progress->init(pVirtualBox, host,
                             Bstr(_T("Creating host only network interface")).raw(),
                             FALSE /* aCancelable */);
@@ -1147 +1147 @@
 //            d->name = aName;
             d->iface = iface;
-            d->vBox = pVBox;
-
-            rc = pVBox->startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                             netIfNetworkInterfaceHelperClient,
-                                             static_cast<void *>(d.get()),
-                                             progress);
-
+            d->vBox = pVirtualBox;
+
+            rc = pVirtualBox->startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                   netIfNetworkInterfaceHelperClient,
+                                                   static_cast<void *>(d.get()),
+                                                   progress);
             if (SUCCEEDED(rc))
             {
@@ -1166 +1165 @@
 }
 
-int NetIfRemoveHostOnlyNetworkInterface(VirtualBox *pVBox, IN_GUID aId,
+int NetIfRemoveHostOnlyNetworkInterface(VirtualBox *pVirtualBox, IN_GUID aId,
                                         IProgress **aProgress)
 {
@@ -1176 +1175 @@
     progress.createObject();
     ComPtr<IHost> host;
-    HRESULT rc = pVBox->COMGETTER(Host)(host.asOutParam());
+    HRESULT rc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
     if (SUCCEEDED(rc))
     {
-        rc = progress->init(pVBox, host,
+        rc = progress->init(pVirtualBox, host,
                            Bstr(_T("Removing host network interface")).raw(),
                            FALSE /* aCancelable */);
@@ -1195 +1194 @@
             d->guid = aId;
 
-            rc = pVBox->startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                             netIfNetworkInterfaceHelperClient,
-                                             static_cast<void *>(d.get()),
-                                             progress);
+            rc = pVirtualBox->startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                   netIfNetworkInterfaceHelperClient,
+                                                   static_cast<void *>(d.get()),
+                                                   progress);
 
             if (SUCCEEDED(rc))