Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[ekohl] 48710: Improvements to NtAdjustPrivilegesToken part 2: - Check for invalid parameter combinations. - Count privileges that will be changed before changing them. - Return required buffer siz...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 6 15:26:12 2010 New Revision: 48710 URL: http://svn.reactos.org/svn/reactos?rev=48710&view=rev Log: Improvements to NtAdjustPrivilegesToken part 2: - Check for invalid parameter combinations. - Count privileges that will be changed before changing them. - Return required buffer size. - Fail if the provided buffer is too small. See issue #5497 for more details. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Sep 6 15:26:12 2010 @@ -1958,22 +1958,21 @@ ULONG CapturedCount = 0; ULONG CapturedLength = 0; ULONG NewStateSize = 0; - ULONG PrivilegeCount; + ULONG ChangeCount; PTOKEN Token; ULONG i; ULONG j; ULONG k; ULONG Count; -#if 0 - ULONG a; - ULONG b; - ULONG c; -#endif NTSTATUS Status; PAGED_CODE(); DPRINT ("NtAdjustPrivilegesToken() called\n"); + + /* Fail, if we do not disable all privileges but NewState is NULL */ + if (DisableAllPrivileges == FALSE && NewState == NULL) + return STATUS_INVALID_PARAMETER; PreviousMode = KeGetPreviousMode (); if (PreviousMode != KernelMode) @@ -2067,21 +2066,77 @@ return Status; } - -#if 0 - SepAdjustPrivileges(Token, - 0, - PreviousMode, - PrivilegeCount, - Privileges, - PreviousState, - &a, - &b, - &c); -#endif - - PrivilegeCount = (BufferLength - FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges)) / - sizeof(LUID_AND_ATTRIBUTES); + /* Count the privileges that need to be changed */ + ChangeCount = 0; + for (i = 0; i < Token->PrivilegeCount; i++) + { + if (DisableAllPrivileges) + { + if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) + { + DPRINT("Attribute enabled\n"); + + ChangeCount++; + } + } + else + { + for (j = 0; j < CapturedCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) + { + DPRINT("Found privilege\n"); + + if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) + { + DPRINT("Attributes differ\n"); + DPRINT("Current attributes %lx New attributes %lx\n", + Token->Privileges[i].Attributes, + CapturedPrivileges[j].Attributes); + + ChangeCount++; + } + } + } + } + } + + /* + * Return the required buffer size and + * check if the available buffer is large enough + */ + if (PreviousState != NULL) + { + ULONG RequiredLength = (ULONG)sizeof(TOKEN_PRIVILEGES) + + ((ChangeCount - ANYSIZE_ARRAY) * (ULONG)sizeof(LUID_AND_ATTRIBUTES)); + + /* Try to return the required buffer length */ + _SEH2_TRY + { + *ReturnLength = RequiredLength; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Fail, if the buffer length is smaller than the required length */ + if (BufferLength < RequiredLength) + { + ObDereferenceObject(Token); + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); + + return STATUS_BUFFER_TOO_SMALL; + } + } + if (PreviousState != NULL) PreviousState->PrivilegeCount = 0; @@ -2091,27 +2146,16 @@ { for (i = 0; i < Token->PrivilegeCount; i++) { - if (Token->Privileges[i].Attributes != 0) - { - DPRINT ("Attributes differ\n"); + if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) + { + DPRINT ("Attributes enabled\n"); /* Save current privilege */ if (PreviousState != NULL) { - if (k < PrivilegeCount) - { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - } - else - { - /* - * FIXME: Should revert all the changes, calculate how - * much space would be needed, set ResultLength - * accordingly and fail. - */ - } + PreviousState->PrivilegeCount++; + PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; k++; } @@ -2139,27 +2183,16 @@ (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) { DPRINT ("Attributes differ\n"); - DPRINT ("Current attributes %lx desired attributes %lx\n", + DPRINT ("Current attributes %lx New attributes %lx\n", Token->Privileges[i].Attributes, CapturedPrivileges[j].Attributes); /* Save current privilege */ if (PreviousState != NULL) { - if (k < PrivilegeCount) - { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - } - else - { - /* - * FIXME: Should revert all the changes, calculate how - * much space would be needed, set ResultLength - * accordingly and fail. - */ - } + PreviousState->PrivilegeCount++; + PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; k++; } @@ -2177,14 +2210,9 @@ } } - Status = Count < CapturedCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; - } - - if (ReturnLength != NULL) - { - *ReturnLength = sizeof(TOKEN_PRIVILEGES) + - (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); - } + Status = (Count < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; + } + /* Dereference the token */ ObDereferenceObject (Token);

14 years, 1 month

[ekohl] 48709: Translated new boot loader options and fixed a typo.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 6 10:24:50 2010 New Revision: 48709 URL: http://svn.reactos.org/svn/reactos?rev=48709&view=rev Log: Translated new boot loader options and fixed a typo. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon Sep 6 10:24:50 2010 @@ -578,7 +578,7 @@ { 10, 9, - "Der PC wird automatisch neunstarten, wenn der Vorgang beendet ist.", + "Der PC wird automatisch neustarten, wenn der Vorgang beendet ist.", TEXT_STYLE_NORMAL }, { @@ -986,13 +986,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Boot-Loader auf der Festplatte installieren (MBR und VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Boot-Loader auf der Festplatte installieren (nur VBR).", TEXT_STYLE_NORMAL }, {

14 years, 1 month

[ekohl] 48708: fdc.inf: Fix a typo in the class guid. hdc.inf: Add missing manufacturer string.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 6 09:53:36 2010 New Revision: 48708 URL: http://svn.reactos.org/svn/reactos?rev=48708&view=rev Log: fdc.inf: Fix a typo in the class guid. hdc.inf: Add missing manufacturer string. Modified: trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=4870… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4870… ============================================================================== Binary files - no diff available.

14 years, 1 month

[ekohl] 48707: NtAdjustPrivilegesToken: Probe and capture parameters before use. See issue #5497 for more details.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 6 09:51:46 2010 New Revision: 48707 URL: http://svn.reactos.org/svn/reactos?rev=48707&view=rev Log: NtAdjustPrivilegesToken: Probe and capture parameters before use. See issue #5497 for more details. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Sep 6 09:51:46 2010 @@ -1953,11 +1953,13 @@ OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, OUT PULONG ReturnLength OPTIONAL) { - // PLUID_AND_ATTRIBUTES Privileges; + PLUID_AND_ATTRIBUTES CapturedPrivileges = NULL; KPROCESSOR_MODE PreviousMode; + ULONG CapturedCount = 0; + ULONG CapturedLength = 0; + ULONG NewStateSize = 0; ULONG PrivilegeCount; PTOKEN Token; - // ULONG Length; ULONG i; ULONG j; ULONG k; @@ -1973,30 +1975,95 @@ DPRINT ("NtAdjustPrivilegesToken() called\n"); - // PrivilegeCount = NewState->PrivilegeCount; PreviousMode = KeGetPreviousMode (); - // SeCaptureLuidAndAttributesArray(NewState->Privileges, - // PrivilegeCount, - // PreviousMode, - // NULL, - // 0, - // NonPagedPool, - // 1, - // &Privileges, - // &Length); - - Status = ObReferenceObjectByHandle (TokenHandle, - TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + /* Probe NewState */ + if (DisableAllPrivileges == FALSE) + { + ProbeForRead(NewState, + sizeof(TOKEN_PRIVILEGES), + sizeof(ULONG)); + + CapturedCount = NewState->PrivilegeCount; + NewStateSize = (ULONG)sizeof(TOKEN_PRIVILEGES) + + ((CapturedCount - ANYSIZE_ARRAY) * (ULONG)sizeof(LUID_AND_ATTRIBUTES)); + + ProbeForRead(NewState, + NewStateSize, + sizeof(ULONG)); + } + + /* Probe PreviousState and ReturnLength */ + if (PreviousState != NULL) + { + ProbeForWrite(PreviousState, + BufferLength, + sizeof(ULONG)); + + ProbeForWrite(ReturnLength, + sizeof(ULONG), + sizeof(ULONG)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + if (DisableAllPrivileges == FALSE) + CapturedCount = NewState->PrivilegeCount; + } + + if (DisableAllPrivileges == FALSE) + { + _SEH2_TRY + { + /* Capture the new state array of privileges */ + Status = SeCaptureLuidAndAttributesArray(NewState->Privileges, + CapturedCount, + PreviousMode, + NULL, + 0, + PagedPool, + TRUE, + &CapturedPrivileges, + &CapturedLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + return Status; + } + + /* Reference the token */ + Status = ObReferenceObjectByHandle(TokenHandle, + TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1 ("Failed to reference token (Status %lx)\n", Status); - // SeReleaseLuidAndAttributesArray(Privileges, - // PreviousMode, - // 0); + + /* Release the captured privileges */ + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); + return Status; } @@ -2061,20 +2128,20 @@ Count = 0; for (i = 0; i < Token->PrivilegeCount; i++) { - for (j = 0; j < NewState->PrivilegeCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == NewState->Privileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == NewState->Privileges[j].Luid.HighPart) + for (j = 0; j < CapturedCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) { DPRINT ("Found privilege\n"); if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED)) + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) { DPRINT ("Attributes differ\n"); DPRINT ("Current attributes %lx desired attributes %lx\n", Token->Privileges[i].Attributes, - NewState->Privileges[j].Attributes); + CapturedPrivileges[j].Attributes); /* Save current privilege */ if (PreviousState != NULL) @@ -2100,7 +2167,7 @@ /* Update current privlege */ Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; Token->Privileges[i].Attributes |= - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED); + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED); DPRINT ("New attributes %lx\n", Token->Privileges[i].Attributes); } @@ -2110,7 +2177,7 @@ } } - Status = Count < NewState->PrivilegeCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; + Status = Count < CapturedCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; } if (ReturnLength != NULL) @@ -2119,11 +2186,14 @@ (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); } + /* Dereference the token */ ObDereferenceObject (Token); - // SeReleaseLuidAndAttributesArray(Privileges, - // PreviousMode, - // 0); + /* Release the captured privileges */ + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); DPRINT ("NtAdjustPrivilegesToken() done\n");

14 years, 1 month

[tkreuzer] 48706: [USETUP] The VBR (volume boot sector) contains a structure called BPB (bios parameter block) that describes the disk and the partition. The HiddenSectors member contains the numbe...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 6 01:46:06 2010 New Revision: 48706 URL: http://svn.reactos.org/svn/reactos?rev=48706&view=rev Log: [USETUP] The VBR (volume boot sector) contains a structure called BPB (bios parameter block) that describes the disk and the partition. The HiddenSectors member contains the number of the first sector of the partition. This is used by the VBR code to load the secondary sector containing additional boot code that is located at secor 14 relative to the partition start. Previously we were copying the BPB (plus additionally the OemName, which makes no sense) from the old VBR. Now Linux is a bit lame and doesn't put the correct value into the HiddenSectors field. Instead it sets it to the number of sectors per track which seems to be the default value. When now the linux partition manager decides to do a non standard partitioning, aligning the partition to 0x800, then the VBR fails to load it's 2nd sector. Fix this by correcting the value in the BPB with the value from the partition info. See issue #2733 for more details. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Sep 6 01:46:06 2010 @@ -31,6 +31,75 @@ #define SECTORSIZE 512 +#include <pshpack1.h> +typedef struct _FAT_BOOTSECTOR +{ + UCHAR JumpBoot[3]; // Jump instruction to boot code + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + USHORT BytesPerSector; // Bytes per sector + UCHAR SectorsPerCluster; // Number of sectors in a cluster + USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) + UCHAR NumberOfFats; // Number of FAT tables + USHORT RootDirEntries; // Number of root directory entries (fat12/16) + USHORT TotalSectors; // Number of total sectors on the drive, 16-bit + UCHAR MediaDescriptor; // Media descriptor byte + USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) + USHORT SectorsPerTrack; // Number of sectors in a track + USHORT NumberOfHeads; // Number of heads on the disk + ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) + ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume + UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) + UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. + UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. + ULONG VolumeSerialNumber; // Volume serial number + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " + + UCHAR BootCodeAndData[448]; // The remainder of the boot sector + + USHORT BootSectorMagic; // 0xAA55 + +} FAT_BOOTSECTOR, *PFAT_BOOTSECTOR; + +typedef struct _FAT32_BOOTSECTOR +{ + UCHAR JumpBoot[3]; // Jump instruction to boot code + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + USHORT BytesPerSector; // Bytes per sector + UCHAR SectorsPerCluster; // Number of sectors in a cluster + USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) + UCHAR NumberOfFats; // Number of FAT tables + USHORT RootDirEntries; // Number of root directory entries (fat12/16) + USHORT TotalSectors; // Number of total sectors on the drive, 16-bit + UCHAR MediaDescriptor; // Media descriptor byte + USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) + USHORT SectorsPerTrack; // Number of sectors in a track + USHORT NumberOfHeads; // Number of heads on the disk + ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) + ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume + ULONG SectorsPerFatBig; // This field is the FAT32 32-bit count of sectors occupied by ONE FAT. BPB_FATSz16 must be 0 + USHORT ExtendedFlags; // Extended flags (fat32) + USHORT FileSystemVersion; // File system version (fat32) + ULONG RootDirStartCluster; // Starting cluster of the root directory (fat32) + USHORT FsInfo; // Sector number of FSINFO structure in the reserved area of the FAT32 volume. Usually 1. + USHORT BackupBootSector; // If non-zero, indicates the sector number in the reserved area of the volume of a copy of the boot record. Usually 6. + UCHAR Reserved[12]; // Reserved for future expansion + UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) + UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. + UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. + ULONG VolumeSerialNumber; // Volume serial number + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // Always set to the string "FAT32 " + + UCHAR BootCodeAndData[420]; // The remainder of the boot sector + + USHORT BootSectorMagic; // 0xAA55 + +} FAT32_BOOTSECTOR, *PFAT32_BOOTSECTOR; +#include <poppack.h> + +extern PPARTLIST PartitionList; + /* FUNCTIONS ****************************************************************/ @@ -1094,53 +1163,53 @@ InstallMbrBootCodeToDisk (PWSTR SrcPath, PWSTR RootPath) { - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; - HANDLE FileHandle; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; PPARTITION_SECTOR OrigBootSector; PPARTITION_SECTOR NewBootSector; - /* Allocate buffer for original bootsector */ + /* Allocate buffer for original bootsector */ OrigBootSector = (PPARTITION_SECTOR)RtlAllocateHeap(ProcessHeap, 0, sizeof(PARTITION_SECTOR)); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); - /* Read current boot sector into buffer */ + /* Read current boot sector into buffer */ RtlInitUnicodeString(&Name, RootPath); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(ProcessHeap, 0, OrigBootSector); - return(Status); - } - - Status = NtReadFile(FileHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return(Status); + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, OrigBootSector, - SECTORSIZE, - NULL, - NULL); - NtClose(FileHandle); + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); if (!NT_SUCCESS(Status)) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1256,11 +1325,12 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT_BOOTSECTOR OrigBootSector; + PFAT_BOOTSECTOR NewBootSector; + PARTITION_INFORMATION *PartInfo; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (OrigBootSector == NULL) @@ -1306,7 +1376,7 @@ /* Allocate buffer for new bootsector */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + NewBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (NewBootSector == NULL) @@ -1356,9 +1426,12 @@ } /* Adjust bootsector (copy a part of the FAT16 BPB) */ - memcpy((NewBootSector + 3), - (OrigBootSector + 3), - 59); /* FAT16 BPB length*/ + memcpy(&NewBootSector->BytesPerSector, + &OrigBootSector->BytesPerSector, + 51); /* FAT16 BPB length */ + + PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; + NewBootSector->HiddenSectors = PartInfo->HiddenSectors; /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1416,13 +1489,14 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT32_BOOTSECTOR OrigBootSector; + PFAT32_BOOTSECTOR NewBootSector; LARGE_INTEGER FileOffset; USHORT BackupBootSector; + PARTITION_INFORMATION *PartInfo; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (OrigBootSector == NULL) @@ -1468,7 +1542,7 @@ /* Allocate buffer for new bootsector (2 sectors) */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, + NewBootSector = RtlAllocateHeap(ProcessHeap, 0, 2 * SECTORSIZE); if (NewBootSector == NULL) @@ -1518,12 +1592,15 @@ } /* Adjust bootsector (copy a part of the FAT32 BPB) */ - memcpy((NewBootSector + 3), - (OrigBootSector + 3), - 87); /* FAT32 BPB length */ + memcpy(&NewBootSector->BytesPerSector, + &OrigBootSector->BytesPerSector, + 79); /* FAT32 BPB length */ + + PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; + NewBootSector->HiddenSectors = PartInfo->HiddenSectors; /* Get the location of the backup boot sector */ - BackupBootSector = (OrigBootSector[0x33] << 8) + OrigBootSector[0x32]; + BackupBootSector = OrigBootSector->BackupBootSector; /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1599,7 +1676,7 @@ NULL, NULL, &IoStatusBlock, - (NewBootSector + SECTORSIZE), + ((PUCHAR)NewBootSector + SECTORSIZE), SECTORSIZE, &FileOffset, NULL); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Sep 6 01:46:06 2010 @@ -51,10 +51,9 @@ WCHAR DefaultKBLayout[20]; BOOLEAN RepairUpdateFlag = FALSE; HANDLE hPnpThread = INVALID_HANDLE_VALUE; +PPARTLIST PartitionList = NULL; /* LOCALS *******************************************************************/ - -static PPARTLIST PartitionList = NULL; static PFILE_SYSTEM_LIST FileSystemList = NULL;

