Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[fireball] 55077: - Misc trunk headers compatibility fixes.
by fireball＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: fireball Date: Sun Jan 22 21:31:01 2012 New Revision: 55077 URL: http://svn.reactos.org/svn/reactos?rev=55077&view=rev Log: - Misc trunk headers compatibility fixes. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sun Jan 22 21:31:01 2012 @@ -331,12 +331,12 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.gdiinfo), - &PrimarySurface.gdiinfo, + (PULONG)&PrimarySurface.gdiinfo, sizeof(PrimarySurface.devinfo), &PrimarySurface.devinfo, NULL, L"", - (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); + PrimarySurface.VideoFileObject->DeviceObject); /* If no handle, then fallback to default */ if (!PrimarySurface.hPDev) @@ -361,12 +361,12 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.gdiinfo), - &PrimarySurface.gdiinfo, + (PULONG)&PrimarySurface.gdiinfo, sizeof(PrimarySurface.devinfo), &PrimarySurface.devinfo, NULL, L"", - (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); + PrimarySurface.VideoFileObject->DeviceObject); if (!PrimarySurface.hPDev) {

1 0

[cgutman] 55076: [USB-BRINGUP-TRUNK] - Load the disk class for USB drives in 1st stage - They don't show up on the partition page due to some usetup stuff that needs to be changed
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 16:55:16 2012 New Revision: 55076 URL: http://svn.reactos.org/svn/reactos?rev=55076&view=rev Log: [USB-BRINGUP-TRUNK] - Load the disk class for USB drives in 1st stage - They don't show up on the partition page due to some usetup stuff that needs to be changed Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Jan 22 16:55:16 2012 @@ -78,6 +78,7 @@ PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid +GenDisk = disk [BootBusExtenders.Load] acpi = acpi.sys @@ -100,6 +101,7 @@ [SCSI.Load] uniata = uniata.sys buslogic = buslogic.sys +disk = disk.sys [Cabinets] Cabinet=reactos.cab

1 0

