diff --git a/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c b/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c index 1e4674eb001..635865039ed 100644 --- a/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c +++ b/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c @@ -605,7 +605,7 @@ CHAR umss_bulkonly_get_maxlun(IN PUMSS_DEVICE_EXTENSION pdev_ext) { PURB purb = NULL; - CHAR max_lun; + UCHAR max_lun; NTSTATUS status; purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); diff --git a/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h b/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h index 448e0991495..625cb587c4b 100644 --- a/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h +++ b/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h @@ -42,7 +42,7 @@ typedef struct _USB_DRIVER_DESCRIPTION BYTE if_protocol; // Interface Protocol // Driver Info - PBYTE driver_name; // Driver name for Name Registry + const char *driver_name; // Driver name for Name Registry BYTE dev_class; // Device Class (from SampleStorageDeviceID.h) BYTE dev_sub_class; // Device Subclass BYTE dev_protocol; // Protocol Info. diff --git a/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c b/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c index 7a6ae1214aa..8d0b1171c7a 100644 --- a/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c +++ b/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c @@ -1343,7 +1343,7 @@ gendrv_delete_device(PUSB_DEV_MANAGER dev_mgr, PDEVICE_OBJECT dev_obj) BOOLEAN is_if; PUSB_DRIVER pdrvr; PGENDRV_DEVICE_EXTENSION pdev_ext; - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; PGENDRV_DRVR_EXTENSION pdrvr_ext; @@ -1579,7 +1579,7 @@ gendrv_startio(IN PDEVICE_OBJECT dev_obj, IN PIRP irp) } else { - IoSetCancelRoutine(irp, NULL); + (void)IoSetCancelRoutine(irp, NULL); } IoReleaseCancelSpinLock(old_irql); diff --git a/reactos/drivers/usb/nt4compat/usbdriver/umss.c b/reactos/drivers/usb/nt4compat/usbdriver/umss.c index d3d64db4ce3..3a4d811e144 100644 --- a/reactos/drivers/usb/nt4compat/usbdriver/umss.c +++ b/reactos/drivers/usb/nt4compat/usbdriver/umss.c @@ -86,7 +86,7 @@ umss_create_port_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) // and upper driver use this to register itself // with umss driver for future notification of // pnp event. 2004-03-22 23:12:41 - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; NTSTATUS status; PDEVICE_OBJECT pdev; @@ -136,7 +136,7 @@ umss_create_port_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver) BOOLEAN umss_delete_port_device(PDEVICE_OBJECT dev_obj) { - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; @@ -305,7 +305,7 @@ PDEVICE_OBJECT umss_create_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER umss_drvr, DEV_HANDLE dev_handle, BOOLEAN is_if) { - UCHAR dev_name[64], dev_id; + CHAR dev_name[64], dev_id; STRING string; NTSTATUS status; PDEVICE_OBJECT pdev; @@ -708,7 +708,7 @@ umss_deferred_delete_device(PVOID context) BOOLEAN umss_delete_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdrvr, PDEVICE_OBJECT dev_obj, BOOLEAN is_if) { - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; PUMSS_DEVICE_EXTENSION pdev_ext;