14 years, 1 month

[mjmartin] 48705: [usb/usbhub] - Start rewrite of usbhub driver using the old and dead usbhub driver in trunk. - Implement QueryRootHub for sending USB request to miniport driver. - Implement new I...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Sep 5 19:00:37 2010 New Revision: 48705 URL: http://svn.reactos.org/svn/reactos?rev=48705&view=rev Log: [usb/usbhub] - Start rewrite of usbhub driver using the old and dead usbhub driver in trunk. - Implement QueryRootHub for sending USB request to miniport driver. - Implement new IRP_MN_START_DEVICE. Get the roothubs PDO and FDO and forward the start device down to start the PDO. Get USBDI and HUB interfaces. Set all ports as returned by DCI GetExtendedHubInformation to powered and reset. - Temporary add some usb specific defines until header is fixed. - Fix Formatting. Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/misc.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.c trunk/reactos/drivers/usb/usbhub/usbhub.h trunk/reactos/drivers/usb/usbhub/usbhub.rbuild Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -4,499 +4,574 @@ * FILE: drivers/usb/cromwell/hub/fdo.c * PURPOSE: IRP_MJ_PNP operations for FDOs * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Hervï¿½ Poussineau (hpoussin(a)reactos.com) + * Michael Martin (michael.martin(a)reactos.org) */ #define INITGUID +#include <stdio.h> #define NDEBUG #include "usbhub.h" +#include "usbdlib.h" #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) +NTSTATUS +QueryRootHub(IN PDEVICE_OBJECT Pdo, IN ULONG IoControlCode, OUT PVOID OutParameter1, OUT PVOID OutParameter2) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + Pdo, + NULL, 0, + NULL, 0, + TRUE, + &Event, + &IoStatus); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the status block before sending the IRP */ + + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + Stack = IoGetNextIrpStackLocation(Irp); + + Stack->Parameters.Others.Argument1 = OutParameter1; + Stack->Parameters.Others.Argument2 = OutParameter2; + + Status = IoCallDriver(Pdo, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Usbhub: Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + +NTSTATUS QueryInterface(IN PDEVICE_OBJECT Pdo, IN CONST GUID InterfaceType, IN LONG Size, IN LONG Version, OUT PVOID Interface) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + Pdo, + NULL, + 0, + NULL, + &Event, + &IoStatus); + + Stack = IoGetNextIrpStackLocation(Irp); + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.InterfaceType= &InterfaceType;//USB_BUS_INTERFACE_HUB_GUID; + Stack->Parameters.QueryInterface.Size = Size; + Stack->Parameters.QueryInterface.Version = Version; + Stack->Parameters.QueryInterface.Interface = Interface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + + Status = IoCallDriver(Pdo, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Usbhub: Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + static VOID -UsbhubGetUserBuffers( - IN PIRP Irp, - IN ULONG IoControlCode, - OUT PVOID* BufferIn, - OUT PVOID* BufferOut) -{ - ASSERT(Irp); - ASSERT(BufferIn); - ASSERT(BufferOut); - - switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) - { - case METHOD_BUFFERED: - *BufferIn = *BufferOut = Irp->AssociatedIrp.SystemBuffer; - break; - case METHOD_IN_DIRECT: - case METHOD_OUT_DIRECT: - *BufferIn = Irp->AssociatedIrp.SystemBuffer; - *BufferOut = MmGetSystemAddressForMdl(Irp->MdlAddress); - break; - case METHOD_NEITHER: - *BufferIn = IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.Type3InputBuffer; - *BufferOut = Irp->UserBuffer; - break; - default: - /* Should never happen */ - *BufferIn = NULL; - *BufferOut = NULL; - break; - } -} - -static NTSTATUS -UsbhubFdoQueryBusRelations( - IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_RELATIONS* pDeviceRelations) -{ - PHUB_DEVICE_EXTENSION DeviceExtension; - PDEVICE_RELATIONS DeviceRelations; - PDEVICE_OBJECT Pdo; - PHUB_DEVICE_EXTENSION PdoExtension; - struct usb_device* dev; - ULONG i; - ULONG Children = 0; - ULONG NeededSize; - NTSTATUS Status; - CHAR Buffer[3][40]; - - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - dev = DeviceExtension->dev; - - /* Create PDOs that are missing */ - for (i = 0; i < dev->maxchild; i++) - { - if (dev->children[i] == NULL) - { - /* No child device at this place */ - continue; - } - Children++; - if (DeviceExtension->Children[i] != NULL) - { - /* PDO already exists */ - continue; - } - /* Need to create the PDO */ - Status = IoCreateDevice( - DeviceObject->DriverObject, - sizeof(HUB_DEVICE_EXTENSION), - NULL, /* Device name */ - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &DeviceExtension->Children[i]); - if (!NT_SUCCESS(Status)) - { - DPRINT("Usbhub: IoCreateDevice() failed with status 0x%08lx\n", Status); - return Status; - } - - Pdo = DeviceExtension->Children[i]; - Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - - PdoExtension = Pdo->DeviceExtension; - RtlZeroMemory(PdoExtension, sizeof(HUB_DEVICE_EXTENSION)); - - PdoExtension->IsFDO = FALSE; - PdoExtension->dev = dev->children[i]; - - sprintf(Buffer[0], "%lu", i); - Status = UsbhubInitMultiSzString( - &PdoExtension->InstanceId, - Buffer[0], NULL); - if (!NT_SUCCESS(Status)) - goto ByeBye; - - DPRINT1("child #%lu: USB\\Vid_%04x&Pid_%04x&Rev_%04x\n", - i, - PdoExtension->dev->descriptor.idVendor, - PdoExtension->dev->descriptor.idProduct, - PdoExtension->dev->descriptor.bcdDevice); - sprintf(Buffer[0], "USB\\Vid_%04x&Pid_%04x&Rev_%04x", - PdoExtension->dev->descriptor.idVendor, - PdoExtension->dev->descriptor.idProduct, - PdoExtension->dev->descriptor.bcdDevice); - sprintf(Buffer[1], "USB\\Vid_%04x&Pid_%04x", - PdoExtension->dev->descriptor.idVendor, - PdoExtension->dev->descriptor.idProduct); - Status = UsbhubInitMultiSzString( - &PdoExtension->HardwareIds, - Buffer[0], Buffer[1], NULL); - if (!NT_SUCCESS(Status)) - goto ByeBye; - - Status = UsbhubInitMultiSzString( - &PdoExtension->DeviceId, - Buffer[1], NULL); - if (!NT_SUCCESS(Status)) - goto ByeBye; - - if (PdoExtension->dev->actconfig->desc.bNumInterfaces == 1) - { - /* Single-interface USB device */ - if (PdoExtension->dev->descriptor.bDeviceClass != 0) - { - /* Use these values for device class/sub class/protocol */ - sprintf(Buffer[0], "USB\\Class_%02x&SubClass_%02x&Prot_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass, - PdoExtension->dev->descriptor.bDeviceProtocol); - sprintf(Buffer[1], "USB\\Class_%02x&SubClass_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass); - sprintf(Buffer[2], "USB\\Class_%02x", - PdoExtension->dev->descriptor.bDeviceClass); - } - else - { - /* Use values specified in the interface descriptor */ - struct usb_host_interface *itf = PdoExtension->dev->actconfig->interface->altsetting; - sprintf(Buffer[0], "USB\\Class_%02x&SubClass_%02x&Prot_%02x", - itf->desc.bInterfaceClass, - itf->desc.bInterfaceSubClass, - itf->desc.bInterfaceProtocol); - sprintf(Buffer[1], "USB\\Class_%02x&SubClass_%02x", - itf->desc.bInterfaceClass, - itf->desc.bInterfaceSubClass); - sprintf(Buffer[2], "USB\\Class_%02x", - itf->desc.bInterfaceClass); - } - Status = UsbhubInitMultiSzString( - &PdoExtension->CompatibleIds, - Buffer[0], Buffer[1], Buffer[2], NULL); - } - else - { - /* Multiple-interface USB device */ - sprintf(Buffer[0], "USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass, - PdoExtension->dev->descriptor.bDeviceProtocol); - sprintf(Buffer[1], "USB\\DevClass_%02x&SubClass_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass); - sprintf(Buffer[2], "USB\\DevClass_%02x", - PdoExtension->dev->descriptor.bDeviceClass); - Status = UsbhubInitMultiSzString( - &PdoExtension->CompatibleIds, - Buffer[0], Buffer[1], Buffer[2], "USB\\COMPOSITE", NULL); - } - - if (!NT_SUCCESS(Status)) - goto ByeBye; - - Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - } - - /* Fill returned structure */ - NeededSize = sizeof(DEVICE_RELATIONS); - if (Children > 1) - NeededSize += (Children - 1) * sizeof(PDEVICE_OBJECT); - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool( - PagedPool, - NeededSize); - if (!DeviceRelations) - return STATUS_INSUFFICIENT_RESOURCES; - DeviceRelations->Count = Children; - Children = 0; - for (i = 0; i < USB_MAXCHILDREN; i++) - { - if (DeviceExtension->Children[i]) - { - ObReferenceObject(DeviceExtension->Children[i]); - DeviceRelations->Objects[Children++] = DeviceExtension->Children[i]; - } - } - ASSERT(Children == DeviceRelations->Count); - - *pDeviceRelations = DeviceRelations; - return STATUS_SUCCESS; - -ByeBye: - RtlFreeUnicodeString(&PdoExtension->DeviceId); - RtlFreeUnicodeString(&PdoExtension->InstanceId); - RtlFreeUnicodeString(&PdoExtension->HardwareIds); - RtlFreeUnicodeString(&PdoExtension->CompatibleIds); - IoDeleteDevice(Pdo); - return Status; +UsbhubGetUserBuffers(IN PIRP Irp, IN ULONG IoControlCode, OUT PVOID* BufferIn, OUT PVOID* BufferOut) +{ + ASSERT(Irp); + ASSERT(BufferIn); + ASSERT(BufferOut); + + switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) + { + case METHOD_BUFFERED: + *BufferIn = *BufferOut = Irp->AssociatedIrp.SystemBuffer; + break; + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + *BufferIn = Irp->AssociatedIrp.SystemBuffer; + *BufferOut = MmGetSystemAddressForMdl(Irp->MdlAddress); + break; + case METHOD_NEITHER: + *BufferIn = IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.Type3InputBuffer; + *BufferOut = Irp->UserBuffer; + break; + default: + /* Should never happen */ + *BufferIn = NULL; + *BufferOut = NULL; + break; + } +} + +NTSTATUS +UsbhubFdoQueryBusRelations(IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_RELATIONS* pDeviceRelations) +{ + PHUB_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS DeviceRelations; + PDEVICE_OBJECT Pdo; + PHUB_DEVICE_EXTENSION PdoExtension; + ULONG i; + ULONG Children = 0; + ULONG NeededSize; + + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DPRINT1("USBHUB: Query Bus Relations\n"); + /* Create PDOs that are missing */ + for (i = 0; i < USB_MAXCHILDREN; i++) + { + + if (DeviceExtension->Children[i] == NULL) + { + continue; + } + Children++; + Pdo = DeviceExtension->Children[i]; + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + + PdoExtension = Pdo->DeviceExtension; + + RtlZeroMemory(PdoExtension, sizeof(HUB_DEVICE_EXTENSION)); + + PdoExtension->IsFDO = FALSE; + + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + } + + /* Fill returned structure */ + NeededSize = sizeof(DEVICE_RELATIONS); + if (Children > 1) + NeededSize += (Children - 1) * sizeof(PDEVICE_OBJECT); + + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, + NeededSize); + + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + DeviceRelations->Count = Children; + Children = 0; + + for (i = 0; i < USB_MAXCHILDREN; i++) + { + if (DeviceExtension->Children[i]) + { + ObReferenceObject(DeviceExtension->Children[i]); + DeviceRelations->Objects[Children++] = DeviceExtension->Children[i]; + } + } + ASSERT(Children == DeviceRelations->Count); + + *pDeviceRelations = DeviceRelations; + return STATUS_SUCCESS; } NTSTATUS NTAPI -UsbhubPnpFdo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - ULONG MinorFunction; - ULONG_PTR Information = 0; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - MinorFunction = IrpSp->MinorFunction; - - switch (MinorFunction) - { - case IRP_MN_START_DEVICE: /* 0x0 */ - { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - Status = ForwardIrpAndWait(DeviceObject, Irp); - break; - } - - case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ - { - switch (IrpSp->Parameters.QueryDeviceRelations.Type) - { - case BusRelations: - { - PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); - Status = UsbhubFdoQueryBusRelations(DeviceObject, &DeviceRelations); - Information = (ULONG_PTR)DeviceRelations; - break; - } - case RemovalRelations: - { - DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); - return ForwardIrpAndForget(DeviceObject, Irp); - } - default: - DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", - IrpSp->Parameters.QueryDeviceRelations.Type); - return ForwardIrpAndForget(DeviceObject, Irp); - } - break; - } - - default: - { - DPRINT1("Usbhub: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); - return ForwardIrpAndForget(DeviceObject, Irp); - } - } - Irp->IoStatus.Information = Information; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; +UsbhubPnpFdo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + ULONG MinorFunction; + ULONG_PTR Information = 0; + PHUB_DEVICE_EXTENSION DeviceExtension; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = IrpSp->MinorFunction; + + DeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + switch (MinorFunction) + { + case IRP_MN_START_DEVICE: /* 0x0 */ + { + URB Urb; + ULONG Result = 0; + USB_DEVICE_INFORMATION_0 DeviceInformation; + + /* We differ from windows on hubpdo because we dont have usbport.sys which manages all usb device objects */ + DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + + /* Get the hubs PDO */ + QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, &DeviceExtension->RootHubPdo, &DeviceExtension->RootHubFdo); + ASSERT(DeviceExtension->RootHubPdo); + ASSERT(DeviceExtension->RootHubFdo); + + /* Send the START_DEVICE irp down to the PDO of RootHub */ + Status = ForwardIrpAndWait(DeviceExtension->RootHubPdo, Irp); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to start the RootHub PDO\n"); + ASSERT(FALSE); + } + + /* Get the current number of hubs */ + QueryRootHub(DeviceObject,IOCTL_INTERNAL_USB_GET_HUB_COUNT, &DeviceExtension->HubCount, NULL); + + /* Get the Direct Call Interfaces */ + Status = QueryInterface(DeviceObject, USB_BUS_INTERFACE_HUB_GUID, sizeof(USB_BUS_INTERFACE_HUB_V5), 5, (PVOID)&DeviceExtension->HubInterface); + if (!NT_SUCCESS(Status)) + { + DPRINT1("UsbhubM Failed to get HUB_GUID interface with status 0x%08lx\n", Status); + return STATUS_UNSUCCESSFUL; + } + + Status = QueryInterface(DeviceObject, USB_BUS_INTERFACE_USBDI_GUID, sizeof(USB_BUS_INTERFACE_USBDI_V2), 2, (PVOID)&DeviceExtension->UsbDInterface); + if (!NT_SUCCESS(Status)) + { + DPRINT1("UsbhubM Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); + return STATUS_UNSUCCESSFUL; + } + + /* Get roothub device handle */ + Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, &DeviceExtension->RootHubUsbDevice, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Usbhub: GetRootHubDeviceHandle failed with status 0x%08lx\n", Status); + return Status; + } + + RtlZeroMemory(&DeviceInformation, sizeof(USB_DEVICE_INFORMATION_0)); + + Status = DeviceExtension->HubInterface.QueryDeviceInformation(DeviceExtension->RootHubPdo, + DeviceExtension->RootHubUsbDevice, + &DeviceInformation, + sizeof(USB_DEVICE_INFORMATION_0), + &Result); + + DPRINT1("Status %x, Result %x\n", Status, Result); + DPRINT1("InformationLevel %x\n", DeviceInformation.InformationLevel); + DPRINT1("ActualLength %x\n", DeviceInformation.ActualLength); + DPRINT1("PortNumber %x\n", DeviceInformation.PortNumber); + DPRINT1("DeviceDescriptor %x\n", DeviceInformation.DeviceDescriptor); + DPRINT1("HubAddress %x\n", DeviceInformation.HubAddress); + DPRINT1("NumberofPipes %x\n", DeviceInformation.NumberOfOpenPipes); + + + + UsbBuildGetDescriptorRequest(&Urb, + sizeof(Urb.UrbControlDescriptorRequest), + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0, + &DeviceExtension->HubDeviceDescriptor, + NULL, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Usbhub: Failed to get HubDeviceDescriptor!\n"); + } + + UsbBuildGetDescriptorRequest(&Urb, + sizeof(Urb.UrbControlDescriptorRequest), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0, + &DeviceExtension->HubConfig, + NULL, + sizeof(USB_CONFIGURATION_DESCRIPTOR), + NULL); + Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Usbhub: Failed to get HubConfig!\n"); + } + + Status = DeviceExtension->HubInterface.GetExtendedHubInformation(DeviceExtension->RootHubPdo, + DeviceExtension->RootHubPdo, + &DeviceExtension->UsbExtHubInfo, + sizeof(USB_EXTHUB_INFORMATION_0), + &Result); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Usbhub: Failed to extended hub information. Unable to determine the number of ports!\n"); + ASSERT(FALSE); + } + + DPRINT1("DeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", DeviceExtension->UsbExtHubInfo.NumberOfPorts); + + /* FIXME: HubDescriptor is empty and shouldnt be but Status is success */ + UsbBuildVendorRequest(&Urb, + URB_FUNCTION_CLASS_DEVICE, + sizeof(Urb.UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN, + 0, + USB_DEVICE_CLASS_RESERVED, + 0, + 0, + &DeviceExtension->HubDescriptor, + NULL, + sizeof(USB_HUB_DESCRIPTOR), + NULL); + + Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + + DPRINT1("bDescriptorType %x\n", DeviceExtension->HubDescriptor.bDescriptorType); + + Status = DeviceExtension->HubInterface.Initialize20Hub(DeviceExtension->RootHubPdo, DeviceExtension->RootHubUsbDevice, 1); + + break; + } + + case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ + { + switch (IrpSp->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + { + PDEVICE_RELATIONS DeviceRelations = NULL; + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + + Status = UsbhubFdoQueryBusRelations(DeviceObject, &DeviceRelations); + + Information = (ULONG_PTR)DeviceRelations; + break; + } + case RemovalRelations: + { + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + } + default: + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + IrpSp->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceObject, Irp); + } + break; + } +case IRP_MN_QUERY_BUS_INFORMATION: +{ +DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); +break; +} + +case IRP_MN_QUERY_ID: +{ +DPRINT1("IRP_MN_QUERY_ID\n"); +break; +} + + +case IRP_MN_QUERY_CAPABILITIES: +{ +DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); +break; +} + + + + default: + { + DPRINT1("Usbhub: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS -UsbhubDeviceControlFdo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION Stack; - ULONG IoControlCode; - PHUB_DEVICE_EXTENSION DeviceExtension; - ULONG LengthIn, LengthOut; - ULONG_PTR Information = 0; - PVOID BufferIn, BufferOut; - NTSTATUS Status; - - Stack = IoGetCurrentIrpStackLocation(Irp); - LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; - LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; - UsbhubGetUserBuffers(Irp, IoControlCode, &BufferIn, &BufferOut); - - switch (IoControlCode) - { - case IOCTL_USB_GET_NODE_INFORMATION: - { - PUSB_NODE_INFORMATION NodeInformation; - struct usb_device* dev; - DPRINT("Usbhub: IOCTL_USB_GET_NODE_INFORMATION\n"); - if (LengthOut < sizeof(USB_NODE_INFORMATION)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (BufferOut == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - NodeInformation = (PUSB_NODE_INFORMATION)BufferOut; - dev = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->dev; - NodeInformation->NodeType = UsbHub; - RtlCopyMemory( - &NodeInformation->u.HubInformation.HubDescriptor, - ((struct usb_hub *)usb_get_intfdata(to_usb_interface(&dev->actconfig->interface[0].dev)))->descriptor, - sizeof(USB_HUB_DESCRIPTOR)); - NodeInformation->u.HubInformation.HubIsBusPowered = dev->actconfig->desc.bmAttributes & 0x80; - Information = sizeof(USB_NODE_INFORMATION); - Status = STATUS_SUCCESS; - } - break; - } - case IOCTL_USB_GET_NODE_CONNECTION_NAME: - { - PHUB_DEVICE_EXTENSION DeviceExtension; - PUSB_NODE_CONNECTION_NAME ConnectionName; - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ConnectionName = (PUSB_NODE_CONNECTION_NAME)BufferOut; - - DPRINT("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_NAME\n"); - if (LengthOut < sizeof(USB_NODE_CONNECTION_NAME)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (BufferOut == NULL) - Status = STATUS_INVALID_PARAMETER; - else if (ConnectionName->ConnectionIndex < 1 - || ConnectionName->ConnectionIndex > USB_MAXCHILDREN) - Status = STATUS_INVALID_PARAMETER; - else if (DeviceExtension->Children[ConnectionName->ConnectionIndex - 1] == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - ULONG NeededStructureSize; - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceExtension->Children[ConnectionName->ConnectionIndex - 1]->DeviceExtension; - NeededStructureSize = DeviceExtension->SymbolicLinkName.Length + sizeof(UNICODE_NULL) + FIELD_OFFSET(USB_NODE_CONNECTION_NAME, NodeName); - if (ConnectionName->ActualLength < NeededStructureSize / sizeof(WCHAR) - || LengthOut < NeededStructureSize) - { - /* Buffer too small */ - ConnectionName->ActualLength = NeededStructureSize / sizeof(WCHAR); - Information = sizeof(USB_NODE_CONNECTION_NAME); - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - RtlCopyMemory( - ConnectionName->NodeName, - DeviceExtension->SymbolicLinkName.Buffer, - DeviceExtension->SymbolicLinkName.Length); - ConnectionName->NodeName[DeviceExtension->SymbolicLinkName.Length / sizeof(WCHAR)] = UNICODE_NULL; - DPRINT("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_NAME returns '%S'\n", ConnectionName->NodeName); - ConnectionName->ActualLength = NeededStructureSize / sizeof(WCHAR); - Information = NeededStructureSize; - Status = STATUS_SUCCESS; - } - Information = LengthOut; - } - break; - } - case IOCTL_USB_GET_NODE_CONNECTION_INFORMATION: - { - PUSB_NODE_CONNECTION_INFORMATION ConnectionInformation; - ULONG i, j, k; - struct usb_device* dev; - ULONG NumberOfOpenPipes = 0; - ULONG SizeOfOpenPipesArray; - ConnectionInformation = (PUSB_NODE_CONNECTION_INFORMATION)BufferOut; - - DPRINT("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_INFORMATION\n"); - if (LengthOut < sizeof(USB_NODE_CONNECTION_INFORMATION)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (BufferOut == NULL) - Status = STATUS_INVALID_PARAMETER; - else if (ConnectionInformation->ConnectionIndex < 1 - || ConnectionInformation->ConnectionIndex > USB_MAXCHILDREN) - Status = STATUS_INVALID_PARAMETER; - else - { - dev = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->dev; - dev = dev->children[ConnectionInformation->ConnectionIndex - 1]; - if (dev == NULL) - { - /* No device connected to this port */ - RtlZeroMemory( - &ConnectionInformation->DeviceDescriptor, - sizeof(USB_NODE_CONNECTION_INFORMATION) - FIELD_OFFSET(USB_NODE_CONNECTION_INFORMATION, DeviceDescriptor)); - ConnectionInformation->ConnectionStatus = NoDeviceConnected; - Information = sizeof(USB_NODE_CONNECTION_INFORMATION); - Status = STATUS_SUCCESS; - break; - } - SizeOfOpenPipesArray = (LengthOut - FIELD_OFFSET(USB_NODE_CONNECTION_INFORMATION, PipeList)) / sizeof(USB_PIPE_INFO); - RtlCopyMemory( - &ConnectionInformation->DeviceDescriptor, - &dev->descriptor, - sizeof(USB_DEVICE_DESCRIPTOR)); - ConnectionInformation->CurrentConfigurationValue = dev->actconfig->desc.bConfigurationValue; - ConnectionInformation->LowSpeed = dev->speed == USB_SPEED_LOW || dev->speed == USB_SPEED_FULL; - ConnectionInformation->DeviceIsHub = dev->descriptor.bDeviceClass == USB_CLASS_HUB; - ConnectionInformation->DeviceAddress = dev->devnum; - ConnectionInformation->ConnectionStatus = DeviceConnected; - - for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) - for (j = 0; j < dev->actconfig->interface[i].num_altsetting; j++) - for (k = 0; k < dev->actconfig->interface[i].altsetting[j].desc.bNumEndpoints; k++) - { - if (NumberOfOpenPipes < SizeOfOpenPipesArray) - { - PUSB_PIPE_INFO Pipe = &ConnectionInformation->PipeList[NumberOfOpenPipes]; - struct usb_host_endpoint* endpoint = &dev->actconfig->interface[i].altsetting[j].endpoint[k]; - RtlCopyMemory( - &Pipe->EndpointDescriptor, - &endpoint->desc, - endpoint->desc.bLength); - Pipe->ScheduleOffset = 0; /* FIXME */ - } - NumberOfOpenPipes++; - } - ConnectionInformation->NumberOfOpenPipes = NumberOfOpenPipes; - - Information = sizeof(USB_NODE_CONNECTION_INFORMATION); - if (NumberOfOpenPipes <= SizeOfOpenPipesArray) - Status = STATUS_SUCCESS; - else - Status = STATUS_BUFFER_OVERFLOW; - } - break; - } - case IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION: - { - //PUSB_DESCRIPTOR_REQUEST Descriptor; - DPRINT("Usbhub: IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION\n"); - DPRINT1("Usbhub: IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION unimplemented\n"); - Information = 0; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME: - { - PHUB_DEVICE_EXTENSION DeviceExtension; - PUSB_NODE_CONNECTION_DRIVERKEY_NAME StringDescriptor; - DPRINT("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME\n"); - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - StringDescriptor = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)BufferOut; - if (LengthOut < sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME)) - Status = STATUS_BUFFER_TOO_SMALL; - else if (StringDescriptor == NULL) - Status = STATUS_INVALID_PARAMETER; - else if (StringDescriptor->ConnectionIndex < 1 - || StringDescriptor->ConnectionIndex > USB_MAXCHILDREN) - Status = STATUS_INVALID_PARAMETER; - else if (DeviceExtension->Children[StringDescriptor->ConnectionIndex - 1] == NULL) - Status = STATUS_INVALID_PARAMETER; - else - { - ULONG StringSize; - Status = IoGetDeviceProperty( - DeviceExtension->Children[StringDescriptor->ConnectionIndex - 1], - DevicePropertyDriverKeyName, - LengthOut - FIELD_OFFSET(USB_NODE_CONNECTION_DRIVERKEY_NAME, DriverKeyName), - StringDescriptor->DriverKeyName, - &StringSize); - if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) - { - StringDescriptor->ActualLength = StringSize + FIELD_OFFSET(USB_NODE_CONNECTION_DRIVERKEY_NAME, DriverKeyName); - Information = LengthOut; - Status = STATUS_SUCCESS; - } - } - break; - } - default: - { - /* Pass Irp to lower driver */ - DPRINT1("Usbhub: Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); - return ForwardIrpAndForget(DeviceObject, Irp); - } - } - - Irp->IoStatus.Information = Information; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; -} +UsbhubDeviceControlFdo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + ULONG IoControlCode; + PHUB_DEVICE_EXTENSION DeviceExtension; + ULONG LengthIn, LengthOut; + ULONG_PTR Information = 0; + PVOID BufferIn, BufferOut; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + Stack = IoGetCurrentIrpStackLocation(Irp); + LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; + LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; + UsbhubGetUserBuffers(Irp, IoControlCode, &BufferIn, &BufferOut); + + switch (IoControlCode) + { + case IOCTL_USB_GET_NODE_INFORMATION: + { + //PUSB_NODE_INFORMATION NodeInformation; + + DPRINT1("Usbhub: IOCTL_USB_GET_NODE_INFORMATION\n"); + if (LengthOut < sizeof(USB_NODE_INFORMATION)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + /*NodeInformation = (PUSB_NODE_INFORMATION)BufferOut; + dev = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->dev; + NodeInformation->NodeType = UsbHub; + RtlCopyMemory( + &NodeInformation->u.HubInformation.HubDescriptor, + ((struct usb_hub *)usb_get_intfdata(to_usb_interface(&dev->actconfig->interface[0].dev)))->descriptor, + sizeof(USB_HUB_DESCRIPTOR)); + NodeInformation->u.HubInformation.HubIsBusPowered = dev->actconfig->desc.bmAttributes & 0x80; + Information = sizeof(USB_NODE_INFORMATION);*/ + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_USB_GET_NODE_CONNECTION_NAME: + { + PHUB_DEVICE_EXTENSION DeviceExtension; + PUSB_NODE_CONNECTION_NAME ConnectionName; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ConnectionName = (PUSB_NODE_CONNECTION_NAME)BufferOut; + + DPRINT1("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_NAME\n"); + if (LengthOut < sizeof(USB_NODE_CONNECTION_NAME)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else if (ConnectionName->ConnectionIndex < 1 + || ConnectionName->ConnectionIndex > USB_MAXCHILDREN) + Status = STATUS_INVALID_PARAMETER; + else if (DeviceExtension->Children[ConnectionName->ConnectionIndex - 1] == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + ULONG NeededStructureSize; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceExtension->Children[ConnectionName->ConnectionIndex - 1]->DeviceExtension; + NeededStructureSize = DeviceExtension->SymbolicLinkName.Length + sizeof(UNICODE_NULL) + FIELD_OFFSET(USB_NODE_CONNECTION_NAME, NodeName); + if (ConnectionName->ActualLength < NeededStructureSize / sizeof(WCHAR) + || LengthOut < NeededStructureSize) + { + /* Buffer too small */ + ConnectionName->ActualLength = NeededStructureSize / sizeof(WCHAR); + Information = sizeof(USB_NODE_CONNECTION_NAME); + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + RtlCopyMemory( + ConnectionName->NodeName, + DeviceExtension->SymbolicLinkName.Buffer, + DeviceExtension->SymbolicLinkName.Length); + ConnectionName->NodeName[DeviceExtension->SymbolicLinkName.Length / sizeof(WCHAR)] = UNICODE_NULL; + DPRINT1("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_NAME returns '%S'\n", ConnectionName->NodeName); + ConnectionName->ActualLength = NeededStructureSize / sizeof(WCHAR); + Information = NeededStructureSize; + Status = STATUS_SUCCESS; + } + Information = LengthOut; + } + break; + } + case IOCTL_USB_GET_NODE_CONNECTION_INFORMATION: + { + PUSB_NODE_CONNECTION_INFORMATION ConnectionInformation; +/* + ULONG i, j, k; + struct usb_device* dev; + ULONG NumberOfOpenPipes = 0; + ULONG SizeOfOpenPipesArray; +*/ + ConnectionInformation = (PUSB_NODE_CONNECTION_INFORMATION)BufferOut; + + DPRINT1("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_INFORMATION\n"); + if (LengthOut < sizeof(USB_NODE_CONNECTION_INFORMATION)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else if (ConnectionInformation->ConnectionIndex < 1 + || ConnectionInformation->ConnectionIndex > USB_MAXCHILDREN) + Status = STATUS_INVALID_PARAMETER; + else + { + DPRINT1("Usbhub: We should succeed\n"); + } + break; + } + case IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION: + { + //PUSB_DESCRIPTOR_REQUEST Descriptor; + DPRINT1("Usbhub: IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION\n"); + Information = 0; + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME: + { + PHUB_DEVICE_EXTENSION DeviceExtension; + PUSB_NODE_CONNECTION_DRIVERKEY_NAME StringDescriptor; + DPRINT1("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME\n"); + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + StringDescriptor = (PUSB_NODE_CONNECTION_DRIVERKEY_NAME)BufferOut; + if (LengthOut < sizeof(USB_NODE_CONNECTION_DRIVERKEY_NAME)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (StringDescriptor == NULL) + Status = STATUS_INVALID_PARAMETER; + else if (StringDescriptor->ConnectionIndex < 1 + || StringDescriptor->ConnectionIndex > USB_MAXCHILDREN) + Status = STATUS_INVALID_PARAMETER; + else if (DeviceExtension->Children[StringDescriptor->ConnectionIndex - 1] == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + ULONG StringSize; + Status = IoGetDeviceProperty( + DeviceExtension->Children[StringDescriptor->ConnectionIndex - 1], + DevicePropertyDriverKeyName, + LengthOut - FIELD_OFFSET(USB_NODE_CONNECTION_DRIVERKEY_NAME, DriverKeyName), + StringDescriptor->DriverKeyName, + &StringSize); + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) + { + StringDescriptor->ActualLength = StringSize + FIELD_OFFSET(USB_NODE_CONNECTION_DRIVERKEY_NAME, DriverKeyName); + Information = LengthOut; + Status = STATUS_SUCCESS; + } + } + break; + } + default: + { + /* Pass Irp to lower driver */ + DPRINT1("Usbhub: Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} Modified: trunk/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -4,7 +4,7 @@ * FILE: drivers/usb/cromwell/hub/misc.c * PURPOSE: Misceallenous operations * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com), + * PROGRAMMERS: Hervï¿½ Poussineau (hpoussin(a)reactos.com), */ #define NDEBUG @@ -13,54 +13,50 @@ NTSTATUS NTAPI ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) { - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; } NTSTATUS ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - KEVENT Event; - NTSTATUS Status; + KEVENT Event; + NTSTATUS Status; - ASSERT(LowerDevice); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - DPRINT("UHCI: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; + return Status; } NTSTATUS NTAPI ForwardIrpAndForget( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + PDEVICE_OBJECT LowerDevice = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; - ASSERT(LowerDevice); + ASSERT(LowerDevice); - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(LowerDevice, Irp); + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); } /* I really want PCSZ strings as last arguments because @@ -68,99 +64,99 @@ * identification */ NTSTATUS UsbhubInitMultiSzString( - OUT PUNICODE_STRING Destination, - ... /* list of PCSZ */) + OUT PUNICODE_STRING Destination, + ... /* list of PCSZ */) { - va_list args; - PCSZ Source; - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - ULONG DestinationSize = 0; - NTSTATUS Status = STATUS_SUCCESS; + va_list args; + PCSZ Source; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + ULONG DestinationSize = 0; + NTSTATUS Status = STATUS_SUCCESS; - ASSERT(Destination); + ASSERT(Destination); - /* Calculate length needed for destination unicode string */ - va_start(args, Destination); - Source = va_arg(args, PCSZ); - while (Source != NULL) - { - RtlInitAnsiString(&AnsiString, Source); - DestinationSize += RtlAnsiStringToUnicodeSize(&AnsiString) - + sizeof(WCHAR) /* final NULL */; - Source = va_arg(args, PCSZ); - } - va_end(args); - if (DestinationSize == 0) - { - RtlInitUnicodeString(Destination, NULL); - return STATUS_SUCCESS; - } + /* Calculate length needed for destination unicode string */ + va_start(args, Destination); + Source = va_arg(args, PCSZ); + while (Source != NULL) + { + RtlInitAnsiString(&AnsiString, Source); + DestinationSize += RtlAnsiStringToUnicodeSize(&AnsiString) + + sizeof(WCHAR) /* final NULL */; + Source = va_arg(args, PCSZ); + } + va_end(args); + if (DestinationSize == 0) + { + RtlInitUnicodeString(Destination, NULL); + return STATUS_SUCCESS; + } - /* Initialize destination string */ - DestinationSize += sizeof(WCHAR); // final NULL - Destination->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, DestinationSize, USB_HUB_TAG); - if (!Destination->Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - Destination->Length = 0; - Destination->MaximumLength = (USHORT)DestinationSize; + /* Initialize destination string */ + DestinationSize += sizeof(WCHAR); // final NULL + Destination->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, DestinationSize, USB_HUB_TAG); + if (!Destination->Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + Destination->Length = 0; + Destination->MaximumLength = (USHORT)DestinationSize; - /* Copy arguments to destination string */ - /* Use a temporary unicode string, which buffer is shared with - * destination string, to copy arguments */ - UnicodeString.Length = Destination->Length; - UnicodeString.MaximumLength = Destination->MaximumLength; - UnicodeString.Buffer = Destination->Buffer; - va_start(args, Destination); - Source = va_arg(args, PCSZ); - while (Source != NULL) - { - RtlInitAnsiString(&AnsiString, Source); - Status = RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Destination->Buffer, USB_HUB_TAG); - break; - } - Destination->Length += UnicodeString.Length + sizeof(WCHAR); - UnicodeString.MaximumLength -= UnicodeString.Length + sizeof(WCHAR); - UnicodeString.Buffer += UnicodeString.Length / sizeof(WCHAR) + 1; - UnicodeString.Length = 0; - Source = va_arg(args, PCSZ); - } - va_end(args); - if (NT_SUCCESS(Status)) - { - /* Finish multi-sz string */ - Destination->Buffer[Destination->Length / sizeof(WCHAR)] = L'\0'; - Destination->Length += sizeof(WCHAR); - } - return Status; + /* Copy arguments to destination string */ + /* Use a temporary unicode string, which buffer is shared with + * destination string, to copy arguments */ + UnicodeString.Length = Destination->Length; + UnicodeString.MaximumLength = Destination->MaximumLength; + UnicodeString.Buffer = Destination->Buffer; + va_start(args, Destination); + Source = va_arg(args, PCSZ); + while (Source != NULL) + { + RtlInitAnsiString(&AnsiString, Source); + Status = RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Destination->Buffer, USB_HUB_TAG); + break; + } + Destination->Length += UnicodeString.Length + sizeof(WCHAR); + UnicodeString.MaximumLength -= UnicodeString.Length + sizeof(WCHAR); + UnicodeString.Buffer += UnicodeString.Length / sizeof(WCHAR) + 1; + UnicodeString.Length = 0; + Source = va_arg(args, PCSZ); + } + va_end(args); + if (NT_SUCCESS(Status)) + { + /* Finish multi-sz string */ + Destination->Buffer[Destination->Length / sizeof(WCHAR)] = L'\0'; + Destination->Length += sizeof(WCHAR); + } + return Status; } NTSTATUS UsbhubDuplicateUnicodeString( - OUT PUNICODE_STRING Destination, - IN PUNICODE_STRING Source, - IN POOL_TYPE PoolType) + OUT PUNICODE_STRING Destination, + IN PUNICODE_STRING Source, + IN POOL_TYPE PoolType) { - ASSERT(Destination); + ASSERT(Destination); - if (Source == NULL) - { - RtlInitUnicodeString(Destination, NULL); - return STATUS_SUCCESS; - } + if (Source == NULL) + { + RtlInitUnicodeString(Destination, NULL); + return STATUS_SUCCESS; + } - Destination->Buffer = ExAllocatePool(PoolType, Source->MaximumLength); - if (Destination->Buffer == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } + Destination->Buffer = ExAllocatePool(PoolType, Source->MaximumLength); + if (Destination->Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } - Destination->MaximumLength = Source->MaximumLength; - Destination->Length = Source->Length; - RtlCopyMemory(Destination->Buffer, Source->Buffer, Source->MaximumLength); + Destination->MaximumLength = Source->MaximumLength; + Destination->Length = Source->Length; + RtlCopyMemory(Destination->Buffer, Source->Buffer, Source->MaximumLength); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -5,6 +5,7 @@ * PURPOSE: IRP_MJ_PNP operations for PDOs * * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) + * 2010 Michael Martin (michael.martin(a)reactos.org) */ #define NDEBUG @@ -22,7 +23,7 @@ ULONG_PTR Information = 0; NTSTATUS Status; - DPRINT("Usbhub: UsbhubInternalDeviceControlPdo() called\n"); + DPRINT1("Usbhub: UsbhubInternalDeviceControlPdo() called\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Status = Irp->IoStatus.Status; @@ -33,7 +34,7 @@ { PHUB_DEVICE_EXTENSION DeviceExtension; - DPRINT("Usbhub: IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); + DPRINT1("Usbhub: IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); if (Irp->AssociatedIrp.SystemBuffer == NULL || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) { @@ -71,28 +72,30 @@ IN PIRP Irp) { PHUB_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; + NTSTATUS Status = STATUS_UNSUCCESSFUL; DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* Register and activate device interface */ +/* Status = IoRegisterDeviceInterface( DeviceObject, DeviceExtension->dev->descriptor.bDeviceClass == USB_CLASS_HUB ? &GUID_DEVINTERFACE_USB_HUB : &GUID_DEVINTERFACE_USB_DEVICE, - NULL, /* Reference string */ + NULL, &DeviceExtension->SymbolicLinkName); +*/ if (!NT_SUCCESS(Status)) { - DPRINT("Usbhub: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + DPRINT1("Usbhub: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); return Status; } - Status = IoSetDeviceInterfaceState(&DeviceExtension->SymbolicLinkName, TRUE); + //Status = IoSetDeviceInterfaceState(&DeviceExtension->SymbolicLinkName, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT("Usbhub: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); + DPRINT1("Usbhub: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); return Status; } @@ -119,25 +122,25 @@ { case BusQueryDeviceID: { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = &DeviceExtension->DeviceId; break; } case BusQueryHardwareIDs: { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); SourceString = &DeviceExtension->HardwareIds; break; } case BusQueryCompatibleIDs: { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &DeviceExtension->CompatibleIds; break; } case BusQueryInstanceID: { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = &DeviceExtension->InstanceId; break; } @@ -167,57 +170,20 @@ DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - +DPRINT1("Usbhub: UsbhubPdoQueryDeviceText\n"); switch (DeviceTextType) { case DeviceTextDescription: case DeviceTextLocationInformation: { - unsigned short size; - int ret; - PWCHAR buf; - PWCHAR bufret; - if (DeviceTextType == DeviceTextDescription) - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); else - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); - - if (!DeviceExtension->dev->descriptor.iProduct) - return STATUS_NOT_SUPPORTED; - - ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, &size, sizeof(size)); - if (ret < 2) - { - DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret); - return STATUS_IO_DEVICE_ERROR; - } - size &= 0xff; - buf = ExAllocatePool(PagedPool, size); - if (buf == NULL) - { - DPRINT("Usbhub: ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size); - if (ret < 0) - { - DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret); - ExFreePool(buf); - return STATUS_IO_DEVICE_ERROR; - } - bufret = ExAllocatePool(PagedPool, size - 2 /* size of length identifier */ + 2 /* final NULL */); - if (bufret == NULL) - { - DPRINT("Usbhub: ExAllocatePool() failed\n"); - ExFreePool(buf); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(bufret, &buf[1], size - 2); - bufret[(size - 1) / sizeof(WCHAR)] = 0; - *Information = (ULONG_PTR)bufret; - ExFreePool(buf); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); + +/* if (!DeviceExtension->dev->descriptor.iProduct) + return STATUS_NOT_SUPPORTED;*/ + return STATUS_SUCCESS; } default: @@ -243,7 +209,7 @@ { case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); Status = UsbhubPdoStartDevice(DeviceObject, Irp); break; } @@ -251,7 +217,7 @@ { PDEVICE_CAPABILITIES DeviceCapabilities; ULONG i; - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; /* FIXME: capabilities can change with connected device */ @@ -279,11 +245,11 @@ { PCM_RESOURCE_LIST ResourceList; - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); if (!ResourceList) { - DPRINT("Usbhub: ExAllocatePool() failed\n"); + DPRINT1("Usbhub: ExAllocatePool() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; } else @@ -298,11 +264,11 @@ { PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); if (!ResourceList) { - DPRINT("Usbhub: ExAllocatePool() failed\n"); + DPRINT1("Usbhub: ExAllocatePool() failed\n"); Status = STATUS_INSUFFICIENT_RESOURCES; } else Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -2,7 +2,8 @@ * ReactOS USB hub driver * Copyright (C) 2004 Aleksey Bragin * (C) 2005 Mark Tempel - * (C) 2005 Hervé Poussineau + * (C) 2005 Hervï¿½ Poussineau + * (C) 2010 Michael Martin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,159 +27,107 @@ /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ -static NTSTATUS -GetRootHubPointer( - IN PDEVICE_OBJECT Pdo, - OUT PVOID* RootHubPointer) -{ - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - - KeInitializeEvent (&Event, NotificationEvent, FALSE); - - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO, - Pdo, - NULL, sizeof(NULL), - RootHubPointer, sizeof(*RootHubPointer), - FALSE, - &Event, - &IoStatus); - if (Irp == NULL) - { - DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Initialize the status block before sending the IRP */ - IoGetNextIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - IoStatus.Status = STATUS_NOT_SUPPORTED; - IoStatus.Information = 0; - - Status = IoCallDriver(Pdo, Irp); - - if (Status == STATUS_PENDING) - { - DPRINT("Usbhub: Operation pending\n"); - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - return Status; -} - NTSTATUS NTAPI UsbhubAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo) + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) { - PDEVICE_OBJECT Fdo; - PHUB_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; + PDEVICE_OBJECT Fdo; + PHUB_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; - Status = IoCreateDevice(DriverObject, - sizeof(HUB_DEVICE_EXTENSION), - NULL, /* DeviceName */ - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &Fdo); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Usbhub: IoCreateDevice() failed with status 0x%08lx\n", Status); - return Status; - } + Status = IoCreateDevice(DriverObject, + sizeof(HUB_DEVICE_EXTENSION), + NULL, /* DeviceName */ + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &Fdo); - // zerofill device extension - DeviceExtension = (PHUB_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Usbhub: IoCreateDevice() failed with status 0x%08lx\n", Status); + return Status; + } - /* Get a pointer to the linux structure created by the USB controller, - * by sending IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO to lower device. - */ - Status = GetRootHubPointer(Pdo, (PVOID*)&DeviceExtension->dev); - if (!NT_SUCCESS(Status)) - { - DPRINT("Usbhub: GetRootHubPointer() failed with status 0x%08lx\n", Status); - IoDeleteDevice(Fdo); - return Status; - } - DeviceExtension->dev->dev.dev_ext = Pdo; + // zerofill device extension + DeviceExtension = (PHUB_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); - DeviceExtension->IsFDO = TRUE; - Fdo->Flags |= DO_POWER_PAGABLE; - Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); - if (!NT_SUCCESS(Status)) - { - DPRINT("Usbhub: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); - IoDeleteDevice(Fdo); - return Status; - } - Fdo->Flags |= DO_BUFFERED_IO; - Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceExtension->IsFDO = TRUE; + Fdo->Flags |= DO_POWER_PAGABLE; + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT("Usbhub: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + Fdo->Flags |= DO_BUFFERED_IO; - return STATUS_SUCCESS; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; } static NTSTATUS NTAPI IrpStub( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - NTSTATUS Status; + NTSTATUS Status; - if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) - { - DPRINT1("Usbhub: FDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + { + DPRINT1("Usbhub: FDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + else + { + /* We can't forward request to the lower driver, because + * we are a Pdo, so we don't have lower driver... + */ + DPRINT1("Usbhub: PDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); #ifndef NDEBUG - DbgBreakPoint(); + DbgBreakPoint(); #endif - return ForwardIrpAndForget(DeviceObject, Irp); - } - else - { - /* We can't forward request to the lower driver, because - * we are a Pdo, so we don't have lower driver... - */ - DPRINT1("Usbhub: PDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif - } + } - Status = Irp->IoStatus.Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } static NTSTATUS NTAPI DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) - return UsbhubDeviceControlFdo(DeviceObject, Irp); - else - return IrpStub(DeviceObject, Irp); + DPRINT1("Usbhub: DispatchDeviceControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + return UsbhubDeviceControlFdo(DeviceObject, Irp); + else + return IrpStub(DeviceObject, Irp); } static NTSTATUS NTAPI DispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) - return IrpStub(DeviceObject, Irp); - else - return UsbhubInternalDeviceControlPdo(DeviceObject, Irp); + DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + return IrpStub(DeviceObject, Irp); + else + return UsbhubInternalDeviceControlPdo(DeviceObject, Irp); } static NTSTATUS NTAPI DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) - return UsbhubPnpFdo(DeviceObject, Irp); - else - return UsbhubPnpPdo(DeviceObject, Irp); + DPRINT1("Usbhub: DispatchPnp\n"); + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + return UsbhubPnpFdo(DeviceObject, Irp); + else + return UsbhubPnpPdo(DeviceObject, Irp); } /* @@ -186,23 +135,24 @@ */ NTSTATUS NTAPI DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { - ULONG i; + ULONG i; - DriverObject->DriverExtension->AddDevice = UsbhubAddDevice; + DriverObject->DriverExtension->AddDevice = UsbhubAddDevice; + DPRINT1("Usbhub: DriverEntry\n"); - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverObject->MajorFunction[i] = IrpStub; + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = IrpStub; - DriverObject->MajorFunction[IRP_MJ_CREATE] = UsbhubCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = UsbhubClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = UsbhubCleanup; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; - DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_CREATE] = UsbhubCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = UsbhubClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = UsbhubCleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; - return STATUS_SUCCESS; + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -1,27 +1,98 @@ +#include <ntddk.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> #include <debug.h> - -#include <ntddk.h> -#include <usbioctl.h> - -#include "../miniport/usb_wrapper.h" -#include "../usbport/hub.h" +//BROKEN: #include <usbprotocoldefs.h> #define USB_HUB_TAG 'hbsu' +#define USB_MAXCHILDREN 127 + +/* Lifted from broken header above */ +#define C_HUB_LOCAL_POWER 0 +#define C_HUB_OVER_CURRENT 1 +#define PORT_CONNECTION 0 +#define PORT_ENABLE 1 +#define PORT_SUSPEND 2 +#define PORT_OVER_CURRENT 3 +#define PORT_RESET 4 +#define PORT_POWER 8 +#define PORT_LOW_SPEED 9 +#define C_PORT_CONNECTION 16 +#define C_PORT_ENABLE 17 +#define C_PORT_SUSPEND 18 +#define C_PORT_OVER_CURRENT 19 +#define C_PORT_RESET 20 +#define PORT_TEST 21 +#define PORT_INDICATOR 22 + +typedef struct _USB_ENDPOINT +{ + ULONG Flags; + LIST_ENTRY UrbList; + struct _USB_INTERFACE *Interface; + USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; +} USB_ENDPOINT, *PUSB_ENDPOINT; + +typedef struct _USB_INTERFACE +{ + struct _USB_CONFIGURATION *Config; + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USB_ENDPOINT *EndPoints[]; +} USB_INTERFACE, *PUSB_INTERFACE; + +typedef struct _USB_CONFIGURATION +{ + struct _USB_DEVICE *Device; + USB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + USB_INTERFACE *Interfaces[]; +} USB_CONFIGURATION, *PUSB_CONFIGURATION; + +typedef struct _USB_DEVICE +{ + UCHAR Address; + ULONG Port; + PVOID ParentDevice; + BOOLEAN IsHub; + USB_DEVICE_SPEED DeviceSpeed; + USB_DEVICE_TYPE DeviceType; + USB_DEVICE_DESCRIPTOR DeviceDescriptor; + USB_CONFIGURATION *ActiveConfig; + USB_INTERFACE *ActiveInterface; + USB_CONFIGURATION **Configs; + +} USB_DEVICE, *PUSB_DEVICE; typedef struct _HUB_DEVICE_EXTENSION { BOOLEAN IsFDO; - struct usb_device* dev; + USB_DEVICE* dev; PDEVICE_OBJECT LowerDevice; - + ULONG ChildCount; PDEVICE_OBJECT Children[USB_MAXCHILDREN]; - /* Fields valid only when IsFDO == FALSE */ - UNICODE_STRING DeviceId; // REG_SZ - UNICODE_STRING InstanceId; // REG_SZ - UNICODE_STRING HardwareIds; // REG_MULTI_SZ - UNICODE_STRING CompatibleIds; // REG_MULTI_SZ - UNICODE_STRING SymbolicLinkName; + PUSB_DEVICE RootHubUsbDevice; + + PDEVICE_OBJECT RootHubPdo; + PDEVICE_OBJECT RootHubFdo; + + ULONG HubCount; + + USB_BUS_INTERFACE_HUB_V5 HubInterface; + USB_BUS_INTERFACE_USBDI_V2 UsbDInterface; + + USB_HUB_DESCRIPTOR HubDescriptor; + USB_DEVICE_DESCRIPTOR HubDeviceDescriptor; + USB_CONFIGURATION_DESCRIPTOR HubConfig; + USB_EXTHUB_INFORMATION_0 UsbExtHubInfo; + + /* Fields valid only when IsFDO == FALSE */ + UNICODE_STRING DeviceId; // REG_SZ + UNICODE_STRING InstanceId; // REG_SZ + UNICODE_STRING HardwareIds; // REG_MULTI_SZ + UNICODE_STRING CompatibleIds; // REG_MULTI_SZ + UNICODE_STRING SymbolicLinkName; } HUB_DEVICE_EXTENSION, *PHUB_DEVICE_EXTENSION; /* createclose.c */ Modified: trunk/reactos/drivers/usb/usbhub/usbhub.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] Sun Sep 5 19:00:37 2010 @@ -1,11 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys"> - <include>../miniport/linux</include> - <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library> - <library>usbport</library> <file>createclose.c</file> <file>fdo.c</file> <file>misc.c</file>