[janderwald] 55075: [USBSTOR] - Implement legacy IOCTL IOCTL_SCSI_GET_CAPABILITIES, IOCTL_SCSI_GET_INQUIRY_DATA, IOCTL_SCSI_GET_ADDRESS - Patch by Cameron Gutman and minor modifications
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 16:39:53 2012 New Revision: 55075 URL: http://svn.reactos.org/svn/reactos?rev=55075&view=rev Log: [USBSTOR] - Implement legacy IOCTL IOCTL_SCSI_GET_CAPABILITIES, IOCTL_SCSI_GET_INQUIRY_DATA, IOCTL_SCSI_GET_ADDRESS - Patch by Cameron Gutman and minor modifications Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Sun Jan 22 16:39:53 2012 @@ -526,6 +526,11 @@ { PIO_STACK_LOCATION IoStack; NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PSCSI_ADAPTER_BUS_INFO BusInfo; + PSCSI_INQUIRY_DATA InquiryData; + PINQUIRYDATA ScsiInquiryData; + PUFI_INQUIRY_RESPONSE UFIInquiryResponse; // // get current stack location @@ -538,14 +543,6 @@ // query property // Status = USBSTOR_HandleQueryProperty(DeviceObject, Irp); - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) - { - // - // query get scsi address - // - DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_GET_ADDRESS NOT implemented\n"); - Status = STATUS_NOT_SUPPORTED; } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH) { @@ -571,6 +568,105 @@ DPRINT1("USBSTOR_HandleDeviceControl IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER NOT implemented\n"); Status = STATUS_NOT_SUPPORTED; } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_CAPABILITIES) + { + PIO_SCSI_CAPABILITIES Capabilities; + + /* Legacy port capability query */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(PVOID)) + { + Capabilities = *((PVOID *)Irp->AssociatedIrp.SystemBuffer) = ExAllocatePool(NonPagedPool, sizeof(IO_SCSI_CAPABILITIES)); + Irp->IoStatus.Information = sizeof(PVOID); + } + else + { + Capabilities = Irp->AssociatedIrp.SystemBuffer; + Irp->IoStatus.Information = sizeof(IO_SCSI_CAPABILITIES); + } + + if (Capabilities) + { + Capabilities->MaximumTransferLength = MAXULONG; + Capabilities->MaximumPhysicalPages = 25; + Capabilities->SupportedAsynchronousEvents = 0; + Capabilities->AlignmentMask = 0; + Capabilities->TaggedQueuing = FALSE; + Capabilities->AdapterScansDown = FALSE; + Capabilities->AdapterUsesPio = FALSE; + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_INQUIRY_DATA) + { + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension); + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get parameters + // + BusInfo = Irp->AssociatedIrp.SystemBuffer; + InquiryData = (PSCSI_INQUIRY_DATA)(BusInfo + 1); + ScsiInquiryData = (PINQUIRYDATA)InquiryData->InquiryData; + + + // + // get inquiry data + // + UFIInquiryResponse = (PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData; + ASSERT(UFIInquiryResponse); + + + BusInfo->NumberOfBuses = 1; + BusInfo->BusData[0].NumberOfLogicalUnits = 1; //FIXME + BusInfo->BusData[0].InitiatorBusId = 0; + BusInfo->BusData[0].InquiryDataOffset = sizeof(SCSI_ADAPTER_BUS_INFO); + + InquiryData->PathId = 0; + InquiryData->TargetId = 0; + InquiryData->Lun = PDODeviceExtension->LUN & MAX_LUN; + InquiryData->DeviceClaimed = PDODeviceExtension->Claimed; + InquiryData->InquiryDataLength = sizeof(INQUIRYDATA); + InquiryData->NextInquiryDataOffset = 0; + + RtlZeroMemory(ScsiInquiryData, sizeof(INQUIRYDATA)); + ScsiInquiryData->DeviceType = UFIInquiryResponse->DeviceType; + ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F); + ScsiInquiryData->RemovableMedia = FALSE; //HACK for IoReadPartitionTable + ScsiInquiryData->Versions = 0x04; + ScsiInquiryData->ResponseDataFormat = 0x02; + ScsiInquiryData->AdditionalLength = 31; + ScsiInquiryData->SoftReset = 0; + ScsiInquiryData->CommandQueue = 0; + ScsiInquiryData->LinkedCommands = 0; + ScsiInquiryData->RelativeAddressing = 0; + + RtlCopyMemory(&ScsiInquiryData->VendorId, UFIInquiryResponse->Vendor, USBSTOR_GetFieldLength(UFIInquiryResponse->Vendor, 8)); + RtlCopyMemory(&ScsiInquiryData->ProductId, UFIInquiryResponse->Product, USBSTOR_GetFieldLength(UFIInquiryResponse->Product, 16)); + + Irp->IoStatus.Information = sizeof(SCSI_ADAPTER_BUS_INFO) + sizeof(SCSI_INQUIRY_DATA) + sizeof(INQUIRYDATA) - 1; + Status = STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) + { + PSCSI_ADDRESS Address = Irp->AssociatedIrp.SystemBuffer; + + Address->Length = sizeof(SCSI_ADDRESS); + Address->PortNumber = 0; + Address->PathId = 0; + Address->TargetId = 0; + Address->Lun = (((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LUN & MAX_LUN); + Irp->IoStatus.Information = sizeof(SCSI_ADDRESS); + + Status = STATUS_SUCCESS; + } else { // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Jan 22 16:39:53 2012 @@ -2,7 +2,7 @@ #pragma once #include <ntddk.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #include <usbdi.h> #include <hubbusif.h>

1 0

