[ros-diffs] [janderwald] 54843: [HID] - Implement quering compatible ids - Fix result status for quering instance id - Fix bug in msmouse.inf

[janderwald at svn.reactos.org]

Author: janderwald
Date: Thu Jan  5 18:22:48 2012
New Revision: 54843

URL: http://svn.reactos.org/svn/reactos?rev=54843&view=rev
Log:
[HID]
- Implement quering compatible ids
- Fix result status for quering instance id
- Fix bug in msmouse.inf

Modified:
    branches/usb-bringup/drivers/hid/hidclass/pdo.c
    branches/usb-bringup/media/inf/input.inf
    branches/usb-bringup/media/inf/msmouse.inf

Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclass/pdo.c?rev=54843&r1=54842&r2=54843&view=diff
==============================================================================
--- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Jan  5 18:22:48 2012
@@ -131,6 +131,8 @@
     //
     // store result
     //
+    DPRINT1("NewBuffer %S\n", NewBuffer);
+    ASSERT(FALSE);
     Irp->IoStatus.Information = (ULONG_PTR)NewBuffer;
     return STATUS_SUCCESS;
 }
@@ -183,8 +185,8 @@
         //
         // single tlc device
         //
-        Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1;
-        Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1;
+        Offset = swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1;
+        Offset += swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1;
     }
 
     //
@@ -270,6 +272,7 @@
     //
     // store result
     //
+    ASSERT(FALSE);
     Irp->IoStatus.Information = (ULONG_PTR)Ptr;
     return STATUS_SUCCESS;
 }
@@ -298,11 +301,7 @@
         return Status;
     }
     DPRINT1("HidClassPDO_HandleQueryInstanceId Buffer %S\n", Irp->IoStatus.Information);
-    //
-    //TODO implement instance id
-    // example:
-    // HID\VID_045E&PID_0047\8&1A0700BC&0&0000
-    return STATUS_NOT_IMPLEMENTED;
+    return Status;
 }
 
 NTSTATUS
@@ -310,29 +309,28 @@
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp)
 {
-    NTSTATUS Status;
-
-    //
-    // copy current stack location
-    //
-    IoCopyCurrentIrpStackLocationToNext(Irp);
-
-    //
-    // call mini-driver
-    //
-    Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp);
-    if (!NT_SUCCESS(Status))
-    {
-        //
-        // failed
-        //
-        return Status;
-    }
-
-    //
-    // FIXME: implement me
-    //
-    return STATUS_NOT_IMPLEMENTED;
+    LPWSTR Buffer;
+
+    Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR));
+    if (!Buffer)
+    {
+        //
+        // no memory
+        //
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    //
+    // zero buffer
+    //
+    Buffer[0] = 0;
+    Buffer[1] = 0;
+
+    //
+    // store result
+    //
+    Irp->IoStatus.Information = (ULONG_PTR)Buffer;
+    return STATUS_SUCCESS;
 }
 
 

Modified: branches/usb-bringup/media/inf/input.inf
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/input.inf?rev=54843&r1=54842&r2=54843&view=diff
==============================================================================
--- branches/usb-bringup/media/inf/input.inf [iso-8859-1] (original)
+++ branches/usb-bringup/media/inf/input.inf [iso-8859-1] Thu Jan  5 18:22:48 2012
@@ -59,7 +59,7 @@
 StartType     = 3
 ErrorControl  = 1
 ServiceBinary = %12%\hidusb.sys
-LoadOrderGroup = Pointer Port
+LoadOrderGroup = extended base
 
 [strings]
 MSFT                  = "ReactOS"

Modified: branches/usb-bringup/media/inf/msmouse.inf
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/msmouse.inf?rev=54843&r1=54842&r2=54843&view=diff
==============================================================================
Binary files - no diff available.