14 years, 1 month

[mjmartin] 48704: [usb/usbehci] - Fix flags settings for PortStatus and PortChange so that the correct flags are set when hub driver sets/requests them. - Use FastMutex to protect access to async q...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Sep 5 18:43:17 2010 New Revision: 48704 URL: http://svn.reactos.org/svn/reactos?rev=48704&view=rev Log: [usb/usbehci] - Fix flags settings for PortStatus and PortChange so that the correct flags are set when hub driver sets/requests them. - Use FastMutex to protect access to async queue and frame list. - For USB CONFIG DESC, Check the output buffer size before attempting to write all configuration descriptors. - Fix a bug that caused bmRequestType to be incorret value when requesting configuration and string descriptors. - Modify some debugging to make it easier to see debug messages from usbhub driver. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/urbreq.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -19,6 +19,13 @@ ULONG CStatus; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; + + if (!FdoDeviceExtension->Pdo) + { + DPRINT1("PDO not set yet!\n"); + return; + } + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; CStatus = (ULONG) SystemArgument2; @@ -80,7 +87,8 @@ tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); PdoDeviceExtension->ChildDeviceCount++; - PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED | USB_PORT_STATUS_CONNECT; + PdoDeviceExtension->Ports[i].PortStatus &= ~0x8000; + PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_CONNECT; PdoDeviceExtension->Ports[i].PortChange |= USB_PORT_STATUS_CONNECT; PdoDeviceExtension->HaltQueue = FALSE; @@ -194,7 +202,7 @@ LONG tmp2; ULONG base; - DPRINT1("Starting Ehci controller\n"); + DPRINT("Starting Ehci controller\n"); FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; base = (ULONG)FdoDeviceExtension->ResourceMemory; @@ -408,6 +416,8 @@ /* Zeroize it */ RtlZeroMemory(FdoDeviceExtension->PeriodicFramList, sizeof(ULONG) * 1024); + ExInitializeFastMutex(&FdoDeviceExtension->FrameListMutex); + /* Allocate Common Buffer for Async List Head Queue */ FdoDeviceExtension->AsyncListQueueHeadPtr = FdoDeviceExtension->pDmaAdapter->DmaOperations->AllocateCommonBuffer(FdoDeviceExtension->pDmaAdapter, @@ -426,6 +436,8 @@ RtlZeroMemory(FdoDeviceExtension->AsyncListQueueHeadPtr, /* FIXME: Same as FIXME above */ 20800); + + ExInitializeFastMutex(&FdoDeviceExtension->AsyncListMutex); Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, DevicePropertyAddress, @@ -540,6 +552,8 @@ DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DPRINT1("Ehci: QueryBusRelations\n"); + /* Create the PDO with the next available number */ while (TRUE) { @@ -623,7 +637,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("START_DEVICE\n"); + DPRINT1("Ehci: START_DEVICE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Status = ForwardAndWait(DeviceObject, Irp); @@ -634,20 +648,20 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + DPRINT1("Ehci: IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch(Stack->Parameters.QueryDeviceRelations.Type) { case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("BusRelations\n"); + DPRINT1("Ehci: BusRelations\n"); Status = FdoQueryBusRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; } default: { - DPRINT("Unknown query device relations type\n"); + DPRINT1("Ehci: Unknown query device relations type\n"); Status = STATUS_NOT_IMPLEMENTED; break; } @@ -656,16 +670,17 @@ } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: { - DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + DPRINT1("Ehci: IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); break; } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { - DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + DPRINT1("Ehci: IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); } case IRP_MN_QUERY_INTERFACE: { + DPRINT1("Ehci: IRP_MN_QUERY_INTERFACE\n"); Status = STATUS_SUCCESS; Information = 0; Status = ForwardIrpAndForget(DeviceObject, Irp); @@ -674,7 +689,7 @@ } default: { - DPRINT1("IRP_MJ_PNP / Unhandled minor function 0x%lx\n", Stack->MinorFunction); + DPRINT1("Ehci: IRP_MJ_PNP / Unhandled minor function 0x%lx\n", Stack->MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } @@ -701,7 +716,7 @@ PFDO_DEVICE_EXTENSION FdoDeviceExtension; - DPRINT("Ehci AddDevice\n"); + DPRINT1("Ehci: AddDevice\n"); /* Create the FDO with next available number */ while (TRUE) @@ -818,14 +833,14 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to register device interface!\n"); - ASSERT(FALSE); + return Status; } else { Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); DPRINT1("SetInterfaceState %x\n", Status); if (!NT_SUCCESS(Status)) - ASSERT(FALSE); + return Status; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -836,6 +851,7 @@ FdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; PIO_STACK_LOCATION Stack = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; ULONG_PTR Information = 0; @@ -843,6 +859,7 @@ URB *Urb; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; ASSERT(FdoDeviceExtension->Common.IsFdo == TRUE); @@ -851,25 +868,31 @@ ASSERT(Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_SUBMIT_URB); Urb = (PURB) Stack->Parameters.Others.Argument1; - DPRINT("Header Length %d\n", Urb->UrbHeader.Length); - DPRINT("Header Function %d\n", Urb->UrbHeader.Function); - - UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; - + DPRINT1("Header Length %d\n", Urb->UrbHeader.Length); + DPRINT1("Header Function %d\n", Urb->UrbHeader.Function); + + UsbDevice = DeviceHandleToUsbDevice(PdoDeviceExtension, Urb->UrbHeader.UsbdDeviceHandle); + + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } switch (Urb->UrbHeader.Function) { case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { - DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); + DPRINT1("Ehci: URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); break; } case URB_FUNCTION_GET_STATUS_FROM_DEVICE: { - DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); + DPRINT1("Ehci: URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); break; } case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: { + DPRINT1("Ehci: URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); switch(Urb->UrbControlDescriptorRequest.DescriptorType) { case USB_DEVICE_DESCRIPTOR_TYPE: @@ -880,30 +903,63 @@ } case USB_CONFIGURATION_DESCRIPTOR_TYPE: DPRINT1("USB CONFIG DESC\n"); + //break; case USB_STRING_DESCRIPTOR_TYPE: DPRINT1("Usb String Descriptor\n"); { USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PUSB_STRING_DESCRIPTOR UsbString; BOOLEAN ResultOk; CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; + CtrlSetup.bmRequestType._BM.Reserved = 0; CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + if (Urb->UrbControlDescriptorRequest.DescriptorType == USB_STRING_DESCRIPTOR_TYPE) + { + if ((Urb->UrbControlDescriptorRequest.Index != UsbDevice->DeviceDescriptor.iManufacturer) && + (UsbDevice->DeviceDescriptor.iManufacturer) && + (UsbDevice->DeviceDescriptor.iSerialNumber)) + { + DPRINT1("Invalid Index\n"); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_PARAMETER; + Status = STATUS_SUCCESS; + Information = 0; + break; + } + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + RtlZeroMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength-1); + } else CtrlSetup.wIndex.W = 0; + CtrlSetup.wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, UsbDevice->Address, UsbDevice->Port, Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength); + if (Urb->UrbControlDescriptorRequest.DescriptorType == USB_STRING_DESCRIPTOR_TYPE) + { + UsbString = Urb->UrbControlDescriptorRequest.TransferBuffer; + DPRINT1("Index %x\n", Urb->UrbControlDescriptorRequest.Index); + DPRINT1("BufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + DPRINT1("Length %x\n", UsbString->bLength); + if (Urb->UrbControlDescriptorRequest.Index == 0) + { + DPRINT1("%x\n", (ULONG)Urb->UrbControlDescriptorRequest.TransferBuffer); + } + else + DPRINT1("String %S\n", &UsbString->bString); + } + UsbString = Urb->UrbControlDescriptorRequest.TransferBuffer; Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; Status = STATUS_SUCCESS; - + Information = UsbString->bLength; break; } default: @@ -915,12 +971,13 @@ } case URB_FUNCTION_SELECT_CONFIGURATION: { - DPRINT1("Selecting Configuration\n"); + DPRINT1("Ehci: URB_FUNCTION_SELECT_CONFIGURATION\n"); DPRINT1("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); break; } case URB_FUNCTION_CLASS_DEVICE: { + DPRINT1("Ehci: URB_FUNCTION_CLASS_DEVICE %x\n",Urb->UrbControlVendorClassRequest.Request); switch (Urb->UrbControlVendorClassRequest.Request) { case USB_REQUEST_GET_DESCRIPTOR: @@ -999,6 +1056,7 @@ } case URB_FUNCTION_CLASS_OTHER: { + DPRINT1("Ehci: URB_FUNCTION_CLASS_OTHER\n"); switch (Urb->UrbControlVendorClassRequest.Request) { case USB_REQUEST_GET_STATUS: @@ -1099,7 +1157,7 @@ } default: { - DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); + DPRINT1("Ehci: Unhandled URB %x\n", Urb->UrbHeader.Function); //Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; } } Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -37,6 +37,7 @@ if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { + DPRINT1("Cancelled!!!!???\n"); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, OldIrql); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -175,15 +176,18 @@ LONG i, j; DPRINT1("USB CONFIG DESC\n"); - if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength) { Urb->UrbControlDescriptorRequest.TransferBufferLength = UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength; } else { - DPRINT1("Buffer to small!!!\n"); - //ASSERT(FALSE); + DPRINT1("TransferBufferLenth %x is too small!!!\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + if (Urb->UrbControlDescriptorRequest.TransferBufferLength < sizeof(USB_CONFIGURATION_DESCRIPTOR)) + { + DPRINT1("Bail!\n"); + break; + } } ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); @@ -191,6 +195,14 @@ /* Copy the Configuration Descriptor */ RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + /* If there is no room for all the configs then bail */ + if (!(Urb->UrbControlDescriptorRequest.TransferBufferLength > sizeof(USB_CONFIGURATION_DESCRIPTOR))) + { + DPRINT1("Bail!\n"); + break; + } + BufPtr += sizeof(USB_CONFIGURATION_DESCRIPTOR); for (i = 0; i < UsbDevice->ActiveConfig->ConfigurationDescriptor.bNumInterfaces; i++) { @@ -348,6 +360,8 @@ { PUSB_HUB_DESCRIPTOR UsbHubDescr = Urb->UrbControlVendorClassRequest.TransferBuffer; + + DPRINT1("Length %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); /* FIXME: Handle more than root hub? */ if(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)) @@ -383,7 +397,6 @@ case USB_REQUEST_GET_STATUS: { DPRINT1("DEVICE: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); - if (Urb->UrbControlVendorClassRequest.Index == 1) { ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); @@ -401,12 +414,17 @@ } case URB_FUNCTION_CLASS_OTHER: { + + /* FIXME: Each one of these needs to make sure that the index value is a valid for a port (1-8) and return STATUS_UNSUCCESSFUL is not */ + switch (Urb->UrbControlVendorClassRequest.Request) { case USB_REQUEST_GET_STATUS: { DPRINT1("OTHER: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); + DPRINT1("PortStatus %x\n", DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); + DPRINT1("PortChange %x\n", DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange); ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus; ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[1] = DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange; break; @@ -443,7 +461,12 @@ } case PORT_ENABLE: { - DPRINT1("Unhandled Set Feature\n"); + DPRINT1("PORT_ENABLE not implemented\n"); + break; + } + case PORT_POWER: + { + DPRINT1("PORT_POWER not implemented\n"); break; } default: Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -128,8 +128,12 @@ URB *Urb; Urb = (PURB) Stack->Parameters.Others.Argument1; - DPRINT("Header Length %d\n", Urb->UrbHeader.Length); - DPRINT("Header Function %d\n", Urb->UrbHeader.Function); + + if ((Urb->UrbHeader.Function == URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER) && + (Urb->UrbHeader.UsbdDeviceHandle == PdoDeviceExtension->UsbDevices[0])) + { + PdoDeviceExtension->HaltQueue = TRUE; + } /* Queue all request for now, kernel thread will complete them */ QueueURBRequest(PdoDeviceExtension, Irp); Information = 0; @@ -166,11 +170,11 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %x\n", IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE); + DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %x\n", Stack->Parameters.Others.Argument2); if (Stack->Parameters.Others.Argument1) { /* Return the root hubs devicehandle */ - DPRINT1("Returning RootHub Handle %x\n", PdoDeviceExtension->UsbDevices[0]); + DPRINT("Returning RootHub Handle %x\n", PdoDeviceExtension->UsbDevices[0]); *(PVOID *)Stack->Parameters.Others.Argument1 = (PVOID)PdoDeviceExtension->UsbDevices[0]; Status = STATUS_SUCCESS; } @@ -182,13 +186,13 @@ } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT %x\n", IOCTL_INTERNAL_USB_GET_HUB_COUNT); + DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_HUB_COUNT %x\n", IOCTL_INTERNAL_USB_GET_HUB_COUNT); ASSERT(Stack->Parameters.Others.Argument1 != NULL); if (Stack->Parameters.Others.Argument1) { /* FIXME: Determine the number of hubs between the usb device and root hub */ DPRINT1("RootHubCount %x\n", *(PULONG)Stack->Parameters.Others.Argument1); - *(PULONG)Stack->Parameters.Others.Argument1 = 0; + *(PULONG)Stack->Parameters.Others.Argument1 = 1; } Status = STATUS_SUCCESS; break; @@ -215,8 +219,7 @@ } case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: { - DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); - + DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO Arg1 %x, Arg2 %x\n", Stack->Parameters.Others.Argument1, Stack->Parameters.Others.Argument2); if (Stack->Parameters.Others.Argument1) *(PVOID *)Stack->Parameters.Others.Argument1 = FdoDeviceExtension->Pdo; if (Stack->Parameters.Others.Argument2) @@ -229,7 +232,7 @@ case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: { PUSB_IDLE_CALLBACK_INFO CallBackInfo; - DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); + DPRINT1("Ehci: IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); /* FIXME: Set Callback for safe power down */ CallBackInfo = Stack->Parameters.DeviceIoControl.Type3InputBuffer; DPRINT1("IdleCallback %x\n", CallBackInfo->IdleCallback); @@ -368,6 +371,7 @@ UNICODE_STRING InterfaceSymLinkName; LONG i; + DPRINT1("Ehci: PDO StartDevice\n"); PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; @@ -376,8 +380,11 @@ for (i = 0; i < 8; i++) { - PdoDeviceExtension->Ports[i].PortStatus = USB_PORT_STATUS_ENABLE; + PdoDeviceExtension->Ports[i].PortStatus = USB_PORT_STATUS_HIGH_SPEED | 0x8000; PdoDeviceExtension->Ports[i].PortChange = 0; + + if (!FdoDeviceExtension->ECHICaps.HCSParams.PortPowerControl) + PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_POWER; } RtlCopyMemory(&RootHubDevice->DeviceDescriptor, @@ -441,13 +448,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to register interface\n"); - ASSERT(FALSE); + return Status; } else { Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); if (!NT_SUCCESS(Status)) - ASSERT(FALSE); + return Status; } Status = STATUS_SUCCESS; @@ -455,6 +462,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { + DPRINT1("Ehci: PDO QueryDeviceRelations\n"); switch (Stack->Parameters.QueryDeviceRelations.Type) { case TargetDeviceRelation: @@ -499,6 +507,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { + DPRINT("Ehci: PDO Query Capabilities\n"); PDEVICE_CAPABILITIES DeviceCapabilities; ULONG i; @@ -538,6 +547,7 @@ case IRP_MN_QUERY_ID: { + DPRINT("Ehci: PDO Query ID\n"); Status = PdoQueryId(DeviceObject, Irp, &Information); break; } @@ -549,6 +559,8 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExtension; + DPRINT("Ehci: PDO Query Interface\n"); + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; @@ -557,10 +569,6 @@ { DPRINT1("Failed to create string from GUID!\n"); } - - DPRINT("Interface GUID requested %wZ\n", &GuidString); - DPRINT("QueryInterface.Size %x\n", Stack->Parameters.QueryInterface.Size); - DPRINT("QueryInterface.Version %x\n", Stack->Parameters.QueryInterface.Version); /* Assume success */ Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -125,6 +125,8 @@ DPRINT1("ExecuteControlRequest: Buffer %x, Length %x\n", Buffer, BufferLength); + ExAcquireFastMutex(&DeviceExtension->AsyncListMutex); + Base = (ULONG) DeviceExtension->ResourceMemory; /* Set up the QUEUE HEAD in memory */ @@ -141,6 +143,7 @@ QueueHead->EndPointCapabilities2.PortNumber = Port; QueueHead->EndPointCapabilities1.DeviceAddress = Address; + CtrlSetup->bmRequestType._BM.Recipient = SetupPacket->bmRequestType._BM.Recipient; CtrlSetup->bmRequestType._BM.Type = SetupPacket->bmRequestType._BM.Type; @@ -208,5 +211,8 @@ DPRINT1("Unable to copy data to buffer\n"); } + + ExReleaseFastMutex(&DeviceExtension->AsyncListMutex); + return TRUE; } Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -389,6 +389,9 @@ PULONG AsyncListQueueHeadPtr; PHYSICAL_ADDRESS PeriodicFramListPhysAddr; PHYSICAL_ADDRESS AsyncListQueueHeadPtrPhysAddr; + + FAST_MUTEX AsyncListMutex; + FAST_MUTEX FrameListMutex; BOOLEAN AsyncComplete; Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Sun Sep 5 18:43:17 2010 @@ -14,6 +14,7 @@ PVOID InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub) { PUSB_DEVICE UsbDevicePointer = NULL; + UsbDevicePointer = ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEVICE), USB_POOL_TAG); if (!UsbDevicePointer) @@ -42,14 +43,14 @@ USB_BUSIFFN InterfaceReference(PVOID BusContext) { - DPRINT1("InterfaceReference called\n"); + DPRINT1("Ehci: InterfaceReference called\n"); } VOID USB_BUSIFFN InterfaceDereference(PVOID BusContext) { - DPRINT1("InterfaceDereference called\n"); + DPRINT1("Ehci: InterfaceDereference called\n"); } /* Bus Interface Hub V5 Functions */ @@ -65,7 +66,7 @@ PUSB_DEVICE UsbDevice; LONG i = 0; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; - DPRINT("CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); + DPRINT1("Ehci: CreateUsbDevice: HubDeviceHandle %x, PortStatus %x, PortNumber %x\n", HubDeviceHandle, PortStatus, PortNumber); if (PdoDeviceExtension->UsbDevices[0] != HubDeviceHandle) { @@ -116,7 +117,7 @@ PUCHAR Ptr; LONG i, j, k; - DPRINT1("InitializeUsbDevice called, device %x\n", DeviceHandle); + DPRINT1("Ehci: InitializeUsbDevice called, device %x\n", DeviceHandle); PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; @@ -141,6 +142,7 @@ /* Set the device address */ CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; + CtrlSetup.bmRequestType._BM.Reserved = 0; CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_HOST_TO_DEVICE; CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; CtrlSetup.wValue.W = UsbDevice->Address; @@ -209,6 +211,7 @@ sizeof(USB_CONFIGURATION) + sizeof(PVOID) * ConfigDesc->bNumInterfaces, USB_POOL_TAG); UsbDevice->Configs[i]->Device = UsbDevice; + RtlCopyMemory(&UsbDevice->Configs[0]->ConfigurationDescriptor, ConfigDesc, sizeof(USB_CONFIGURATION_DESCRIPTOR)); Ptr += ConfigDesc->bLength; @@ -252,7 +255,7 @@ PULONG ConfigDescriptorBufferLength) { PUSB_DEVICE UsbDevice; - DPRINT1("GetUsbDescriptor %x, %x, %x, %x\n", DeviceDescriptorBuffer, *DeviceDescriptorBufferLength, ConfigDescriptorBuffer, *ConfigDescriptorBufferLength); + DPRINT1("Ehci: GetUsbDescriptor %x, %x, %x, %x\n", DeviceDescriptorBuffer, *DeviceDescriptorBufferLength, ConfigDescriptorBuffer, *ConfigDescriptorBufferLength); UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); @@ -267,6 +270,7 @@ RtlCopyMemory(DeviceDescriptorBuffer, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); *DeviceDescriptorBufferLength = sizeof(USB_DEVICE_DESCRIPTOR); } + if ((ConfigDescriptorBuffer) && (ConfigDescriptorBufferLength)) { RtlCopyMemory(ConfigDescriptorBuffer, &UsbDevice->ActiveConfig->ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); @@ -340,7 +344,7 @@ USB_BUSIFFN RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle) { - DPRINT1("RestoreUsbDevice called\n"); + DPRINT1("Ehci: RestoreUsbDevice called\n"); return STATUS_NOT_SUPPORTED; } @@ -348,7 +352,7 @@ USB_BUSIFFN GetPortHackFlags(PVOID BusContext, PULONG Flags) { - DPRINT1("GetPortHackFlags called\n"); + DPRINT1("Ehci: GetPortHackFlags called\n"); return STATUS_NOT_SUPPORTED; } @@ -365,7 +369,7 @@ ULONG SizeNeeded; LONG i; - DPRINT1("QueryDeviceInformation (%x, %x, %x, %d, %x\n", BusContext, DeviceHandle, DeviceInformationBuffer, DeviceInformationBufferLength, LengthReturned); + DPRINT1("Ehci: QueryDeviceInformation (%x, %x, %x, %d, %x\n", BusContext, DeviceHandle, DeviceInformationBuffer, DeviceInformationBufferLength, LengthReturned); UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); @@ -418,7 +422,7 @@ { PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; - DPRINT1("GetControllerInformation called\n"); + DPRINT1("Ehci: GetControllerInformation called\n"); ControllerInfo = ControllerInformationBuffer; @@ -447,7 +451,7 @@ USB_BUSIFFN ControllerSelectiveSuspend(PVOID BusContext, BOOLEAN Enable) { - DPRINT1("ControllerSelectiveSuspend called\n"); + DPRINT1("Ehci: ControllerSelectiveSuspend called\n"); return STATUS_NOT_SUPPORTED; } @@ -464,13 +468,16 @@ PPDO_DEVICE_EXTENSION PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExntension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; LONG i; - DPRINT1("GetExtendedHubInformation\n"); + DPRINT1("Ehci: GetExtendedHubInformation BusContext %x, PDO %x\n", BusContext, HubPhysicalDeviceObject); /* Set the default return value */ *LengthReturned = 0; - /* Caller must have set InformationLevel to 0 */ + + DPRINT1("InformationLevel %x\n", UsbExtHubInfo->InformationLevel); + + /* Caller is suppose to have set InformationLevel to 0. However usbehci from MS seems to ignore this */ if (UsbExtHubInfo->InformationLevel != 0) { - return STATUS_NOT_SUPPORTED; + DPRINT1("InformationLevel should really be set to 0. Ignoring\n"); } UsbExtHubInfo->NumberOfPorts = 8; @@ -496,7 +503,7 @@ ULONG HubSymNameBufferLength, PULONG HubSymNameActualLength) { - DPRINT1("GetRootHubSymbolicName called\n"); + DPRINT1("Ehci: GetRootHubSymbolicName called\n"); if (HubSymNameBufferLength < 16) return STATUS_UNSUCCESSFUL; @@ -512,7 +519,7 @@ { PUSB_DEVICE UsbDevice; - DPRINT1("GetDeviceBusContext called\n"); + DPRINT1("Ehci: GetDeviceBusContext called\n"); UsbDevice = DeviceHandleToUsbDevice(HubBusContext, DeviceHandle); if (!UsbDevice) @@ -528,7 +535,7 @@ USB_BUSIFFN Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount) { - DPRINT1("Initialize20Hub called, HubDeviceHandle: %x\n", HubDeviceHandle); + DPRINT1("Ehci: Initialize20Hub called, HubDeviceHandle: %x\n", HubDeviceHandle); /* FIXME: */ /* Create the Irp Queue for SCE */ @@ -541,7 +548,7 @@ RootHubInitNotification(PVOID BusContext, PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine) { PPDO_DEVICE_EXTENSION PdoDeviceExtension; - DPRINT1("RootHubInitNotification %x, %x, %x\n", BusContext, CallbackContext, CallbackRoutine); + DPRINT1("Ehci: RootHubInitNotification %x, %x, %x\n", BusContext, CallbackContext, CallbackRoutine); PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; PdoDeviceExtension->CallbackContext = CallbackContext; @@ -579,7 +586,7 @@ USB_BUSIFFN SetDeviceHandleData(PVOID BusContext, PVOID DeviceHandle, PDEVICE_OBJECT UsbDevicePdo) { - DPRINT1("SetDeviceHandleData called\n"); + DPRINT1("Ehci: SetDeviceHandleData called\n"); } @@ -589,7 +596,7 @@ USB_BUSIFFN GetUSBDIVersion(PVOID BusContext, PUSBD_VERSION_INFORMATION VersionInformation, PULONG HcdCapabilites) { - DPRINT1("GetUSBDIVersion called\n"); + DPRINT1("Ehci: GetUSBDIVersion called\n"); return; } @@ -597,7 +604,7 @@ USB_BUSIFFN QueryBusTime(PVOID BusContext, PULONG CurrentFrame) { - DPRINT1("QueryBusTime called\n"); + DPRINT1("Ehci: QueryBusTime called\n"); return STATUS_NOT_SUPPORTED; } @@ -605,7 +612,7 @@ USB_BUSIFFN SubmitIsoOutUrb(PVOID BusContext, PURB Urb) { - DPRINT1("SubmitIsoOutUrb called\n"); + DPRINT1("Ehci: SubmitIsoOutUrb called\n"); return STATUS_NOT_SUPPORTED; } @@ -617,7 +624,7 @@ PULONG BusInformationBufferLength, PULONG BusInformationActualLength) { - DPRINT1("QueryBusInformation called\n"); + DPRINT1("Ehci: QueryBusInformation called\n"); return STATUS_NOT_SUPPORTED; } @@ -625,7 +632,7 @@ USB_BUSIFFN IsDeviceHighSpeed(PVOID BusContext) { - DPRINT1("IsDeviceHighSpeed called\n"); + DPRINT1("Ehci: IsDeviceHighSpeed called\n"); return TRUE; } @@ -633,6 +640,6 @@ USB_BUSIFFN EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) { - DPRINT1("EnumLogEntry called\n"); - return STATUS_SUCCESS; -} + DPRINT1("Ehci: EnumLogEntry called\n"); + return STATUS_SUCCESS; +}