[cgutman] 55074: [USB-BRINGUP-TRUNK] - Remove the legacy usbdrv
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 16:07:58 2012 New Revision: 55074 URL: http://svn.reactos.org/svn/reactos?rev=55074&view=rev Log: [USB-BRINGUP-TRUNK] - Remove the legacy usbdrv Removed: branches/usb-bringup-trunk/drivers/usb/nt4compat/ Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/directory.rbuild Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1398,20 +1398,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1730,20 +1730,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1,4 +1,3 @@ -add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) add_subdirectory(usbhub_new) Modified: branches/usb-bringup-trunk/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/d… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> - <xi:include href="nt4compat/directory.rbuild" /> - </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[janderwald] 55073: [INF] - Add keyboard installation inf
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 15:25:43 2012 New Revision: 55073 URL: http://svn.reactos.org/svn/reactos?rev=55073&view=rev Log: [INF] - Add keyboard installation inf Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/key… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 55072: [PSDK] * Missed this one.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 15:17:55 2012 New Revision: 55072 URL: http://svn.reactos.org/svn/reactos?rev=55072&view=rev Log: [PSDK] * Missed this one. Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sun Jan 22 15:17:55 2012 @@ -353,7 +353,7 @@ /* Signed Types */ typedef SHORT *PSHORT; typedef LONG *PLONG; -typedef LONG NTSTATUS; +typedef _Return_type_success_(return >= 0) LONG NTSTATUS; typedef NTSTATUS *PNTSTATUS; typedef signed char SCHAR; typedef SCHAR *PSCHAR; @@ -381,8 +381,8 @@ typedef _Null_terminated_ PCSTR *PZPCSTR; /* Pointer to an Asciiz string */ -typedef CHAR *PSZ; -typedef CONST char *PCSZ; +typedef _Null_terminated_ CHAR *PSZ; +typedef _Null_terminated_ CONST char *PCSZ; /* UNICODE (Wide Character) types */ typedef wchar_t WCHAR; @@ -395,6 +395,7 @@ typedef _Null_terminated_ CONST WCHAR *LPCWSTR, *PCWSTR; typedef _Null_terminated_ PCWSTR *PZPCWSTR; typedef _Null_terminated_ CONST WCHAR UNALIGNED *LPCUWSTR, *PCUWSTR; +typedef _NullNull_terminated_ WCHAR *PZZWSTR; /* Cardinal Data Types */ typedef char CCHAR, *PCCHAR; @@ -489,7 +490,10 @@ typedef struct _STRING { USHORT Length; USHORT MaximumLength; - PCHAR Buffer; +#ifdef MIDL_PASS + [size_is(MaximumLength), length_is(Length) ] +#endif + _Field_size_bytes_part_opt_(MaximumLength, Length) PCHAR Buffer; } STRING, *PSTRING; typedef STRING ANSI_STRING; @@ -617,12 +621,14 @@ struct _CONTEXT; struct _EXCEPTION_RECORD; +_IRQL_requires_same_ +_Function_class_(EXCEPTION_ROUTINE) typedef EXCEPTION_DISPOSITION (NTAPI *PEXCEPTION_ROUTINE)( - struct _EXCEPTION_RECORD *ExceptionRecord, - PVOID EstablisherFrame, - struct _CONTEXT *ContextRecord, - PVOID DispatcherContext); + _Inout_ struct _EXCEPTION_RECORD *ExceptionRecord, + _In_ PVOID EstablisherFrame, + _Inout_ struct _CONTEXT *ContextRecord, + _In_ PVOID DispatcherContext); typedef struct _GROUP_AFFINITY { KAFFINITY Mask;

1 0

[janderwald] 55071: [USBHUB] - Fix build
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 14:58:19 2012 New Revision: 55071 URL: http://svn.reactos.org/svn/reactos?rev=55071&view=rev Log: [USBHUB] - Fix build Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Jan 22 14:58:19 2012 @@ -433,7 +433,7 @@ // // does the device provide a text description // - if (ChildDeviceExtension->usTextDescription->Buffer && ChildDeviceExtension->usTextDescription->Length) + if (ChildDeviceExtension->usTextDescription.Buffer && ChildDeviceExtension->usTextDescription.Length) { // // use device text

1 0

[janderwald] 55070: [USBHUB] - Check if there is device description buffer, as some usb devices don't provide one
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 14:51:32 2012 New Revision: 55070 URL: http://svn.reactos.org/svn/reactos?rev=55070&view=rev Log: [USBHUB] - Check if there is device description buffer, as some usb devices don't provide one Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Jan 22 14:51:32 2012 @@ -429,7 +429,17 @@ case DeviceTextLocationInformation: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - SourceString = &ChildDeviceExtension->usTextDescription; + + // + // does the device provide a text description + // + if (ChildDeviceExtension->usTextDescription->Buffer && ChildDeviceExtension->usTextDescription->Length) + { + // + // use device text + // + SourceString = &ChildDeviceExtension->usTextDescription; + } break; } default:

1 0

[akhaldi] 55069: [DDK] * Update wdm.h, ntifs.h and ntddk.h to reflect the recent XDK changes.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:51:10 2012 New Revision: 55069 URL: http://svn.reactos.org/svn/reactos?rev=55069&view=rev Log: [DDK] * Update wdm.h, ntifs.h and ntddk.h to reflect the recent XDK changes. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=55… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=55… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5506…

1 0

[akhaldi] 55068: [PSDK] * Add __out_data_source annotation.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:47:46 2012 New Revision: 55068 URL: http://svn.reactos.org/svn/reactos?rev=55068&view=rev Log: [PSDK] * Add __out_data_source annotation. Modified: trunk/reactos/include/psdk/specstrings.h Modified: trunk/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h… ============================================================================== --- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Sun Jan 22 14:47:46 2012 @@ -48,3 +48,13 @@ #define __analysis_noreturn #define __kernel_entry +#if (_MSC_VER >= 1000) && !defined(__midl) && defined(_PREFAST_) + +#define __inner_data_source(src_raw) _SA_annotes1(SAL_untrusted_data_source,src_raw) +#define __out_data_source(src_sym) _Post_ __inner_data_source(#src_sym) + +#else + +#define __out_data_source(src_sym) + +#endif

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012