Changeset 24758 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Nov 18, 2009 12:57:48 PM (15 years ago)

Author:

vboxsync

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

54966

Message:

netflt/win: better driver initialization (do NdisIMAssociateMiniport right after Protocol & Miniport registration), netadp/win: don't report connection status on cunstruction (not needed), 2d accel: better 2D support test logging

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win

Files:

• VBoxNetFlt-win.c (modified) (2 diffs)
• VBoxNetFltMp-win.c (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFlt-win.c

@@ -1961 +1961 @@
     NDIS_STATUS                        Status = NDIS_STATUS_SUCCESS;
     int rc;
+#ifdef VBOX_LOOPBACK_USEFLAGS
+    ULONG MjVersion;
+    ULONG MnVersion;
+#endif
 
     NdisAllocateSpinLock(&g_GlobalLock);
-
-    do
-    {
-#ifdef VBOX_LOOPBACK_USEFLAGS
-        ULONG MjVersion;
-        ULONG MnVersion;
-#endif
 
 #ifdef VBOX_NETFLT_ONDEMAND_BIND
         /* we are registering in the DriverEntry only when we are working as a protocol
          * since in this case our driver is loaded after the VBoxDrv*/
-        rc = vboxNetFltWinInitNetFlt();
+    rc = vboxNetFltWinInitNetFlt();
 #else
         /* the idc registration is initiated via IOCTL since our driver
          * can be loaded when the VBoxDrv is not in case we are a Ndis IM driver */
-        rc = vboxNetFltWinInitNetFltBase();
-#endif
-        if(!RT_SUCCESS(rc))
-        {
-            Status = NDIS_STATUS_FAILURE;
-            break;
-        }
+    rc = vboxNetFltWinInitNetFltBase();
+#endif
+    AssertRC(rc);
+    if(RT_SUCCESS(rc))
+    {
 #ifdef VBOX_LOOPBACK_USEFLAGS
         PsGetVersion(&MjVersion, &MnVersion,
@@ -2002 +1997 @@
 #endif
 
+        Status = vboxNetFltWinJobInitQueue(&g_JobQueue);
+        Assert(Status == STATUS_SUCCESS);
+        if(Status == STATUS_SUCCESS)
+        {
+            /* note: we do it after we initialize the Job Queue */
+            vboxNetFltWinStartInitIdcProbing();
+
 #ifndef VBOX_NETFLT_ONDEMAND_BIND
-        Status = vboxNetFltWinMpRegister(DriverObject, RegistryPath);
-        if (Status != NDIS_STATUS_SUCCESS)
-        {
-            vboxNetFltWinFiniNetFlt();
-            break;
-        }
-#endif
-#ifndef VBOXNETADP
-        Status = vboxNetFltWinPtRegister(DriverObject, RegistryPath);
-        if (Status != NDIS_STATUS_SUCCESS)
-        {
+            Status = vboxNetFltWinMpRegister(DriverObject, RegistryPath);
+            Assert(Status == STATUS_SUCCESS);
+            if (Status == NDIS_STATUS_SUCCESS)
+#endif
+            {
+#ifndef VBOXNETADP
+                Status = vboxNetFltWinPtRegister(DriverObject, RegistryPath);
+                Assert(Status == STATUS_SUCCESS);
+                if (Status == NDIS_STATUS_SUCCESS)
+#endif
+                {
+#if !defined(VBOX_NETFLT_ONDEMAND_BIND) && !defined(VBOXNETADP)
+                    vboxNetFltWinAssociateMiniportProtocol();
+#endif
+                    return STATUS_SUCCESS;
+
+//#ifndef VBOXNETADP
+//                vboxNetFltWinPtDeregister();
+//#endif
+                }
 #ifndef VBOX_NETFLT_ONDEMAND_BIND
-            vboxNetFltWinMpDeregister();
-#endif
-            vboxNetFltWinFiniNetFlt();
-            break;
-        }
-#endif
-
-        Status = vboxNetFltWinJobInitQueue(&g_JobQueue);
-        if(Status != STATUS_SUCCESS)
-        {
-#ifndef VBOXNETADP
-            vboxNetFltWinPtDeregister();
-#endif
-#ifndef VBOX_NETFLT_ONDEMAND_BIND
-            vboxNetFltWinMpDeregister();
-#endif
-            vboxNetFltWinFiniNetFlt();
-            break;
-        }
-
-        /* note: we do it after we initialize the Job Queue */
-        vboxNetFltWinStartInitIdcProbing();
-
-#if !defined(VBOX_NETFLT_ONDEMAND_BIND) && !defined(VBOXNETADP)
-        vboxNetFltWinAssociateMiniportProtocol();
-#endif
-    } while (FALSE);
+                vboxNetFltWinMpDeregister();
+#endif
+            }
+            vboxNetFltWinJobFiniQueue(&g_JobQueue);
+        }
+        vboxNetFltWinFiniNetFlt();
+    }
+    else
+    {
+        Status = NDIS_STATUS_FAILURE;
+    }
+
+    NdisFreeSpinLock(&g_GlobalLock);
 
     return(Status);

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c

@@ -741 +741 @@
                                 Assert(vboxNetFltWinGetOpState(&pAdapt->MPState) == kVBoxNetDevOpState_Initialized);
                                 vboxNetFltWinSetOpState(&pAdapt->MPState, kVBoxNetDevOpState_Initialized);
-
+#if 0
                                 NdisMIndicateStatus(pAdapt->hMiniportHandle,
                                                          NDIS_STATUS_MEDIA_CONNECT,
                                                          (PVOID)NULL,
                                                          0);
+#endif
                             }
                             else