14 years, 1 month

[cgutman] 48703: [USETUP] - Add the option to write only the VBR so FreeLoader can easily be chain loaded by GRUB or another boot loader - Dedicated to James Tabor :)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Sep 5 17:09:18 2010 New Revision: 48703 URL: http://svn.reactos.org/svn/reactos?rev=48703&view=rev Log: [USETUP] - Add the option to write only the VBR so FreeLoader can easily be chain loaded by GRUB or another boot loader - Dedicated to James Tabor :) Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -2156,6 +2156,28 @@ #endif } +NTSTATUS +InstallVBRToPartition(PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType) +{ + if ((PartitionType == PARTITION_FAT_12) || + (PartitionType == PARTITION_FAT_16) || + (PartitionType == PARTITION_HUGE) || + (PartitionType == PARTITION_XINT13) || + (PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32_XINT13)) + { + return InstallFatBootcodeToPartition(SystemRootPath, + SourceRootPath, + DestinationArcPath, + PartitionType); + } + + return STATUS_UNSUCCESSFUL; +} + NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -79,6 +79,12 @@ UCHAR PartitionType); NTSTATUS +InstallVBRToPartition(PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType); + +NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -3480,7 +3480,7 @@ /* Unattended install on hdd? */ if (IsUnattendedSetup && UnattendMBRInstallType == 2) { - return BOOT_LOADER_HARDDISK_PAGE; + return BOOT_LOADER_HARDDISK_MBR_PAGE; } MUIDisplayPage(BOOT_LOADER_PAGE); @@ -3497,9 +3497,9 @@ Line++; if (Line<12) - Line=14; - - if (Line>14) + Line=15; + + if (Line>15) Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3511,9 +3511,9 @@ Line--; if (Line<12) - Line=14; - - if (Line>14) + Line=15; + + if (Line>15) Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3530,13 +3530,17 @@ { if (Line == 12) { - return BOOT_LOADER_HARDDISK_PAGE; + return BOOT_LOADER_HARDDISK_MBR_PAGE; } else if (Line == 13) { + return BOOT_LOADER_HARDDISK_VBR_PAGE; + } + else if (Line == 14) + { return BOOT_LOADER_FLOPPY_PAGE; } - else if (Line == 14) + else if (Line == 15) { return SUCCESS_PAGE; } @@ -3592,9 +3596,30 @@ return BOOT_LOADER_FLOPPY_PAGE; } - static PAGE_NUMBER -BootLoaderHarddiskPage(PINPUT_RECORD Ir) +BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) +{ + UCHAR PartitionType; + NTSTATUS Status; + + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; + + Status = InstallVBRToPartition(&SystemRootPath, + &SourceRootPath, + &DestinationArcPath, + PartitionType); + if (!NT_SUCCESS(Status)) + { + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + return SUCCESS_PAGE; +} + +static PAGE_NUMBER +BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { UCHAR PartitionType; NTSTATUS Status; @@ -3604,24 +3629,12 @@ /* Step 1: Write the VBR */ PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; - if ((PartitionType == PARTITION_FAT_12) || - (PartitionType == PARTITION_FAT_16) || - (PartitionType == PARTITION_HUGE) || - (PartitionType == PARTITION_XINT13) || - (PartitionType == PARTITION_FAT32) || - (PartitionType == PARTITION_FAT32_XINT13)) - { - Status = InstallFatBootcodeToPartition(&SystemRootPath, - &SourceRootPath, - &DestinationArcPath, - PartitionType); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - } - else + + Status = InstallVBRToPartition(&SystemRootPath, + &SourceRootPath, + &DestinationArcPath, + PartitionType); + if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -3915,8 +3928,12 @@ Page = BootLoaderFloppyPage(&Ir); break; - case BOOT_LOADER_HARDDISK_PAGE: - Page = BootLoaderHarddiskPage(&Ir); + case BOOT_LOADER_HARDDISK_MBR_PAGE: + Page = BootLoaderHarddiskMbrPage(&Ir); + break; + + case BOOT_LOADER_HARDDISK_VBR_PAGE: + Page = BootLoaderHarddiskVbrPage(&Ir); break; /* Repair pages */ Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -995,18 +995,24 @@ { 8, 12, - "« £ ¥ § à¥¦¤ ç â¢êà¤¨ï ¤¨áª (¢ MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "« £ ¥ § à¥¦¤ ç ¤¨áª¥â .", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, " ¥ á¥ á« £ § à¥¦¤ ç.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -993,18 +993,24 @@ { 8, 12, - "Nainstalovat zavadØ na disk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Nainstalovat zavadØ na disketu.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Pýeskoit instalaci zavadØe.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Boot-Loader auf der Festplatte installieren (Bootsektor).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Boot-Loader auf einer Diskette installieren.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Boot-Loader nicht installieren.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -1009,18 +1009,24 @@ { 8, 12, - "¡«á©«© «¦¬ bootloader ©«¦ ©¡¢¨æ å©¡¦ (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "¡«á©«© «¦¬ bootloader © £ ©¡â«.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, " £ å¤ ¡«á©«© «¦¬ bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -985,18 +985,24 @@ { 8, 12, - "Install bootloader on the harddisk (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -992,18 +992,24 @@ { 8, 12, - "Instalar cargador de arranque en el disco duro (sector de boot).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Instalar cargador de inicio en un disquete.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Omitir la instalaci¢n del cargador de arranque.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -985,18 +985,24 @@ { 8, 12, - "Paigalda alglaadur kävakettale (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Paigalda alglaadur flopikettale.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "ra paigalda alglaadurit.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -998,18 +998,24 @@ { 8, 12, - "Installer le chargeur de dmarrage sur le disque dur (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Installer le chargeur de dmarrage sur une disquette.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Ne pas installer le chargeur de dmarrage.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Installazione del bootloader sul disco fisso (settore di avvio).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Installazione del bootloader su un disco floppy.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Salta l'installazione del bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "ÌÞ°ÄÛ°ÀÞ¦ Ê°ÄÞÃÞ¨½¸ (ÌÞ°Ä¾¸À)Æ ²Ý½Ä°Ù ½Ù¡", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "ÌÞ°ÄÛ°ÀÞ¦ ÌÛ¯Ëß° ÃÞ¨½¸Æ ²Ý½Ä°Ù ½Ù¡", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "ÌÞ°ÄÛ°ÀÞÉ ²Ý½Ä°Ù¦ ½·¯Ìß ½Ù¡", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -995,18 +995,24 @@ { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -1012,18 +1012,24 @@ { 8, 12, - "Installeer de bootloader op de harde schijf (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Installeer de bootloader op een floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Installeren bootloader overslaan.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -994,18 +994,24 @@ { 8, 12, - " Wgraj bootloader na dysk twardy (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, " Wgraj bootloader na dyskietk©.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, " Pomiä wgrywanie bootloadera.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "áâ ®¢ª ¦¥áâª¨© ¤¨áª (§ £àã§®çë© á¥ªâ®à).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "áâ ®¢ª £¨¡ª¨© ¤¨áª.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "¥ ãáâ ¢«¨¢ âì § £àã§ç¨ª.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -993,18 +993,24 @@ { 8, 12, - "Nainçtalova zav dza systmu na pevnì disk (zav dzac¡ sektor).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Nainçtalova zav dza systmu na disketu.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Preskoi inçtal ciu zav dzaa systmu.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -991,18 +991,24 @@ { 8, 12, - "áâ ®¢¨â¨ bootloader ¦®àáâª¨© ¤¨áª (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "áâ ®¢¨â¨ bootloader ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "¥ ¢áâ ®¢«î¢ â¨ bootloader.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -108,7 +108,8 @@ REGISTRY_PAGE, BOOT_LOADER_PAGE, BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_PAGE, + BOOT_LOADER_HARDDISK_MBR_PAGE, + BOOT_LOADER_HARDDISK_VBR_PAGE, REPAIR_INTRO_PAGE,

