[ros-diffs] [janderwald] 23379: merge 23368

Author: janderwald
Date: Mon Jul 31 01:26:57 2006
New Revision: 23379

URL: http://svn.reactos.org/svn/reactos?rev=23379&view=rev
Log:
merge 23368

Modified:
    branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c
    branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c

Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c (original)
+++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Mon Jul 31
01:26:57 2006
@@ -165,7 +165,7 @@
                                WrapperConfigurationContext,
                                NULL,
                                &BufferSize);
-    if (*Status != NDIS_STATUS_RESOURCES)
+    if (*Status != NDIS_STATUS_SUCCESS)
         return;
 
     *Status = NdisAllocateMemory((PVOID)&AssignedResources,

Modified: branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c (original)
+++ branches/ros-branch-0_3_0/reactos/drivers/network/ndis/ndis/hardware.c Mon Jul 31
01:26:57 2006
@@ -103,7 +103,7 @@
   ULONG ResourceListSize;
 
   PAGED_CODE();
-  ASSERT(Status && ResourceList);
+  ASSERT((Status && ResourceList) || *BufferSize != 0);
 
   NDIS_DbgPrint(MAX_TRACE, ("Called\n"));