- Use the correct device object in NdisMQueryAdapterResources.

reactos/drivers/net/ndis/include

diff -u -r1.10.28.1 -r1.10.28.2
--- miniport.h	22 Oct 2004 19:52:06 -0000	1.10.28.1
+++ miniport.h	16 Nov 2004 22:03:01 -0000	1.10.28.2
@@ -64,7 +64,7 @@

    Windows one). */
 typedef struct _NDIS_WRAPPER_CONTEXT {
     HANDLE            RegistryHandle;

-    PDEVICE_OBJECT    PhysicalDeviceObject;

+    PDEVICE_OBJECT    DeviceObject;

 } NDIS_WRAPPER_CONTEXT, *PNDIS_WRAPPER_CONTEXT;
 
 #define GET_MINIPORT_DRIVER(Handle)((PMINIPORT_DRIVER)Handle)

reactos/drivers/net/ndis/ndis

diff -u -r1.12.2.1 -r1.12.2.2
--- hardware.c	22 Oct 2004 19:52:06 -0000	1.12.2.1
+++ hardware.c	16 Nov 2004 22:03:02 -0000	1.12.2.2
@@ -112,12 +112,14 @@

  */
 {
   PNDIS_WRAPPER_CONTEXT WrapperContext = (PNDIS_WRAPPER_CONTEXT)WrapperConfigurationContext;

-  PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->PhysicalDeviceObject->DeviceExtension;

+  PNDIS_MINIPORT_BLOCK MiniportBlock = WrapperContext->DeviceObject->DeviceExtension;

   ULONG ResourceListSize;
 
   PAGED_CODE();
   ASSERT(Status && ResourceList);
 

+  NDIS_DbgPrint(MAX_TRACE, ("Called\n"));
+

   /* FIXME: We can't do anything in this case. It shouldn't really happen. */
   if (MiniportBlock->AllocatedResources == NULL)
     {

reactos/drivers/net/ndis/ndis

diff -u -r1.38.2.3 -r1.38.2.4
--- miniport.c	6 Nov 2004 10:31:21 -0000	1.38.2.3
+++ miniport.c	16 Nov 2004 22:03:02 -0000	1.38.2.4
@@ -1299,8 +1299,7 @@

 
   NDIS_DbgPrint(MAX_TRACE, ("opened device reg key\n"));
 

-  WrapperContext.PhysicalDeviceObject = 
-     Adapter->NdisMiniportBlock.PhysicalDeviceObject;

+  WrapperContext.DeviceObject = Adapter->NdisMiniportBlock.DeviceObject;

 
   /*
    * Store the adapter resources used by HW routines such as