14 years, 1 month

[akhaldi] 48702: [FREELDR] - Update fathelp.S to reflect Timo's recent changes in trunk.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 5 16:31:06 2010 New Revision: 48702 URL: http://svn.reactos.org/svn/reactos?rev=48702&view=rev Log: [FREELDR] - Update fathelp.S to reflect Timo's recent changes in trunk. Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] Sun Sep 5 16:31:06 2010 @@ -4,9 +4,12 @@ .intel_syntax noprefix +//org 8000h + .text .code16 + #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -38,6 +41,8 @@ #define VolumeLabel 43 #define FileSystem 54 +#define BootPartition 0x7dfd + // This code will be stored in the first 512 bytes // of freeldr.sys. The first 3 bytes will be a jmp @@ -46,7 +51,6 @@ // // This code is loaded at 0000:8000 so we have to // encode a jmp instruction to jump to 0000:8200 -//.org 0x8000 .global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol _mainCRTStartup: @@ -119,14 +123,14 @@ jmp LoadFile // Load the next cluster (if any) LoadFile_Done: - mov dl, [bp+BootDrive] // Load the boot drive into DL - mov dh, BootPartition // Load the boot partition into DH - push word ptr 0x0000 - push word ptr 0x8000 // We will do a far return to 0000:8000h - -// retf // Transfer control to ROSLDR - .byte 0xcb // == retf - + mov dl,BYTE PTR [bp+BootDrive] // Load the boot drive into DL + mov dh,[BootPartition] // Load the boot partition into DH + + push 0 // push segment (0x0000) + mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax + add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset + retf // Transfer control to FreeLoader // Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: @@ -225,15 +229,7 @@ -msgLoading: - .ascii "Loading FreeLoader..." - .byte 0x0d,0x0a,0 - -// times 510-($-$$) db 0 // Pad to 510 bytes -.org 0x1fe - .word 0x0aa55 // BootSector signature - - -// pseudo adresses -//.org 0x7dfd -BootPartition: +msgLoading: .asciz "Loading FreeLoader...\r\n" + + .org 0x1fe // Pad to 510 bytes + .word 0x0aa55 // BootSector signature Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] Sun Sep 5 16:31:06 2010 @@ -4,9 +4,12 @@ .intel_syntax noprefix +//org 8000h + .text .code16 + #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -38,6 +41,8 @@ #define VolumeLabel 43 #define FileSystem 54 +#define BootPartition 0x7dfd + // This code will be stored in the first 512 bytes // of freeldr.sys. The first 3 bytes will be a jmp @@ -46,7 +51,6 @@ // // This code is loaded at 0000:8000 so we have to // encode a jmp instruction to jump to 0000:8200 -//.org 0x8000 .global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol _mainCRTStartup: @@ -119,14 +123,14 @@ jmp LoadFile // Load the next cluster (if any) LoadFile_Done: - mov dl, [bp+BootDrive] // Load the boot drive into DL - mov dh, BootPartition // Load the boot partition into DH - push word ptr 0x0000 - push word ptr 0x8000 // We will do a far return to 0000:8000h - -// retf // Transfer control to ROSLDR - .byte 0xcb // == retf - + mov dl,BYTE PTR [bp+BootDrive] // Load the boot drive into DL + mov dh,[BootPartition] // Load the boot partition into DH + + push 0 // push segment (0x0000) + mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax + add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset + retf // Transfer control to FreeLoader // Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: @@ -225,15 +229,7 @@ -msgLoading: - .ascii "Loading FreeLoader..." - .byte 0x0d,0x0a,0 - -// times 510-($-$$) db 0 // Pad to 510 bytes -.org 0x1fe - .word 0x0aa55 // BootSector signature - - -// pseudo adresses -//.org 0x7dfd -BootPartition: +msgLoading: .asciz "Loading FreeLoader...\r\n" + + .org 0x1fe // Pad to 510 bytes + .word 0x0aa55 // BootSector signature

14 years, 1 month

[tkreuzer] 48701: Update the GAS compatible fathelp.S file to reflect the latest changes to the original file (freeldr PE conversion). This version is tested and works.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 5 16:03:08 2010 New Revision: 48701 URL: http://svn.reactos.org/svn/reactos?rev=48701&view=rev Log: Update the GAS compatible fathelp.S file to reflect the latest changes to the original file (freeldr PE conversion). This version is tested and works. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] Sun Sep 5 16:03:08 2010 @@ -4,9 +4,12 @@ .intel_syntax noprefix +//org 8000h + .text .code16 + #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -38,6 +41,8 @@ #define VolumeLabel 43 #define FileSystem 54 +#define BootPartition 0x7dfd + // This code will be stored in the first 512 bytes // of freeldr.sys. The first 3 bytes will be a jmp @@ -46,7 +51,6 @@ // // This code is loaded at 0000:8000 so we have to // encode a jmp instruction to jump to 0000:8200 -//.org 0x8000 .global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol _mainCRTStartup: @@ -119,14 +123,14 @@ jmp LoadFile // Load the next cluster (if any) LoadFile_Done: - mov dl, [bp+BootDrive] // Load the boot drive into DL - mov dh, BootPartition // Load the boot partition into DH - push word ptr 0x0000 - push word ptr 0x8000 // We will do a far return to 0000:8000h - -// retf // Transfer control to ROSLDR - .byte 0xcb // == retf - + mov dl,BYTE PTR [bp+BootDrive] // Load the boot drive into DL + mov dh,[BootPartition] // Load the boot partition into DH + + push 0 // push segment (0x0000) + mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax + add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset + retf // Transfer control to FreeLoader // Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: @@ -225,15 +229,7 @@ -msgLoading: - .ascii "Loading FreeLoader..." - .byte 0x0d,0x0a,0 - -// times 510-($-$$) db 0 // Pad to 510 bytes -.org 0x1fe - .word 0x0aa55 // BootSector signature - - -// pseudo adresses -//.org 0x7dfd -BootPartition: +msgLoading: .asciz "Loading FreeLoader...\r\n" + + .org 0x1fe // Pad to 510 bytes + .word 0x0aa55 // BootSector signature

14 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010