Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ashaposhnikov] 75754: [RAPPS] Fixed newline in de-DE.rc
by ashaposhnikov＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: ashaposhnikov Date: Sun Sep 3 19:52:38 2017 New Revision: 75754 URL: http://svn.reactos.org/svn/reactos?rev=75754&view=rev Log: [RAPPS] Fixed newline in de-DE.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sun Sep 3 19:52:38 2017 @@ -203,7 +203,8 @@ IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! PrÃ¼fen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." + IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." + IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

1 0

[hbelusca] 75753: [SETUPLIB][USETUP]: Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI). Only convert to ANSI when needed (e.g. in the display code for usetup). The 1s...
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 19:46:26 2017 New Revision: 75753 URL: http://svn.reactos.org/svn/reactos?rev=75753&view=rev Log: [SETUPLIB][USETUP]: Make the GENERIC_LIST store the items display text in UNICODE (and not in ANSI). Only convert to ANSI when needed (e.g. in the display code for usetup). The 1st-stage GUI setup will however use the UNICODE strings directly. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/utils/genlist.c branches/setup_improvements/base/setup/lib/utils/genlist.h branches/setup_improvements/base/setup/lib/utils/osdetect.c branches/setup_improvements/base/setup/usetup/genlist.c branches/setup_improvements/base/setup/usetup/genlist.h branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -324,7 +324,7 @@ (NTAPI *PPROCESS_ENTRY_ROUTINE)( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -345,7 +345,7 @@ PVOID UserData; BOOLEAN Current; UCHAR RetVal; - CHAR DisplayText[128]; + WCHAR DisplayText[128]; if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) return -1; @@ -405,7 +405,7 @@ DefaultProcessEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -423,7 +423,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); @@ -740,7 +740,7 @@ } #if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); + AppendGenericListEntry(List, L"Other display driver", NULL, TRUE); #endif return List; @@ -1087,7 +1087,7 @@ ProcessLangEntry( IN PWCHAR KeyName, IN PWCHAR KeyValue, - IN PCHAR DisplayText, + OUT PWCHAR DisplayText, IN SIZE_T DisplayTextSize, OUT PVOID* UserData, OUT PBOOLEAN Current, @@ -1111,7 +1111,7 @@ } wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); + wcscpy(DisplayText, KeyValue); *Current = FALSE; Modified: branches/setup_improvements/base/setup/lib/utils/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -67,7 +67,7 @@ BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current) { @@ -75,11 +75,12 @@ Entry = (PGENERIC_LIST_ENTRY)RtlAllocateHeap(ProcessHeap, 0, - sizeof(GENERIC_LIST_ENTRY) + strlen(Text)); + sizeof(GENERIC_LIST_ENTRY) + + (wcslen(Text) + 1) * sizeof(WCHAR)); if (Entry == NULL) return FALSE; - strcpy (Entry->Text, Text); + wcscpy(Entry->Text, Text); Entry->List = List; Entry->UserData = UserData; @@ -140,7 +141,7 @@ return Entry->UserData; } -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry) { Modified: branches/setup_improvements/base/setup/lib/utils/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/genlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/genlist.h [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -13,7 +13,7 @@ LIST_ENTRY Entry; struct _GENERIC_LIST* List; PVOID UserData; - CHAR Text[1]; // FIXME: UI stuff + WCHAR Text[1]; // FIXME: UI stuff } GENERIC_LIST_ENTRY, *PGENERIC_LIST_ENTRY; @@ -39,7 +39,7 @@ BOOLEAN AppendGenericListEntry( IN OUT PGENERIC_LIST List, - IN PCHAR Text, + IN PCWSTR Text, IN PVOID UserData, IN BOOLEAN Current); @@ -64,7 +64,7 @@ GetListEntryUserData( IN PGENERIC_LIST_ENTRY Entry); -LPCSTR +PCWSTR GetListEntryText( IN PGENERIC_LIST_ENTRY Entry); Modified: branches/setup_improvements/base/setup/lib/utils/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/utils/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/utils/osdetect.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -571,7 +571,6 @@ { PNTOS_INSTALLATION NtOsInstall; SIZE_T ArcPathLength, NtPathLength; - CHAR InstallNameA[MAX_PATH]; /* Is there already any installation with these settings? */ NtOsInstall = FindExistingNTOSInstall(List, SystemRootArcPath, SystemRootNtPath); @@ -617,8 +616,7 @@ StringCchCopyW(NtOsInstall->InstallationName, ARRAYSIZE(NtOsInstall->InstallationName), InstallationName); // Having the GENERIC_LIST storing the display item string plainly sucks... - StringCchPrintfA(InstallNameA, ARRAYSIZE(InstallNameA), "%S", InstallationName); - AppendGenericListEntry(List, InstallNameA, NtOsInstall, FALSE); + AppendGenericListEntry(List, InstallationName, NtOsInstall, FALSE); return NtOsInstall; } Modified: branches/setup_improvements/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -48,6 +48,8 @@ ListUi->Right = 0; ListUi->Bottom = 0; ListUi->Redraw = TRUE; + + ListUi->CurrentItemText[0] = ANSI_NULL; } static @@ -158,6 +160,8 @@ break; ListUi->LastShown = Entry; + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + FillConsoleOutputAttribute(StdOutput, (List->CurrentEntry == ListEntry) ? FOREGROUND_BLUE | BACKGROUND_WHITE : @@ -174,8 +178,8 @@ coPos.X++; WriteConsoleOutputCharacterA(StdOutput, - ListEntry->Text, - min(strlen(ListEntry->Text), (SIZE_T)Width - 2), + ListUi->CurrentItemText, + min(strlen(ListUi->CurrentItemText), (SIZE_T)Width - 2), coPos, &Written); coPos.X--; @@ -415,7 +419,7 @@ for (i = ListUi->Bottom - 1; i > ListUi->Top + 1; i--) { - ScrollUpGenericList(ListUi); + ScrollUpGenericList(ListUi); } /* Update user interface */ @@ -490,13 +494,17 @@ ListUi->Redraw = FALSE; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar) && + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar) && (List->CurrentEntry->Entry.Flink != &List->ListHead)) { ScrollDownGenericList(ListUi); ListEntry = List->CurrentEntry; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) goto End; } @@ -507,7 +515,9 @@ for (;;) { - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) + sprintf(ListUi->CurrentItemText, "%S", ListEntry->Text); + + if ((strlen(ListUi->CurrentItemText) > 0) && (tolower(ListUi->CurrentItemText[0]) == AsciiChar)) { Flag = TRUE; break; Modified: branches/setup_improvements/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.h [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -40,6 +40,9 @@ SHORT Right; SHORT Bottom; BOOL Redraw; + + CHAR CurrentItemText[256]; + } GENERIC_LIST_UI, *PGENERIC_LIST_UI; VOID Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 19:46:26 2017 @@ -1045,6 +1045,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; + CHAR CurrentItemText[256]; /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1099,10 +1100,14 @@ MUIDisplayPage(DEVICE_SETTINGS_PAGE); - CONSOLE_SetTextXY(25, 11, GetListEntryText(GetCurrentListEntry(ComputerList))); - CONSOLE_SetTextXY(25, 12, GetListEntryText(GetCurrentListEntry(DisplayList))); - CONSOLE_SetTextXY(25, 13, GetListEntryText(GetCurrentListEntry(KeyboardList))); - CONSOLE_SetTextXY(25, 14, GetListEntryText(GetCurrentListEntry(LayoutList))); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(ComputerList))); + CONSOLE_SetTextXY(25, 11, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(DisplayList))); + CONSOLE_SetTextXY(25, 12, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(KeyboardList))); + CONSOLE_SetTextXY(25, 13, CurrentItemText); + sprintf(CurrentItemText, "%S", GetListEntryText(GetCurrentListEntry(LayoutList))); + CONSOLE_SetTextXY(25, 14, CurrentItemText); CONSOLE_InvertTextXY(24, Line, 48, 1);

1 0

[hbelusca] 75752: [USETUP]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 19:31:36 2017 New Revision: 75752 URL: http://svn.reactos.org/svn/reactos?rev=75752&view=rev Log: [USETUP]: Whitespace fixes only. Modified: branches/setup_improvements/base/setup/usetup/genlist.c Modified: branches/setup_improvements/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/genlist.c [iso-8859-1] Sun Sep 3 19:31:36 2017 @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/genlist.c * PURPOSE: Generic list functions @@ -61,75 +62,75 @@ /* Draw upper left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xDA, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xDA, // '+', + 1, + coPos, + &Written); /* Draw upper edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw upper right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Top; - FillConsoleOutputCharacterA (StdOutput, - 0xBF, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xBF, // '+', + 1, + coPos, + &Written); /* Draw left and right edge */ for (i = ListUi->Top + 1; i < ListUi->Bottom; i++) { coPos.X = ListUi->Left; coPos.Y = i; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, // '|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, // '|', + 1, + coPos, + &Written); coPos.X = ListUi->Right; - FillConsoleOutputCharacterA (StdOutput, - 0xB3, //'|', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xB3, //'|', + 1, + coPos, + &Written); } /* Draw lower left corner */ coPos.X = ListUi->Left; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC0, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC0, // '+', + 1, + coPos, + &Written); /* Draw lower edge */ coPos.X = ListUi->Left + 1; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xC4, // '-', - ListUi->Right - ListUi->Left - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xC4, // '-', + ListUi->Right - ListUi->Left - 1, + coPos, + &Written); /* Draw lower right corner */ coPos.X = ListUi->Right; coPos.Y = ListUi->Bottom; - FillConsoleOutputCharacterA (StdOutput, - 0xD9, // '+', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + 0xD9, // '+', + 1, + coPos, + &Written); } static @@ -157,26 +158,26 @@ break; ListUi->LastShown = Entry; - FillConsoleOutputAttribute (StdOutput, - (List->CurrentEntry == ListEntry) ? - FOREGROUND_BLUE | BACKGROUND_WHITE : - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + (List->CurrentEntry == ListEntry) ? + FOREGROUND_BLUE | BACKGROUND_WHITE : + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, + coPos.X++; + WriteConsoleOutputCharacterA(StdOutput, + ListEntry->Text, + min(strlen(ListEntry->Text), (SIZE_T)Width - 2), coPos, &Written); - - coPos.X++; - WriteConsoleOutputCharacterA (StdOutput, - ListEntry->Text, - min (strlen(ListEntry->Text), (SIZE_T)Width - 2), - coPos, - &Written); coPos.X--; coPos.Y++; @@ -185,17 +186,17 @@ while (coPos.Y < ListUi->Bottom) { - FillConsoleOutputAttribute (StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, + FillConsoleOutputAttribute(StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + Width, + coPos, + &Written); + + FillConsoleOutputCharacterA(StdOutput, + ' ', Width, coPos, &Written); - - FillConsoleOutputCharacterA (StdOutput, - ' ', - Width, - coPos, - &Written); coPos.Y++; } } @@ -214,37 +215,37 @@ if (ListUi->FirstShown != List->ListHead.Flink) { - FillConsoleOutputCharacterA (StdOutput, - '\x18', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x18', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } coPos.Y = ListUi->Bottom; if (ListUi->LastShown != List->ListHead.Blink) { - FillConsoleOutputCharacterA (StdOutput, - '\x19', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + '\x19', + 1, + coPos, + &Written); } else { - FillConsoleOutputCharacterA (StdOutput, - ' ', - 1, - coPos, - &Written); + FillConsoleOutputCharacterA(StdOutput, + ' ', + 1, + coPos, + &Written); } }

1 0

[hbelusca] 75751: [SETUPLIB][USETUP]: Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy().
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 16:19:59 2017 New Revision: 75751 URL: http://svn.reactos.org/svn/reactos?rev=75751&view=rev Log: [SETUPLIB][USETUP]: Move the floppy-disk accessibility check into InstallFatBootcodeToFloppy(). Modified: branches/setup_improvements/base/setup/lib/bootsup.c branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/bootsup.c [iso-8859-1] Sun Sep 3 16:19:59 2017 @@ -2268,7 +2268,11 @@ WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - /* Format the floppy first */ + /* Verify that the floppy disk is accessible */ + if (DoesDirExist(NULL, FloppyDevice.Buffer) == FALSE) + return STATUS_DEVICE_NOT_READY; + + /* Format the floppy disk */ FatFS = GetFileSystemByName(L"FAT"); if (!FatFS) { Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 16:19:59 2017 @@ -4186,16 +4186,14 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE) - { - MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); - return BOOT_LOADER_FLOPPY_PAGE; - } - - Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, &USetupData.DestinationArcPath); + Status = InstallFatBootcodeToFloppy(&USetupData.SourceRootPath, + &USetupData.DestinationArcPath); if (!NT_SUCCESS(Status)) { - /* Print error message */ + if (Status == STATUS_DEVICE_NOT_READY) + MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); + + /* TODO: Print error message */ return BOOT_LOADER_FLOPPY_PAGE; } @@ -4279,8 +4277,7 @@ DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", - Status); + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; }

1 0

[hbelusca] 75750: [SETUPLIB][USETUP]: Move the registry-update procedure into setuplib, where it can also be used by the 1st-stage GUI setup, and make the necessary changes in usetup. [REACTOS]: Fi...
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 16:17:27 2017 New Revision: 75750 URL: http://svn.reactos.org/svn/reactos?rev=75750&view=rev Log: [SETUPLIB][USETUP]: Move the registry-update procedure into setuplib, where it can also be used by the 1st-stage GUI setup, and make the necessary changes in usetup. [REACTOS]: Fix build. Modified: branches/setup_improvements/base/setup/lib/setuplib.c branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/reactos/CMakeLists.txt branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/setuplib.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.c [iso-8859-1] Sun Sep 3 16:17:27 2017 @@ -565,4 +565,240 @@ return ERROR_SUCCESS; } +/* + * SIDEEFFECTS + * Calls RegInitializeRegistry + * Calls ImportRegistryFile + * Calls SetDefaultPagefile + * Calls SetMountedDeviceValues + */ +ERROR_NUMBER +UpdateRegistry( + IN HINF SetupInf, + IN OUT PUSETUP_DATA pSetupData, + /**/IN BOOLEAN RepairUpdateFlag, /* HACK HACK! */ + /**/IN PPARTLIST PartitionList, /* HACK HACK! */ + /**/IN WCHAR DestinationDriveLetter, /* HACK HACK! */ + /**/IN PWCHAR SelectedLanguageId, /* HACK HACK! */ + IN PGENERIC_LIST DisplayList, + IN PGENERIC_LIST LayoutList, + IN PGENERIC_LIST LanguageList, + IN PREGISTRY_STATUS_ROUTINE StatusRoutine OPTIONAL) +{ + ERROR_NUMBER ErrorNumber; + NTSTATUS Status; + INFCONTEXT InfContext; + PWSTR Action; + PWSTR File; + PWSTR Section; + BOOLEAN Success; + BOOLEAN ShouldRepairRegistry = FALSE; + BOOLEAN Delete; + + if (RepairUpdateFlag) + { + DPRINT1("TODO: Updating / repairing the registry is not completely implemented yet!\n"); + + /* Verify the registry hives and check whether we need to update or repair any of them */ + Status = VerifyRegistryHives(&pSetupData->DestinationPath, &ShouldRepairRegistry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("VerifyRegistryHives failed, Status 0x%08lx\n", Status); + ShouldRepairRegistry = FALSE; + } + if (!ShouldRepairRegistry) + DPRINT1("No need to repair the registry\n"); + } + +DoUpdate: + ErrorNumber = ERROR_SUCCESS; + + /* Update the registry */ + if (StatusRoutine) StatusRoutine(RegHiveUpdate); + + /* Initialize the registry and setup the registry hives */ + Status = RegInitializeRegistry(&pSetupData->DestinationPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RegInitializeRegistry() failed\n"); + /********** HACK!!!!!!!!!!! **********/ + if (Status == STATUS_NOT_IMPLEMENTED) + { + /* The hack was called, return its corresponding error */ + return ERROR_INITIALIZE_REGISTRY; + } + else + /*************************************/ + { + /* Something else failed */ + return ERROR_CREATE_HIVE; + } + } + + if (!RepairUpdateFlag || ShouldRepairRegistry) + { + /* + * We fully setup the hives, in case we are doing a fresh installation + * (RepairUpdateFlag == FALSE), or in case we are doing an update + * (RepairUpdateFlag == TRUE) BUT we have some registry hives to + * "repair" (aka. recreate: ShouldRepairRegistry == TRUE). + */ + + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Fresh", NULL, &InfContext); // Windows-compatible + if (!Success) + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext); // ReactOS-specific + + if (!Success) + { + DPRINT1("SetupFindFirstLine() failed\n"); + ErrorNumber = ERROR_FIND_REGISTRY; + goto Cleanup; + } + } + else // if (RepairUpdateFlag && !ShouldRepairRegistry) + { + /* + * In case we are doing an update (RepairUpdateFlag == TRUE) and + * NO registry hives need a repair (ShouldRepairRegistry == FALSE), + * we only update the hives. + */ + + Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Upgrade", NULL, &InfContext); + if (!Success) + { + /* Nothing to do for update! */ + DPRINT1("No update needed for the registry!\n"); + goto Cleanup; + } + } + + do + { + INF_GetDataField(&InfContext, 0, &Action); + INF_GetDataField(&InfContext, 1, &File); + INF_GetDataField(&InfContext, 2, &Section); + + DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); + + if (Action == NULL) + { + INF_FreeData(Action); + INF_FreeData(File); + INF_FreeData(Section); + break; // Hackfix + } + + if (!_wcsicmp(Action, L"AddReg")) + Delete = FALSE; + else if (!_wcsicmp(Action, L"DelReg")) + Delete = TRUE; + else + { + DPRINT1("Unrecognized registry INF action '%S'\n", Action); + INF_FreeData(Action); + INF_FreeData(File); + INF_FreeData(Section); + continue; + } + + INF_FreeData(Action); + + if (StatusRoutine) StatusRoutine(ImportRegHive, File); + + if (!ImportRegistryFile(pSetupData->SourcePath.Buffer, + File, Section, + pSetupData->LanguageId, Delete)) + { + DPRINT1("Importing %S failed\n", File); + INF_FreeData(File); + INF_FreeData(Section); + ErrorNumber = ERROR_IMPORT_HIVE; + goto Cleanup; + } + } while (SetupFindNextLine(&InfContext, &InfContext)); + + if (!RepairUpdateFlag || ShouldRepairRegistry) + { + /* See the explanation for this test above */ + + /* Update display registry settings */ + if (StatusRoutine) StatusRoutine(DisplaySettingsUpdate); + if (!ProcessDisplayRegistry(SetupInf, DisplayList)) + { + ErrorNumber = ERROR_UPDATE_DISPLAY_SETTINGS; + goto Cleanup; + } + + /* Set the locale */ + if (StatusRoutine) StatusRoutine(LocaleSettingsUpdate); + if (!ProcessLocaleRegistry(LanguageList)) + { + ErrorNumber = ERROR_UPDATE_LOCALESETTINGS; + goto Cleanup; + } + + /* Add keyboard layouts */ + if (StatusRoutine) StatusRoutine(KeybLayouts); + if (!AddKeyboardLayouts(SelectedLanguageId)) + { + ErrorNumber = ERROR_ADDING_KBLAYOUTS; + goto Cleanup; + } + + /* Set GeoID */ + if (!SetGeoID(MUIGetGeoID(SelectedLanguageId))) + { + ErrorNumber = ERROR_UPDATE_GEOID; + goto Cleanup; + } + + if (!IsUnattendedSetup) + { + /* Update keyboard layout settings */ + if (StatusRoutine) StatusRoutine(KeybSettingsUpdate); + if (!ProcessKeyboardLayoutRegistry(LayoutList, SelectedLanguageId)) + { + ErrorNumber = ERROR_UPDATE_KBSETTINGS; + goto Cleanup; + } + } + + /* Add codepage information to registry */ + if (StatusRoutine) StatusRoutine(CodePageInfoUpdate); + if (!AddCodePage(SelectedLanguageId)) + { + ErrorNumber = ERROR_ADDING_CODEPAGE; + goto Cleanup; + } + + /* Set the default pagefile entry */ + SetDefaultPagefile(DestinationDriveLetter); + + /* Update the mounted devices list */ + // FIXME: This should technically be done by mountmgr (if AutoMount is enabled)! + SetMountedDeviceValues(PartitionList); + } + +Cleanup: + // + // TODO: Unload all the registry stuff, perform cleanup, + // and copy the created hive files into .sav files. + // + RegCleanupRegistry(&pSetupData->DestinationPath); + + /* + * Check whether we were in update/repair mode but we were actually + * repairing the registry hives. If so, we have finished repairing them, + * and we now reset the flag and run the proper registry update. + * Otherwise we have finished the registry update! + */ + if (RepairUpdateFlag && ShouldRepairRegistry) + { + ShouldRepairRegistry = FALSE; + goto DoUpdate; + } + + return ErrorNumber; +} + /* EOF */ Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Sun Sep 3 16:17:27 2017 @@ -124,4 +124,32 @@ IN OUT PUSETUP_DATA pSetupData); +typedef enum _REGISTRY_STATUS +{ + Success = 0, + RegHiveUpdate, + ImportRegHive, + DisplaySettingsUpdate, + LocaleSettingsUpdate, + KeybLayouts, + KeybSettingsUpdate, + CodePageInfoUpdate, +} REGISTRY_STATUS; + +typedef VOID +(NTAPI *PREGISTRY_STATUS_ROUTINE)(IN REGISTRY_STATUS, ...); + +ERROR_NUMBER +UpdateRegistry( + IN HINF SetupInf, + IN OUT PUSETUP_DATA pSetupData, + /**/IN BOOLEAN RepairUpdateFlag, /* HACK HACK! */ + /**/IN PPARTLIST PartitionList, /* HACK HACK! */ + /**/IN WCHAR DestinationDriveLetter, /* HACK HACK! */ + /**/IN PWCHAR SelectedLanguageId, /* HACK HACK! */ + IN PGENERIC_LIST DisplayList, + IN PGENERIC_LIST LayoutList, + IN PGENERIC_LIST LanguageList, + IN PREGISTRY_STATUS_ROUTINE StatusRoutine OPTIONAL); + /* EOF */ Modified: branches/setup_improvements/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/CMakeLists.txt [iso-8859-1] Sun Sep 3 16:17:27 2017 @@ -17,6 +17,6 @@ add_executable(reactos ${SOURCE} reactos.rc) set_module_type(reactos win32gui UNICODE) add_pch(reactos reactos.h SOURCE) -target_link_libraries(reactos uuid setuplib) +target_link_libraries(reactos uuid setuplib ext2lib vfatlib) add_importlibs(reactos advapi32 gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 16:17:27 2017 @@ -3864,6 +3864,37 @@ } +static VOID +NTAPI +RegistryStatus(IN REGISTRY_STATUS RegStatus, ...) +{ + /* WARNING: Please keep this lookup table in sync with the resources! */ + static const UINT StringIDs[] = + { + STRING_DONE, /* Success */ + STRING_REGHIVEUPDATE, /* RegHiveUpdate */ + STRING_IMPORTFILE, /* ImportRegHive */ + STRING_DISPLAYSETTINGSUPDATE, /* DisplaySettingsUpdate */ + STRING_LOCALESETTINGSUPDATE, /* LocaleSettingsUpdate */ + STRING_ADDKBLAYOUTS, /* KeybLayouts */ + STRING_KEYBOARDSETTINGSUPDATE, /* KeybSettingsUpdate */ + STRING_CODEPAGEINFOUPDATE, /* CodePageInfoUpdate */ + }; + + va_list args; + + if (RegStatus < ARRAYSIZE(StringIDs)) + { + va_start(args, RegStatus); + CONSOLE_SetStatusTextV(MUIGetString(StringIDs[RegStatus]), args); + va_end(args); + } + else + { + CONSOLE_SetStatusText("Unknown status %d", RegStatus); + } +} + /* * Displays the RegistryPage. * @@ -3873,10 +3904,7 @@ * QuitPage * * SIDEEFFECTS - * Calls RegInitializeRegistry - * Calls ImportRegistryFile - * Calls SetDefaultPagefile - * Calls SetMountedDeviceValues + * Calls UpdateRegistry * * RETURNS * Number of the next page. @@ -3884,225 +3912,29 @@ static PAGE_NUMBER RegistryPage(PINPUT_RECORD Ir) { - NTSTATUS Status; - INFCONTEXT InfContext; - PWSTR Action; - PWSTR File; - PWSTR Section; - BOOLEAN Success; - BOOLEAN ShouldRepairRegistry = FALSE; - BOOLEAN Delete; + ULONG Error; MUIDisplayPage(REGISTRY_PAGE); - if (RepairUpdateFlag) - { - DPRINT1("TODO: Updating / repairing the registry is not completely implemented yet!\n"); - - /* Verify the registry hives and check whether we need to update or repair any of them */ - Status = VerifyRegistryHives(&USetupData.DestinationPath, &ShouldRepairRegistry); - if (!NT_SUCCESS(Status)) - { - DPRINT1("VerifyRegistryHives failed, Status 0x%08lx\n", Status); - ShouldRepairRegistry = FALSE; - } - if (!ShouldRepairRegistry) - DPRINT1("No need to repair the registry\n"); - } - -DoUpdate: - /* Update the registry */ - CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); - - /* Initialize the registry and setup the registry hives */ - Status = RegInitializeRegistry(&USetupData.DestinationPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RegInitializeRegistry() failed\n"); - /********** HACK!!!!!!!!!!! **********/ - if (Status == STATUS_NOT_IMPLEMENTED) - { - /* The hack was called, display its corresponding error */ - MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); - } - else - /*************************************/ - { - /* Something else failed */ - MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); - } + Error = UpdateRegistry(SetupInf, + &USetupData, + RepairUpdateFlag, + PartitionList, + DestinationDriveLetter, + SelectedLanguageId, + DisplayList, + LayoutList, + LanguageList, + RegistryStatus); + if (Error != ERROR_SUCCESS) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } - - if (!RepairUpdateFlag || ShouldRepairRegistry) - { - /* - * We fully setup the hives, in case we are doing a fresh installation - * (RepairUpdateFlag == FALSE), or in case we are doing an update - * (RepairUpdateFlag == TRUE) BUT we have some registry hives to - * "repair" (aka. recreate: ShouldRepairRegistry == TRUE). - */ - - Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Fresh", NULL, &InfContext); // Windows-compatible - if (!Success) - Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Install", NULL, &InfContext); // ReactOS-specific - - if (!Success) - { - DPRINT1("SetupFindFirstLine() failed\n"); - MUIDisplayError(ERROR_FIND_REGISTRY, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - } - else // if (RepairUpdateFlag && !ShouldRepairRegistry) - { - /* - * In case we are doing an update (RepairUpdateFlag == TRUE) and - * NO registry hives need a repair (ShouldRepairRegistry == FALSE), - * we only update the hives. - */ - - Success = SetupFindFirstLineW(SetupInf, L"HiveInfs.Upgrade", NULL, &InfContext); - if (!Success) - { - /* Nothing to do for update! */ - DPRINT1("No update needed for the registry!\n"); - goto Cleanup; - } - } - - do - { - INF_GetDataField(&InfContext, 0, &Action); - INF_GetDataField(&InfContext, 1, &File); - INF_GetDataField(&InfContext, 2, &Section); - - DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); - - if (Action == NULL) - { - INF_FreeData(Action); - INF_FreeData(File); - INF_FreeData(Section); - break; // Hackfix - } - - if (!_wcsicmp(Action, L"AddReg")) - Delete = FALSE; - else if (!_wcsicmp(Action, L"DelReg")) - Delete = TRUE; - else - { - DPRINT1("Unrecognized registry INF action '%S'\n", Action); - INF_FreeData(Action); - INF_FreeData(File); - INF_FreeData(Section); - continue; - } - - INF_FreeData(Action); - - CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); - - if (!ImportRegistryFile(USetupData.SourcePath.Buffer, File, Section, USetupData.LanguageId, Delete)) - { - DPRINT1("Importing %S failed\n", File); - INF_FreeData(File); - INF_FreeData(Section); - MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - } while (SetupFindNextLine(&InfContext, &InfContext)); - - if (!RepairUpdateFlag || ShouldRepairRegistry) - { - /* See the explanation for this test above */ - - /* Update display registry settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYSETTINGSUPDATE)); - if (!ProcessDisplayRegistry(SetupInf, DisplayList)) - { - MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - - /* Set the locale */ - CONSOLE_SetStatusText(MUIGetString(STRING_LOCALESETTINGSUPDATE)); - if (!ProcessLocaleRegistry(LanguageList)) - { - MUIDisplayError(ERROR_UPDATE_LOCALESETTINGS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - - /* Add keyboard layouts */ - CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); - if (!AddKeyboardLayouts(SelectedLanguageId)) - { - MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - - /* Set GeoID */ - if (!SetGeoID(MUIGetGeoID(SelectedLanguageId))) - { - MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - - if (!IsUnattendedSetup) - { - /* Update keyboard layout settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList, SelectedLanguageId)) - { - MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - } - - /* Add codepage information to registry */ - CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); - if (!AddCodePage(SelectedLanguageId)) - { - MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); - goto Cleanup; - } - - /* Set the default pagefile entry */ - SetDefaultPagefile(DestinationDriveLetter); - - /* Update the mounted devices list */ - // FIXME: This should technically be done by mountmgr (if AutoMount is enabled)! - SetMountedDeviceValues(PartitionList); - } - -Cleanup: - // - // TODO: Unload all the registry stuff, perform cleanup, - // and copy the created hive files into .sav files. - // - RegCleanupRegistry(&USetupData.DestinationPath); - - /* - * Check whether we were in update/repair mode but we were actually - * repairing the registry hives. If so, we have finished repairing them, - * and we now reset the flag and run the proper registry update. - * Otherwise we have finished the registry update! - */ - if (RepairUpdateFlag && ShouldRepairRegistry) - { - ShouldRepairRegistry = FALSE; - goto DoUpdate; - } - - if (NT_SUCCESS(Status)) + else { CONSOLE_SetStatusText(MUIGetString(STRING_DONE)); return BOOT_LOADER_PAGE; - } - else - { - return QUIT_PAGE; } }

1 0

[hbelusca] 75749: [USETUP]: Introduce some -V functions for CONSOLE_ConOutPrintf, CONSOLE_SetStatusText and CONSOLE_SetStatusTextX. Fix also the whitespace in consup.h.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 16:03:21 2017 New Revision: 75749 URL: http://svn.reactos.org/svn/reactos?rev=75749&view=rev Log: [USETUP]: Introduce some -V functions for CONSOLE_ConOutPrintf, CONSOLE_SetStatusText and CONSOLE_SetStatusTextX. Fix also the whitespace in consup.h. Modified: branches/setup_improvements/base/setup/usetup/consup.c branches/setup_improvements/base/setup/usetup/consup.h Modified: branches/setup_improvements/base/setup/usetup/consup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/consup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/consup.c [iso-8859-1] Sun Sep 3 16:03:21 2017 @@ -109,16 +109,14 @@ } VOID -CONSOLE_ConOutPrintf( - IN LPCSTR szFormat, ...) +CONSOLE_ConOutPrintfV( + IN LPCSTR szFormat, + IN va_list args) { CHAR szOut[256]; DWORD dwWritten; - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - vsprintf(szOut, szFormat, arg_ptr); - va_end(arg_ptr); + + vsprintf(szOut, szFormat, args); WriteConsole( StdOutput, @@ -126,6 +124,18 @@ (ULONG)strlen(szOut), &dwWritten, NULL); +} + +VOID +CONSOLE_ConOutPrintf( + IN LPCSTR szFormat, + ...) +{ + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + CONSOLE_ConOutPrintfV(szFormat, arg_ptr); + va_end(arg_ptr); } BOOL @@ -385,17 +395,16 @@ } VOID -CONSOLE_SetStatusText( - IN LPCSTR fmt, ...) -{ +CONSOLE_SetStatusTextXV( + IN SHORT x, + IN LPCSTR fmt, + IN va_list args) +{ + COORD coPos; + DWORD Written; CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); + + vsprintf(Buffer, fmt, args); coPos.X = 0; coPos.Y = yScreen - 1; @@ -414,6 +423,8 @@ coPos, &Written); + coPos.X = x; + WriteConsoleOutputCharacterA( StdOutput, Buffer, @@ -425,42 +436,34 @@ VOID CONSOLE_SetStatusTextX( IN SHORT x, - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; + IN LPCSTR fmt, + ...) +{ va_list ap; - COORD coPos; - DWORD Written; va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); + CONSOLE_SetStatusTextXV(x, fmt, ap); va_end(ap); - - coPos.X = 0; - coPos.Y = yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - coPos.X = x; - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); +} + +VOID +CONSOLE_SetStatusTextV( + IN LPCSTR fmt, + IN va_list args) +{ + CONSOLE_SetStatusTextXV(0, fmt, args); +} + +VOID +CONSOLE_SetStatusText( + IN LPCSTR fmt, + ...) +{ + va_list ap; + + va_start(ap, fmt); + CONSOLE_SetStatusTextV(fmt, ap); + va_end(ap); } static Modified: branches/setup_improvements/base/setup/usetup/consup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/consup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/consup.h [iso-8859-1] Sun Sep 3 16:03:21 2017 @@ -55,26 +55,32 @@ BOOLEAN CONSOLE_Init( - VOID); + VOID); VOID CONSOLE_ClearScreen(VOID); VOID CONSOLE_ConInKey( - OUT PINPUT_RECORD Buffer); + OUT PINPUT_RECORD Buffer); VOID CONSOLE_ConOutChar( - IN CHAR c); + IN CHAR c); + +VOID +CONSOLE_ConOutPrintfV( + IN LPCSTR szFormat, + IN va_list args); VOID CONSOLE_ConOutPrintf( - IN LPCSTR szFormat, ...); + IN LPCSTR szFormat, + ...); VOID CONSOLE_ConOutPuts( - IN LPCSTR szText); + IN LPCSTR szText); BOOL CONSOLE_Flush(VOID); @@ -92,97 +98,110 @@ VOID CONSOLE_InvertTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT col, - IN SHORT row); + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row); VOID CONSOLE_NormalTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT col, - IN SHORT row); + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row); VOID CONSOLE_PrintTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR fmt, ...); + IN SHORT x, + IN SHORT y, + IN LPCSTR fmt, ...); VOID CONSOLE_PrintTextXYN( - IN SHORT x, - IN SHORT y, - IN SHORT len, - IN LPCSTR fmt, ...); + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCSTR fmt, ...); VOID CONSOLE_SetCursorType( - IN BOOL bInsert, - IN BOOL bVisible); + IN BOOL bInsert, + IN BOOL bVisible); VOID CONSOLE_SetCursorXY( - IN SHORT x, - IN SHORT y); + IN SHORT x, + IN SHORT y); VOID CONSOLE_SetCursorXY( - IN SHORT x, - IN SHORT y); + IN SHORT x, + IN SHORT y); VOID CONSOLE_SetHighlightedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); VOID CONSOLE_SetInputTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT len, - IN LPCWSTR Text); + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCWSTR Text); VOID CONSOLE_SetInvertedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); + +VOID +CONSOLE_SetStatusTextV( + IN LPCSTR fmt, + IN va_list args); VOID CONSOLE_SetStatusText( - IN LPCSTR fmt, ...); + IN LPCSTR fmt, + ...); + +VOID +CONSOLE_SetStatusTextXV( + IN SHORT x, + IN LPCSTR fmt, + IN va_list args); VOID CONSOLE_SetStatusTextX( IN SHORT x, - IN LPCSTR fmt, ...); + IN LPCSTR fmt, + ...); VOID CONSOLE_SetStatusTextAutoFitX( IN SHORT x, - IN LPCSTR fmt, ...); + IN LPCSTR fmt, ...); VOID CONSOLE_SetTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); VOID CONSOLE_SetUnderlinedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text); VOID CONSOLE_SetStyledText( - IN SHORT x, - IN SHORT y, - IN INT Flags, - IN LPCSTR Text); + IN SHORT x, + IN SHORT y, + IN INT Flags, + IN LPCSTR Text); VOID CONSOLE_ClearStyledText(IN SHORT x,

1 0

[hbelusca] 75748: [USETUP]: Fix a typo.
by hbelusca＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: hbelusca Date: Sun Sep 3 12:08:39 2017 New Revision: 75748 URL: http://svn.reactos.org/svn/reactos?rev=75748&view=rev Log: [USETUP]: Fix a typo. Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h branches/setup_improvements/base/setup/usetup/lang/bn-BD.h branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h branches/setup_improvements/base/setup/usetup/lang/da-DK.h branches/setup_improvements/base/setup/usetup/lang/de-DE.h branches/setup_improvements/base/setup/usetup/lang/el-GR.h branches/setup_improvements/base/setup/usetup/lang/en-US.h branches/setup_improvements/base/setup/usetup/lang/es-ES.h branches/setup_improvements/base/setup/usetup/lang/et-EE.h branches/setup_improvements/base/setup/usetup/lang/fr-FR.h branches/setup_improvements/base/setup/usetup/lang/he-IL.h branches/setup_improvements/base/setup/usetup/lang/it-IT.h branches/setup_improvements/base/setup/usetup/lang/ja-JP.h branches/setup_improvements/base/setup/usetup/lang/lt-LT.h branches/setup_improvements/base/setup/usetup/lang/ms-MY.h branches/setup_improvements/base/setup/usetup/lang/nl-NL.h branches/setup_improvements/base/setup/usetup/lang/pl-PL.h branches/setup_improvements/base/setup/usetup/lang/pt-BR.h branches/setup_improvements/base/setup/usetup/lang/ro-RO.h branches/setup_improvements/base/setup/usetup/lang/ru-RU.h branches/setup_improvements/base/setup/usetup/lang/sk-SK.h branches/setup_improvements/base/setup/usetup/lang/sq-AL.h branches/setup_improvements/base/setup/usetup/lang/sv-SE.h branches/setup_improvements/base/setup/usetup/lang/tr-TR.h branches/setup_improvements/base/setup/usetup/lang/uk-UA.h branches/setup_improvements/base/setup/usetup/mui.h branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1771,7 +1771,7 @@ " áê¢à¥¬¥ï¢ ¥ à¥£¨áâêà¨â¥ à®¥¢¥..."}, {STRING_IMPORTFILE, " áï¥ %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " áê¢à¥¬¥ï¢ ¥ à¥£¨áâà®¢¨â¥ áâà®©ª¨ ¥ªà ..."}, {STRING_LOCALESETTINGSUPDATE, " áê¢à¥¬¥ï¢ ¥ ¬¥áâ¨â¥ áâà®©ª¨..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1759,7 +1759,7 @@ " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1765,7 +1765,7 @@ " Aktualizuji registr..."}, {STRING_IMPORTFILE, " Importuji %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aktualizuji nastaven¡ zobrazen¡ registru..."}, //display registry settings {STRING_LOCALESETTINGSUPDATE, " Aktualizuji m¡stn¡ nastaven¡..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/da-DK.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1773,7 +1773,7 @@ " Opdatere registreringsdatabasen..."}, {STRING_IMPORTFILE, " Importere %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Opdatere indstillinger for registrering af skrm..."}, {STRING_LOCALESETTINGSUPDATE, " Opdatere indstillinger for sprog..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1756,7 +1756,7 @@ " Registrierungseintrge werden aktualisiert..."}, {STRING_IMPORTFILE, " Importiere %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Anzeigeeinstellungen werden aktualisiert..."}, {STRING_LOCALESETTINGSUPDATE, " Lokalisierungseinstellungen werden aktualisiert..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1777,7 +1777,7 @@ " å¤« ¤¤âà© «à¤ registry hives..."}, {STRING_IMPORTFILE, " å¤« ©àã «¦¬ %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " å¤« ¤¤âà© «à¤ ¨¬£å©à¤ £á¤ ©ª «¦¬ £«¨é¦¬..."}, {STRING_LOCALESETTINGSUPDATE, " å¤« ¤¤âà© «à¤ ¨¬£å©à¤ ¢é©©ª..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1759,7 +1759,7 @@ " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1768,7 +1768,7 @@ " Actualizando el rbol del registro..."}, {STRING_IMPORTFILE, " Importando %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Actualizando configuraci¢n del tipo de pantalla..."}, {STRING_LOCALESETTINGSUPDATE, " Actualizando configuraci¢n regional..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1759,7 +1759,7 @@ " Registritarude uuendamine..."}, {STRING_IMPORTFILE, " %S importimine..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Monitori seadistuse uuendamine registris..."}, {STRING_LOCALESETTINGSUPDATE, " Lokaadi seadistuse uuendamine..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1777,7 +1777,7 @@ " Mise jour de la base de registre..."}, {STRING_IMPORTFILE, " Importe %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Mise jour des paramtres du registre pour l'cran..."}, {STRING_LOCALESETTINGSUPDATE, " Mise jour des paramtres rgionaux..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1760,7 +1760,7 @@ " Updating registry hives..."}, {STRING_IMPORTFILE, " %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1765,7 +1765,7 @@ " Aggiornamento degli hives del registro..."}, {STRING_IMPORTFILE, " Importazione di %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aggiornamento delle impostazioni dello schermo nel registro..."}, {STRING_LOCALESETTINGSUPDATE, " Aggiornamento delle impostazioni di regionalizzazione..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1762,7 +1762,7 @@ " Ú¼Þ½ÄØ Ê²ÌÞÉ º³¼Ý Á³..."}, {STRING_IMPORTFILE, " %S ¦ ²ÝÎß°Ä Á³..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " ÃÞ¨½ÌßÚ² Ú¼Þ½ÄØ ¾¯Ã²¦ º³¼Ý Á³..."}, {STRING_LOCALESETTINGSUPDATE, " Á²· ¾¯Ã²É º³¼Ý Á³..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1768,7 +1768,7 @@ " Updating registry hives..."}, {STRING_IMPORTFILE, " Importing %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Updating display registry settings..."}, {STRING_LOCALESETTINGSUPDATE, " Updating locale settings..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1648,7 +1648,7 @@ " Mengemaskini daftaran gatal..."}, {STRING_IMPORTFILE, " Mengimport %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Mengemaskini seting paparan pendaftaran..."}, {STRING_LOCALESETTINGSUPDATE, " Mengemaskini seting tempatan..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1793,7 +1793,7 @@ " Bijwerken registerbestanden..."}, {STRING_IMPORTFILE, " Importeren %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Bijwerken beeldscherminstellingen..."}, {STRING_LOCALESETTINGSUPDATE, " Bijwerken systeemtaalinstellingen..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1768,7 +1768,7 @@ " Uaktualnianie..."}, {STRING_IMPORTFILE, " Importowanie %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Zmiana ustawieä ekranu w rejestrze..."}, {STRING_LOCALESETTINGSUPDATE, " Zmiana wersji j©zykowej..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1798,7 +1798,7 @@ " Atualizando a estrutura do registro..."}, {STRING_IMPORTFILE, " Importando %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Atualizando as configuraäes de v¡deo..."}, {STRING_LOCALESETTINGSUPDATE, " Atualizando as configuraäes regionais..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1830,7 +1830,7 @@ " Registru în curs de actualizare..."}, {STRING_IMPORTFILE, " În curs de importare din %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Registru de configuraþie graficã în actualizare..."}, {STRING_LOCALESETTINGSUPDATE, " Particularitãþi locale în actualizare..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1759,7 +1759,7 @@ " ¡®¢«¥¨¥ ªãáâ®¢ à¥¥áâà ..."}, {STRING_IMPORTFILE, " ¬¯®àâ¨à®¢ ¨¥ %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ íªà ¢ à¥¥áâà¥..."}, {STRING_LOCALESETTINGSUPDATE, " ¡®¢«¥¨¥ ¯ à ¬¥âà®¢ ï§ëª ..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1771,7 +1771,7 @@ " Aktualizujem polo§ky registrov..."}, {STRING_IMPORTFILE, " Importujem %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Aktualizujem nastavenia obrazovky v registrov..."}, //display registry settings {STRING_LOCALESETTINGSUPDATE, " Aktualizujem miestne nastavenia..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1766,7 +1766,7 @@ " Apdejtimi i kosheres s regjistrit..."}, {STRING_IMPORTFILE, " Importimi %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Apdejtimi i regjistrit pr ekranin..."}, {STRING_LOCALESETTINGSUPDATE, " Apdejtimi i konfigurimit vendas..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1768,7 +1768,7 @@ " Uppdaterar registerdatafiler..."}, {STRING_IMPORTFILE, " Importerar %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Uppdaterar skrmregisterinstllningar..."}, {STRING_LOCALESETTINGSUPDATE, " Uppdaterar lokala instllningar..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1738,7 +1738,7 @@ " De§er y§nlar imdikiletiriliyor..."}, {STRING_IMPORTFILE, " Alnyor: %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " Grnt ayarlar de§erleri imdikiletiriliyor..."}, {STRING_LOCALESETTINGSUPDATE, " Yerli ayarlar imdikiletiriliyor..."}, Modified: branches/setup_improvements/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -1768,7 +1768,7 @@ " ®¢«¥ï ªãéi¢ à¥óáâàã..."}, {STRING_IMPORTFILE, " I¬¯®àâã¢ ï %S..."}, - {STRING_DISPLAYETTINGSUPDATE, + {STRING_DISPLAYSETTINGSUPDATE, " ®¢«¥ï ¯ à ¬¥âài¢ ¥ªà ã ¢ à¥óáâài..."}, {STRING_LOCALESETTINGSUPDATE, " ®¢«¥ï ¯ à ¬¥âài¢ «®ª «i..."}, Modified: branches/setup_improvements/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -88,7 +88,7 @@ #define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 -#define STRING_DISPLAYETTINGSUPDATE 22 +#define STRING_DISPLAYSETTINGSUPDATE 22 #define STRING_LOCALESETTINGSUPDATE 23 #define STRING_KEYBOARDSETTINGSUPDATE 24 #define STRING_CODEPAGEINFOUPDATE 25 Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Sun Sep 3 12:08:39 2017 @@ -4019,7 +4019,7 @@ /* See the explanation for this test above */ /* Update display registry settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYETTINGSUPDATE)); + CONSOLE_SetStatusText(MUIGetString(STRING_DISPLAYSETTINGSUPDATE)); if (!ProcessDisplayRegistry(SetupInf, DisplayList)) { MUIDisplayError(ERROR_UPDATE_DISPLAY_SETTINGS, Ir, POPUP_WAIT_ENTER);

1 0

[tfaber] 75747: [NTFS] - Merge to trunk r75746
by tfaber＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: tfaber Date: Sun Sep 3 08:47:37 2017 New Revision: 75747 URL: http://svn.reactos.org/svn/reactos?rev=75747&view=rev Log: [NTFS] - Merge to trunk r75746 Added: branches/GSoC_2016/NTFS/drivers/usb/usbport/iso.c - copied unchanged from r75746, trunk/reactos/drivers/usb/usbport/iso.c Modified: branches/GSoC_2016/NTFS/ (props changed) branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h Propchange: branches/GSoC_2016/NTFS/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 3 08:47:37 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71196-75743 +/trunk/reactos:71196-75746 Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbp… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] Sun Sep 3 08:47:37 2017 @@ -7,6 +7,7 @@ endpoint.c iface.c ioctl.c + iso.c pnp.c power.c queue.c Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbp… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/usb/usbport/queue.c [iso-8859-1] Sun Sep 3 08:47:37 2017 @@ -531,7 +531,7 @@ PIRP irp; KIRQL OldIrql; - DPRINT_CORE("USBPORT_CancelTransferIrp: Irp - %p\n", Irp); + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp); PdoExtension = DeviceObject->DeviceExtension; FdoDevice = PdoExtension->FdoDevice; @@ -549,7 +549,7 @@ Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; Endpoint = Transfer->Endpoint; - DPRINT_CORE("USBPORT_CancelTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", irp, Urb, Transfer); Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbp… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.c [iso-8859-1] Sun Sep 3 08:47:37 2017 @@ -588,7 +588,7 @@ PDEVICE_OBJECT FdoDevice; PUSBPORT_DEVICE_EXTENSION FdoExtension; - DPRINT("USBPORT_SoftInterruptDpc: ... \n"); + DPRINT_INT("USBPORT_SoftInterruptDpc: ... \n"); FdoDevice = DeferredContext; FdoExtension = FdoDevice->DeviceExtension; @@ -606,7 +606,7 @@ PUSBPORT_DEVICE_EXTENSION FdoExtension; LARGE_INTEGER DueTime = {{0, 0}}; - DPRINT("USBPORT_SoftInterrupt: ... \n"); + DPRINT_INT("USBPORT_SoftInterrupt: ... \n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1079,7 +1079,8 @@ FdoExtension = FdoDevice->DeviceExtension; Packet = &FdoExtension->MiniPortInterface->Packet; - DPRINT_INT("USBPORT_InterruptService: FdoExtension->Flags - %lx\n", + DPRINT_INT("USBPORT_InterruptService: FdoExtension[%p]->Flags - %08X\n", + FdoExtension, FdoExtension->Flags); if (FdoExtension->Flags & USBPORT_FLAG_INTERRUPT_ENABLED && @@ -1936,7 +1937,7 @@ //MiniPortInterface->DriverUnload(DriverObject); // Call MiniPort _HCI_Unload } -ULONG +VOID NTAPI USBPORT_MiniportCompleteTransfer(IN PVOID MiniPortExtension, IN PVOID MiniPortEndpoint, @@ -1969,18 +1970,7 @@ &Transfer->TransferLink, &FdoExtension->DoneTransferSpinLock); - return KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); -} - -ULONG -NTAPI -USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension, - IN PVOID MiniPortEndpoint, - IN PVOID TransferParameters, - IN ULONG TransferLength) -{ - DPRINT1("USBPORT_CompleteIsoTransfer: UNIMPLEMENTED. FIXME.\n"); - return 0; + KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); } VOID @@ -2309,7 +2299,7 @@ do { - ElementLength = 0x1000 - (PhAddress.LowPart & 0xFFF); + ElementLength = PAGE_SIZE - (PhAddress.LowPart & (PAGE_SIZE - 1)); if (ElementLength > SgCurrentLength) ElementLength = SgCurrentLength; @@ -2331,9 +2321,9 @@ } while (SgCurrentLength); - if ((PhAddr.LowPart == PhAddress.LowPart) && - (PhAddr.HighPart == PhAddress.HighPart)) - { + if (PhAddr.QuadPart == PhAddress.QuadPart) + { + DPRINT1("USBPORT_MapTransfer: PhAddr == PhAddress\n"); ASSERT(FALSE); } Modified: branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/usb/usbp… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/usb/usbport/usbport.h [iso-8859-1] Sun Sep 3 08:47:37 2017 @@ -862,6 +862,22 @@ IN PDEVICE_OBJECT RootHubPdo, IN PUNICODE_STRING DestinationString); +/* iso.c */ +USBD_STATUS +NTAPI +USBPORT_InitializeIsoTransfer( + IN PDEVICE_OBJECT FdoDevice, + IN struct _URB_ISOCH_TRANSFER * Urb, + IN PUSBPORT_TRANSFER Transfer); + +ULONG +NTAPI +USBPORT_CompleteIsoTransfer( + IN PVOID MiniPortExtension, + IN PVOID MiniPortEndpoint, + IN PVOID TransferParameters, + IN ULONG TransferLength); + /* pnp.c */ NTSTATUS NTAPI Modified: branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/sdk/include/reac… ============================================================================== --- branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Sun Sep 3 08:47:37 2017 @@ -43,7 +43,7 @@ typedef struct _USBPORT_RESOURCES { ULONG ResourcesTypes; - ULONG HcFlavor; + USB_CONTROLLER_FLAVOR HcFlavor; ULONG InterruptVector; KIRQL InterruptLevel; UCHAR Padded1[3]; @@ -364,7 +364,7 @@ PVOID, PVOID); -typedef ULONG +typedef VOID (NTAPI *PUSBPORT_COMPLETE_TRANSFER)( PVOID, PVOID, @@ -581,6 +581,8 @@ C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 32 + 76 * sizeof(PVOID)); #define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device +#define USBPORT_MAX_DEVICE_ADDRESS 127 + typedef struct _USBPORT_ENDPOINT_PROPERTIES { USHORT DeviceAddress; USHORT EndpointAddress;

1 0

[tfaber] 75746: [NTFS] - Try to make SVN less confused about merging
by tfaber＠svn.reactos.org 03 Sep '17

03 Sep '17

Author: tfaber Date: Sun Sep 3 08:46:01 2017 New Revision: 75746 URL: http://svn.reactos.org/svn/reactos?rev=75746&view=rev Log: [NTFS] - Try to make SVN less confused about merging Modified: branches/GSoC_2016/NTFS/media/rapps/utorrent.txt (props changed) Propchange: branches/GSoC_2016/NTFS/media/rapps/utorrent.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 3 08:46:01 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup/media/rapps/utorrent.txt:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk/media/rapps/utorrent.txt:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup/media/rapps/utorrent.txt:54809-54998 -/trunk/reactos/media/rapps/utorrent.txt:71196-75520,75691-75743 +/trunk/reactos/media/rapps/utorrent.txt:71196-75745

1 0

[tfaber] 75745: [USBPORT] Patch by Vadim Galyant: - Move isochronous transfer functions to their own file - Fix return type of PUSBPORT_COMPLETE_TRANSFER - Improve some debug prints
by tfaber＠svn.reactos.org 02 Sep '17

02 Sep '17

Author: tfaber Date: Sat Sep 2 22:48:45 2017 New Revision: 75745 URL: http://svn.reactos.org/svn/reactos?rev=75745&view=rev Log: [USBPORT] Patch by Vadim Galyant: - Move isochronous transfer functions to their own file - Fix return type of PUSBPORT_COMPLETE_TRANSFER - Improve some debug prints Added: trunk/reactos/drivers/usb/usbport/iso.c - copied, changed from r75735, trunk/reactos/drivers/usb/usbport/usbport.c Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt trunk/reactos/drivers/usb/usbport/queue.c trunk/reactos/drivers/usb/usbport/usbport.c trunk/reactos/drivers/usb/usbport/usbport.h trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -7,6 +7,7 @@ endpoint.c iface.c ioctl.c + iso.c pnp.c power.c queue.c Copied: trunk/reactos/drivers/usb/usbport/iso.c (from r75735, trunk/reactos/drivers/usb/usbport/usbport.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iso.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/iso.c [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -3,1973 +3,14 @@ #define NDEBUG #include <debug.h> -#define NDEBUG_USBPORT_CORE -#define NDEBUG_USBPORT_INTERRUPT -#define NDEBUG_USBPORT_TIMER -#include "usbdebug.h" - -LIST_ENTRY USBPORT_MiniPortDrivers = {NULL, NULL}; -LIST_ENTRY USBPORT_USB1FdoList = {NULL, NULL}; -LIST_ENTRY USBPORT_USB2FdoList = {NULL, NULL}; - -KSPIN_LOCK USBPORT_SpinLock; -BOOLEAN USBPORT_Initialized = FALSE; - -PDEVICE_OBJECT +USBD_STATUS NTAPI -USBPORT_FindUSB2Controller(IN PDEVICE_OBJECT FdoDevice) +USBPORT_InitializeIsoTransfer(PDEVICE_OBJECT FdoDevice, + struct _URB_ISOCH_TRANSFER * Urb, + PUSBPORT_TRANSFER Transfer) { - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_DEVICE_EXTENSION USB2FdoExtension; - KIRQL OldIrql; - PLIST_ENTRY USB2FdoEntry; - PDEVICE_OBJECT USB2FdoDevice = NULL; - - DPRINT("USBPORT_FindUSB2Controller: FdoDevice - %p\n", FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - - KeAcquireSpinLock(&USBPORT_SpinLock, &OldIrql); - - USB2FdoEntry = USBPORT_USB2FdoList.Flink; - - while (USB2FdoEntry && USB2FdoEntry != &USBPORT_USB2FdoList) - { - USB2FdoExtension = CONTAINING_RECORD(USB2FdoEntry, - USBPORT_DEVICE_EXTENSION, - ControllerLink); - - if (USB2FdoExtension->BusNumber == FdoExtension->BusNumber && - USB2FdoExtension->PciDeviceNumber == FdoExtension->PciDeviceNumber) - { - USB2FdoDevice = USB2FdoExtension->CommonExtension.SelfDevice; - break; - } - - USB2FdoEntry = USB2FdoEntry->Flink; - } - - KeReleaseSpinLock(&USBPORT_SpinLock, OldIrql); - - return USB2FdoDevice; -} - -VOID -NTAPI -USBPORT_AddUSB1Fdo(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT("USBPORT_AddUSB1Fdo: FdoDevice - %p\n", FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - FdoExtension->Flags |= USBPORT_FLAG_REGISTERED_FDO; - - ExInterlockedInsertTailList(&USBPORT_USB1FdoList, - &FdoExtension->ControllerLink, - &USBPORT_SpinLock); -} - -VOID -NTAPI -USBPORT_AddUSB2Fdo(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT("USBPORT_AddUSB2Fdo: FdoDevice - %p\n", FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - FdoExtension->Flags |= USBPORT_FLAG_REGISTERED_FDO; - - ExInterlockedInsertTailList(&USBPORT_USB2FdoList, - &FdoExtension->ControllerLink, - &USBPORT_SpinLock); -} - -VOID -NTAPI -USBPORT_RemoveUSBxFdo(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - KIRQL OldIrql; - - DPRINT("USBPORT_RemoveUSBxFdo: FdoDevice - %p\n", FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - - KeAcquireSpinLock(&USBPORT_SpinLock, &OldIrql); - RemoveEntryList(&FdoExtension->ControllerLink); - KeReleaseSpinLock(&USBPORT_SpinLock, OldIrql); - - FdoExtension->Flags &= ~USBPORT_FLAG_REGISTERED_FDO; - - FdoExtension->ControllerLink.Flink = NULL; - FdoExtension->ControllerLink.Blink = NULL; -} - -BOOLEAN -NTAPI -USBPORT_IsCompanionFdoExtension(IN PDEVICE_OBJECT USB2FdoDevice, - IN PUSBPORT_DEVICE_EXTENSION USB1FdoExtension) -{ - PUSBPORT_DEVICE_EXTENSION USB2FdoExtension; - - DPRINT("USBPORT_IsCompanionFdoExtension: USB2Fdo - %p, USB1FdoExtension - %p\n", - USB2FdoDevice, - USB1FdoExtension); - - USB2FdoExtension = USB2FdoDevice->DeviceExtension; - - return USB2FdoExtension->BusNumber == USB1FdoExtension->BusNumber && - USB2FdoExtension->PciDeviceNumber == USB1FdoExtension->PciDeviceNumber; -} - -PDEVICE_RELATIONS -NTAPI -USBPORT_FindCompanionControllers(IN PDEVICE_OBJECT USB2FdoDevice, - IN BOOLEAN IsObRefer, - IN BOOLEAN IsFDOsReturned) -{ - PLIST_ENTRY USB1FdoList; - PUSBPORT_DEVICE_EXTENSION USB1FdoExtension; - ULONG NumControllers = 0; - PDEVICE_OBJECT * Entry; - PDEVICE_RELATIONS ControllersList = NULL; - KIRQL OldIrql; - - DPRINT("USBPORT_FindCompanionControllers: USB2Fdo - %p, IsObRefer - %x, IsFDOs - %x\n", - USB2FdoDevice, - IsObRefer, - IsFDOsReturned); - - KeAcquireSpinLock(&USBPORT_SpinLock, &OldIrql); - - USB1FdoList = USBPORT_USB1FdoList.Flink; - - while (USB1FdoList && USB1FdoList != &USBPORT_USB1FdoList) - { - USB1FdoExtension = CONTAINING_RECORD(USB1FdoList, - USBPORT_DEVICE_EXTENSION, - ControllerLink); - - if (USB1FdoExtension->Flags & USBPORT_FLAG_COMPANION_HC && - USBPORT_IsCompanionFdoExtension(USB2FdoDevice, USB1FdoExtension)) - { - ++NumControllers; - } - - USB1FdoList = USB1FdoExtension->ControllerLink.Flink; - } - - DPRINT("USBPORT_FindCompanionControllers: NumControllers - %x\n", - NumControllers); - - if (!NumControllers) - { - goto Exit; - } - - ControllersList = ExAllocatePoolWithTag(NonPagedPool, - NumControllers * sizeof(DEVICE_RELATIONS), - USB_PORT_TAG); - - if (!ControllersList) - { - goto Exit; - } - - RtlZeroMemory(ControllersList, NumControllers * sizeof(DEVICE_RELATIONS)); - - ControllersList->Count = NumControllers; - - USB1FdoList = USBPORT_USB1FdoList.Flink; - - Entry = &ControllersList->Objects[0]; - - while (USB1FdoList && USB1FdoList != &USBPORT_USB1FdoList) - { - USB1FdoExtension = CONTAINING_RECORD(USB1FdoList, - USBPORT_DEVICE_EXTENSION, - ControllerLink); - - if (USB1FdoExtension->Flags & USBPORT_FLAG_COMPANION_HC && - USBPORT_IsCompanionFdoExtension(USB2FdoDevice, USB1FdoExtension)) - { - *Entry = USB1FdoExtension->CommonExtension.LowerPdoDevice; - - if (IsObRefer) - { - ObReferenceObject(USB1FdoExtension->CommonExtension.LowerPdoDevice); - } - - if (IsFDOsReturned) - { - *Entry = USB1FdoExtension->CommonExtension.SelfDevice; - } - - ++Entry; - } - - USB1FdoList = USB1FdoExtension->ControllerLink.Flink; - } - -Exit: - - KeReleaseSpinLock(&USBPORT_SpinLock, OldIrql); - - return ControllersList; -} - -MPSTATUS -NTAPI -USBPORT_NtStatusToMpStatus(NTSTATUS NtStatus) -{ - DPRINT("USBPORT_NtStatusToMpStatus: NtStatus - %x\n", NtStatus); - - if (NtStatus == STATUS_SUCCESS) - { - return MP_STATUS_SUCCESS; - } - else - { - return MP_STATUS_UNSUCCESSFUL; - } -} - -NTSTATUS -NTAPI -USBPORT_SetRegistryKeyValue(IN PDEVICE_OBJECT DeviceObject, - IN BOOL UseDriverKey, - IN ULONG Type, - IN PCWSTR ValueNameString, - IN PVOID Data, - IN ULONG DataSize) -{ - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - - DPRINT("USBPORT_SetRegistryKeyValue: ValueNameString - %S \n", - ValueNameString); - - if (UseDriverKey) - { - Status = IoOpenDeviceRegistryKey(DeviceObject, - PLUGPLAY_REGKEY_DRIVER, - STANDARD_RIGHTS_ALL, - &KeyHandle); - } - else - { - Status = IoOpenDeviceRegistryKey(DeviceObject, - PLUGPLAY_REGKEY_DEVICE, - STANDARD_RIGHTS_ALL, - &KeyHandle); - } - - if (NT_SUCCESS(Status)) - { - RtlInitUnicodeString(&ValueName, ValueNameString); - - Status = ZwSetValueKey(KeyHandle, - &ValueName, - 0, - Type, - Data, - DataSize); - - ZwClose(KeyHandle); - } - - return Status; -} - -NTSTATUS -NTAPI -USBPORT_GetRegistryKeyValueFullInfo(IN PDEVICE_OBJECT FdoDevice, - IN PDEVICE_OBJECT PdoDevice, - IN BOOL UseDriverKey, - IN PCWSTR SourceString, - IN ULONG LengthStr, - IN PVOID Buffer, - IN ULONG BufferLength) -{ - NTSTATUS Status; - PKEY_VALUE_FULL_INFORMATION KeyValue; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG LengthKey; - - DPRINT("USBPORT_GetRegistryKeyValue: UseDriverKey - %x, SourceString - %S, LengthStr - %x, Buffer - %p, BufferLength - %x\n", - UseDriverKey, - SourceString, - LengthStr, - Buffer, - BufferLength); - - if (UseDriverKey) - { - Status = IoOpenDeviceRegistryKey(PdoDevice, - PLUGPLAY_REGKEY_DRIVER, - STANDARD_RIGHTS_ALL, - &KeyHandle); - } - else - { - Status = IoOpenDeviceRegistryKey(PdoDevice, - PLUGPLAY_REGKEY_DEVICE, - STANDARD_RIGHTS_ALL, - &KeyHandle); - } - - if (NT_SUCCESS(Status)) - { - RtlInitUnicodeString(&ValueName, SourceString); - - LengthKey = sizeof(KEY_VALUE_FULL_INFORMATION) + - LengthStr + - BufferLength; - - KeyValue = ExAllocatePoolWithTag(PagedPool, - LengthKey, - USB_PORT_TAG); - - if (KeyValue) - { - RtlZeroMemory(KeyValue, LengthKey); - - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValueFullInformation, - KeyValue, - LengthKey, - &LengthKey); - - if (NT_SUCCESS(Status)) - { - RtlCopyMemory(Buffer, - (PUCHAR)KeyValue + KeyValue->DataOffset, - BufferLength); - } - - ExFreePoolWithTag(KeyValue, USB_PORT_TAG); - } - - ZwClose(KeyHandle); - } - - return Status; -} - -MPSTATUS -NTAPI -USBPORT_GetMiniportRegistryKeyValue(IN PVOID MiniPortExtension, - IN BOOL UseDriverKey, - IN PCWSTR SourceString, - IN SIZE_T LengthStr, - IN PVOID Buffer, - IN SIZE_T BufferLength) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT FdoDevice; - NTSTATUS Status; - - DPRINT("USBPORT_GetMiniportRegistryKeyValue: MiniPortExtension - %p, UseDriverKey - %x, SourceString - %S, LengthStr - %x, Buffer - %p, BufferLength - %x\n", - MiniPortExtension, - UseDriverKey, - SourceString, - LengthStr, - Buffer, - BufferLength); - - FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - - sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoDevice = FdoExtension->CommonExtension.SelfDevice; - - Status = USBPORT_GetRegistryKeyValueFullInfo(FdoDevice, - FdoExtension->CommonExtension.LowerPdoDevice, - UseDriverKey, - SourceString, - LengthStr, - Buffer, - BufferLength); - - return USBPORT_NtStatusToMpStatus(Status); -} - -NTSTATUS -NTAPI -USBPORT_GetSetConfigSpaceData(IN PDEVICE_OBJECT FdoDevice, - IN BOOLEAN IsReadData, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - ULONG BytesReadWrite; - - DPRINT("USBPORT_GetSetConfigSpaceData ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - BytesReadWrite = Length; - - if (IsReadData) - { - RtlZeroMemory(Buffer, Length); - - BytesReadWrite = (*FdoExtension->BusInterface.GetBusData) - (FdoExtension->BusInterface.Context, - PCI_WHICHSPACE_CONFIG, - Buffer, - Offset, - Length); - } - else - { - BytesReadWrite = (*FdoExtension->BusInterface.SetBusData) - (FdoExtension->BusInterface.Context, - PCI_WHICHSPACE_CONFIG, - Buffer, - Offset, - Length); - } - - if (BytesReadWrite == Length) - { - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} - -MPSTATUS -NTAPI -USBPORT_ReadWriteConfigSpace(IN PVOID MiniPortExtension, - IN BOOLEAN IsReadData, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - NTSTATUS Status; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT FdoDevice; - - DPRINT("USBPORT_ReadWriteConfigSpace: ... \n"); - - //FdoExtension->MiniPortExt = (PVOID)((ULONG_PTR)FdoExtension + sizeof(USBPORT_DEVICE_EXTENSION)); - FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - - sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoDevice = FdoExtension->CommonExtension.SelfDevice; - - Status = USBPORT_GetSetConfigSpaceData(FdoDevice, - IsReadData, - Buffer, - Offset, - Length); - - return USBPORT_NtStatusToMpStatus(Status); -} - -NTSTATUS -NTAPI -USBPORT_USBDStatusToNtStatus(IN PURB Urb, - IN USBD_STATUS USBDStatus) -{ - NTSTATUS Status; - - if (USBD_ERROR(USBDStatus)) - { - DPRINT1("USBPORT_USBDStatusToNtStatus: Urb - %p, USBDStatus - %x\n", - Urb, - USBDStatus); - } - - if (Urb) - Urb->UrbHeader.Status = USBDStatus; - - switch (USBDStatus) - { - case USBD_STATUS_SUCCESS: - Status = STATUS_SUCCESS; - break; - - case USBD_STATUS_INSUFFICIENT_RESOURCES: - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - - case USBD_STATUS_DEVICE_GONE: - Status = STATUS_DEVICE_NOT_CONNECTED; - break; - - case USBD_STATUS_CANCELED: - Status = STATUS_CANCELLED; - break; - - case USBD_STATUS_NOT_SUPPORTED: - Status = STATUS_NOT_SUPPORTED; - break; - - case USBD_STATUS_INVALID_URB_FUNCTION: - case USBD_STATUS_INVALID_PARAMETER: - case USBD_STATUS_INVALID_PIPE_HANDLE: - case USBD_STATUS_BAD_START_FRAME: - Status = STATUS_INVALID_PARAMETER; - break; - - default: - if (USBD_ERROR(USBDStatus)) - Status = STATUS_UNSUCCESSFUL; - else - Status = STATUS_SUCCESS; - - break; - } - - return Status; -} - -NTSTATUS -NTAPI -USBPORT_Wait(IN PVOID MiniPortExtension, - IN ULONG Milliseconds) -{ - LARGE_INTEGER Interval = {{0, 0}}; - - DPRINT("USBPORT_Wait: Milliseconds - %x\n", Milliseconds); - Interval.QuadPart -= 10000 * Milliseconds + (KeQueryTimeIncrement() - 1); - return KeDelayExecutionThread(KernelMode, FALSE, &Interval); -} - -VOID -NTAPI -USBPORT_MiniportInterrupts(IN PDEVICE_OBJECT FdoDevice, - IN BOOLEAN IsEnable) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - BOOLEAN IsLock; - KIRQL OldIrql; - - DPRINT_INT("USBPORT_MiniportInterrupts: IsEnable - %p\n", IsEnable); - - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - IsLock = (Packet->MiniPortFlags & USB_MINIPORT_FLAGS_NOT_LOCK_INT) == 0; - - if (IsLock) - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &OldIrql); - - if (IsEnable) - { - FdoExtension->Flags |= USBPORT_FLAG_INTERRUPT_ENABLED; - Packet->EnableInterrupts(FdoExtension->MiniPortExt); - } - else - { - Packet->DisableInterrupts(FdoExtension->MiniPortExt); - FdoExtension->Flags &= ~USBPORT_FLAG_INTERRUPT_ENABLED; - } - - if (IsLock) - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, OldIrql); -} - -VOID -NTAPI -USBPORT_SoftInterruptDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT("USBPORT_SoftInterruptDpc: ... \n"); - - FdoDevice = DeferredContext; - FdoExtension = FdoDevice->DeviceExtension; - - if (!KeInsertQueueDpc(&FdoExtension->IsrDpc, NULL, (PVOID)1)) - { - InterlockedDecrement(&FdoExtension->IsrDpcCounter); - } -} - -VOID -NTAPI -USBPORT_SoftInterrupt(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - LARGE_INTEGER DueTime = {{0, 0}}; - - DPRINT("USBPORT_SoftInterrupt: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - KeInitializeTimer(&FdoExtension->TimerSoftInterrupt); - - KeInitializeDpc(&FdoExtension->SoftInterruptDpc, - USBPORT_SoftInterruptDpc, - FdoDevice); - - DueTime.QuadPart -= 10000 + (KeQueryTimeIncrement() - 1); - - KeSetTimer(&FdoExtension->TimerSoftInterrupt, - DueTime, - &FdoExtension->SoftInterruptDpc); -} - -VOID -NTAPI -USBPORT_InvalidateControllerHandler(IN PDEVICE_OBJECT FdoDevice, - IN ULONG Type) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT("USBPORT_InvalidateControllerHandler: Invalidate Type - %x\n", - Type); - - FdoExtension = FdoDevice->DeviceExtension; - - switch (Type) - { - case USBPORT_INVALIDATE_CONTROLLER_RESET: - DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_RESET UNIMPLEMENTED. FIXME. \n"); - break; - - case USBPORT_INVALIDATE_CONTROLLER_SURPRISE_REMOVE: - DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_SURPRISE_REMOVE UNIMPLEMENTED. FIXME. \n"); - break; - - case USBPORT_INVALIDATE_CONTROLLER_SOFT_INTERRUPT: - if (InterlockedIncrement(&FdoExtension->IsrDpcCounter)) - { - InterlockedDecrement(&FdoExtension->IsrDpcCounter); - } - else - { - USBPORT_SoftInterrupt(FdoDevice); - } - break; - } -} - -ULONG -NTAPI -USBPORT_InvalidateController(IN PVOID MiniPortExtension, - IN ULONG Type) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT FdoDevice; - - DPRINT("USBPORT_InvalidateController: Invalidate Type - %x\n", Type); - - //FdoExtension->MiniPortExt = (PVOID)((ULONG_PTR)FdoExtension + sizeof(USBPORT_DEVICE_EXTENSION)); - FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - - sizeof(USBPORT_DEVICE_EXTENSION)); - FdoDevice = FdoExtension->CommonExtension.SelfDevice; - - USBPORT_InvalidateControllerHandler(FdoDevice, Type); - - return 0; -} - -ULONG -NTAPI -USBPORT_NotifyDoubleBuffer(IN PVOID MiniPortExtension, - IN PVOID MiniPortTransfer, - IN PVOID Buffer, - IN SIZE_T Length) -{ - DPRINT1("USBPORT_NotifyDoubleBuffer: UNIMPLEMENTED. FIXME. \n"); - return 0; -} - -VOID -NTAPI -USBPORT_WorkerRequestDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT("USBPORT_WorkerRequestDpc: ... \n"); - - FdoDevice = DeferredContext; - FdoExtension = FdoDevice->DeviceExtension; - - if (!InterlockedIncrement(&FdoExtension->IsrDpcHandlerCounter)) - { - USBPORT_DpcHandler(FdoDevice); - } - - InterlockedDecrement(&FdoExtension->IsrDpcHandlerCounter); -} - -VOID -NTAPI -USBPORT_DoneTransfer(IN PUSBPORT_TRANSFER Transfer) -{ - PUSBPORT_ENDPOINT Endpoint; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PURB Urb; - PIRP Irp; - KIRQL CancelIrql; - KIRQL OldIrql; - - DPRINT_CORE("USBPORT_DoneTransfer: Transfer - %p\n", Transfer); - - Endpoint = Transfer->Endpoint; - FdoDevice = Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - - Urb = Transfer->Urb; - Irp = Transfer->Irp; - - KeAcquireSpinLock(&FdoExtension->FlushTransferSpinLock, &OldIrql); - - if (Irp) - { - IoAcquireCancelSpinLock(&CancelIrql); - IoSetCancelRoutine(Irp, NULL); - IoReleaseCancelSpinLock(CancelIrql); - - USBPORT_RemoveActiveTransferIrp(FdoDevice, Irp); - } - - KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql); - - USBPORT_USBDStatusToNtStatus(Transfer->Urb, Transfer->USBDStatus); - USBPORT_CompleteTransfer(Urb, Urb->UrbHeader.Status); - - DPRINT_CORE("USBPORT_DoneTransfer: exit\n"); -} - -VOID -NTAPI -USBPORT_FlushDoneTransfers(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PLIST_ENTRY DoneTransferList; - PUSBPORT_TRANSFER Transfer; - PUSBPORT_ENDPOINT Endpoint; - ULONG TransferCount; - KIRQL OldIrql; - BOOLEAN IsHasTransfers; - - DPRINT_CORE("USBPORT_FlushDoneTransfers: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - DoneTransferList = &FdoExtension->DoneTransferList; - - while (TRUE) - { - KeAcquireSpinLock(&FdoExtension->DoneTransferSpinLock, &OldIrql); - - if (IsListEmpty(DoneTransferList)) - break; - - Transfer = CONTAINING_RECORD(DoneTransferList->Flink, - USBPORT_TRANSFER, - TransferLink); - - RemoveHeadList(DoneTransferList); - KeReleaseSpinLock(&FdoExtension->DoneTransferSpinLock, OldIrql); - - if (Transfer) - { - Endpoint = Transfer->Endpoint; - - if ((Transfer->Flags & TRANSFER_FLAG_SPLITED)) - { - ASSERT(FALSE);// USBPORT_DoneSplitTransfer(Transfer); - } - else - { - USBPORT_DoneTransfer(Transfer); - } - - IsHasTransfers = USBPORT_EndpointHasQueuedTransfers(FdoDevice, - Endpoint, - &TransferCount); - - if (IsHasTransfers && !TransferCount) - { - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_WORKER_DPC); - } - } - } - - KeReleaseSpinLock(&FdoExtension->DoneTransferSpinLock, OldIrql); -} - - -VOID -NTAPI -USBPORT_TransferFlushDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - - DPRINT_CORE("USBPORT_TransferFlushDpc: ... \n"); - FdoDevice = DeferredContext; - USBPORT_FlushDoneTransfers(FdoDevice); -} - -BOOLEAN -NTAPI -USBPORT_QueueDoneTransfer(IN PUSBPORT_TRANSFER Transfer, - IN USBD_STATUS USBDStatus) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT_CORE("USBPORT_QueueDoneTransfer: Transfer - %p, USBDStatus - %p\n", - Transfer, - USBDStatus); - - FdoDevice = Transfer->Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - - RemoveEntryList(&Transfer->TransferLink); - Transfer->USBDStatus = USBDStatus; - - ExInterlockedInsertTailList(&FdoExtension->DoneTransferList, - &Transfer->TransferLink, - &FdoExtension->DoneTransferSpinLock); - - return KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); -} - -VOID -NTAPI -USBPORT_DpcHandler(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_ENDPOINT Endpoint; - PLIST_ENTRY Entry; - LIST_ENTRY List; - LONG LockCounter; - - DPRINT("USBPORT_DpcHandler: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - InitializeListHead(&List); - - KeAcquireSpinLockAtDpcLevel(&FdoExtension->EndpointListSpinLock); - Entry = FdoExtension->EndpointList.Flink; - - while (Entry && Entry != &FdoExtension->EndpointList) - { - Endpoint = CONTAINING_RECORD(Entry, - USBPORT_ENDPOINT, - EndpointLink); - - LockCounter = InterlockedIncrement(&Endpoint->LockCounter); - - if (USBPORT_GetEndpointState(Endpoint) != USBPORT_ENDPOINT_ACTIVE || - LockCounter || - Endpoint->Flags & ENDPOINT_FLAG_ROOTHUB_EP0) - { - InterlockedDecrement(&Endpoint->LockCounter); - } - else - { - InsertTailList(&List, &Endpoint->DispatchLink); - - if (Endpoint->WorkerLink.Flink && Endpoint->WorkerLink.Blink) - { - RemoveEntryList(&Endpoint->WorkerLink); - - Endpoint->WorkerLink.Flink = NULL; - Endpoint->WorkerLink.Blink = NULL; - } - } - - Entry = Endpoint->EndpointLink.Flink; - } - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->EndpointListSpinLock); - - while (!IsListEmpty(&List)) - { - Endpoint = CONTAINING_RECORD(List.Flink, - USBPORT_ENDPOINT, - DispatchLink); - - RemoveEntryList(List.Flink); - Endpoint->DispatchLink.Flink = NULL; - Endpoint->DispatchLink.Blink = NULL; - - USBPORT_EndpointWorker(Endpoint, TRUE); - USBPORT_FlushPendingTransfers(Endpoint); - } - - KeAcquireSpinLockAtDpcLevel(&FdoExtension->EndpointListSpinLock); - - if (!IsListEmpty(&FdoExtension->WorkerList)) - { - USBPORT_SignalWorkerThread(FdoDevice); - } - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->EndpointListSpinLock); - - USBPORT_FlushDoneTransfers(FdoDevice); -} - -VOID -NTAPI -USBPORT_IsrDpcHandler(IN PDEVICE_OBJECT FdoDevice, - IN BOOLEAN IsDpcHandler) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - PUSBPORT_ENDPOINT Endpoint; - PLIST_ENTRY List; - ULONG FrameNumber; - - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - DPRINT_CORE("USBPORT_IsrDpcHandler: IsDpcHandler - %x\n", IsDpcHandler); - - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - if (InterlockedIncrement(&FdoExtension->IsrDpcHandlerCounter)) - { - KeInsertQueueDpc(&FdoExtension->IsrDpc, NULL, NULL); - InterlockedDecrement(&FdoExtension->IsrDpcHandlerCounter); - return; - } - - for (List = ExInterlockedRemoveHeadList(&FdoExtension->EpStateChangeList, - &FdoExtension->EpStateChangeSpinLock); - List != NULL; - List = ExInterlockedRemoveHeadList(&FdoExtension->EpStateChangeList, - &FdoExtension->EpStateChangeSpinLock)) - { - Endpoint = CONTAINING_RECORD(List, - USBPORT_ENDPOINT, - StateChangeLink); - - DPRINT_CORE("USBPORT_IsrDpcHandler: Endpoint - %p\n", Endpoint); - - KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock); - - KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); - FrameNumber = Packet->Get32BitFrameNumber(FdoExtension->MiniPortExt); - KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); - - if (FrameNumber <= Endpoint->FrameNumber && - !(Endpoint->Flags & ENDPOINT_FLAG_NUKE)) - { - KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); - - ExInterlockedInsertHeadList(&FdoExtension->EpStateChangeList, - &Endpoint->StateChangeLink, - &FdoExtension->EpStateChangeSpinLock); - - KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); - Packet->InterruptNextSOF(FdoExtension->MiniPortExt); - KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); - - break; - } - - KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); - - KeAcquireSpinLockAtDpcLevel(&Endpoint->StateChangeSpinLock); - Endpoint->StateLast = Endpoint->StateNext; - KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); - - DPRINT_CORE("USBPORT_IsrDpcHandler: Endpoint->StateLast - %x\n", - Endpoint->StateLast); - - if (IsDpcHandler) - { - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_ONLY); - } - else - { - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_WORKER_THREAD); - } - } - - if (IsDpcHandler) - { - USBPORT_DpcHandler(FdoDevice); - } - - InterlockedDecrement(&FdoExtension->IsrDpcHandlerCounter); -} - -VOID -NTAPI -USBPORT_IsrDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - BOOLEAN InterruptEnable; - - DPRINT_INT("USBPORT_IsrDpc: DeferredContext - %p, SystemArgument2 - %p\n", - DeferredContext, - SystemArgument2); - - FdoDevice = DeferredContext; - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - if (SystemArgument2) - { - InterlockedDecrement(&FdoExtension->IsrDpcCounter); - } - - KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportInterruptsSpinLock); - InterruptEnable = (FdoExtension->Flags & USBPORT_FLAG_INTERRUPT_ENABLED) == - USBPORT_FLAG_INTERRUPT_ENABLED; - - Packet->InterruptDpc(FdoExtension->MiniPortExt, InterruptEnable); - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportInterruptsSpinLock); - - if (FdoExtension->Flags & USBPORT_FLAG_HC_SUSPEND && - FdoExtension->TimerFlags & USBPORT_TMFLAG_WAKE) - { - USBPORT_CompletePdoWaitWake(FdoDevice); - } - else - { - USBPORT_IsrDpcHandler(FdoDevice, TRUE); - } - - DPRINT_INT("USBPORT_IsrDpc: exit\n"); -} - -BOOLEAN -NTAPI -USBPORT_InterruptService(IN PKINTERRUPT Interrupt, - IN PVOID ServiceContext) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - BOOLEAN Result = FALSE; - - FdoDevice = ServiceContext; - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - DPRINT_INT("USBPORT_InterruptService: FdoExtension->Flags - %lx\n", - FdoExtension->Flags); - - if (FdoExtension->Flags & USBPORT_FLAG_INTERRUPT_ENABLED && - FdoExtension->MiniPortFlags & USBPORT_MPFLAG_INTERRUPTS_ENABLED) - { - Result = Packet->InterruptService(FdoExtension->MiniPortExt); - - if (Result) - { - KeInsertQueueDpc(&FdoExtension->IsrDpc, NULL, NULL); - } - } - - DPRINT_INT("USBPORT_InterruptService: return - %x\n", Result); - - return Result; -} - -VOID -NTAPI -USBPORT_SignalWorkerThread(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - KIRQL OldIrql; - - DPRINT_CORE("USBPORT_SignalWorkerThread ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - KeAcquireSpinLock(&FdoExtension->WorkerThreadEventSpinLock, &OldIrql); - KeSetEvent(&FdoExtension->WorkerThreadEvent, EVENT_INCREMENT, FALSE); - KeReleaseSpinLock(&FdoExtension->WorkerThreadEventSpinLock, OldIrql); -} - -VOID -NTAPI -USBPORT_WorkerThreadHandler(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - PLIST_ENTRY workerList; - KIRQL OldIrql; - PUSBPORT_ENDPOINT Endpoint; - LIST_ENTRY list; - BOOLEAN Result; - - DPRINT_CORE("USBPORT_WorkerThreadHandler: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &OldIrql); - - if (!(FdoExtension->Flags & USBPORT_FLAG_HC_SUSPEND)) - { - Packet->CheckController(FdoExtension->MiniPortExt); - } - - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, OldIrql); - - InitializeListHead(&list); - - USBPORT_FlushAllEndpoints(FdoDevice); - - while (TRUE) - { - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - KeAcquireSpinLockAtDpcLevel(&FdoExtension->EndpointListSpinLock); - - workerList = &FdoExtension->WorkerList; - - if (IsListEmpty(workerList)) - break; - - Endpoint = CONTAINING_RECORD(workerList->Flink, - USBPORT_ENDPOINT, - WorkerLink); - - DPRINT_CORE("USBPORT_WorkerThreadHandler: Endpoint - %p\n", Endpoint); - - RemoveHeadList(workerList); - Endpoint->WorkerLink.Blink = NULL; - Endpoint->WorkerLink.Flink = NULL; - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->EndpointListSpinLock); - - Result = USBPORT_EndpointWorker(Endpoint, FALSE); - KeAcquireSpinLockAtDpcLevel(&FdoExtension->EndpointListSpinLock); - - if (Result) - { - if (Endpoint->FlushAbortLink.Flink == NULL || - Endpoint->FlushAbortLink.Blink == NULL) - { - InsertTailList(&list, &Endpoint->FlushAbortLink); - } - } - - while (!IsListEmpty(&list)) - { - Endpoint = CONTAINING_RECORD(list.Flink, - USBPORT_ENDPOINT, - FlushAbortLink); - - RemoveHeadList(&list); - - Endpoint->FlushAbortLink.Flink = NULL; - Endpoint->FlushAbortLink.Blink = NULL; - - if (Endpoint->WorkerLink.Flink == NULL || - Endpoint->WorkerLink.Blink == NULL) - { - InsertTailList(&FdoExtension->WorkerList, - &Endpoint->WorkerLink); - - USBPORT_SignalWorkerThread(FdoDevice); - } - } - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->EndpointListSpinLock); - KeLowerIrql(OldIrql); - } - - KeReleaseSpinLockFromDpcLevel(&FdoExtension->EndpointListSpinLock); - KeLowerIrql(OldIrql); - - USBPORT_FlushClosedEndpointList(FdoDevice); -} - -VOID -NTAPI -USBPORT_DoRootHubCallback(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT PdoDevice; - PUSBPORT_RHDEVICE_EXTENSION PdoExtension; - PRH_INIT_CALLBACK RootHubInitCallback; - PVOID RootHubInitContext; - - FdoExtension = FdoDevice->DeviceExtension; - - DPRINT("USBPORT_DoRootHubCallback: FdoDevice - %p\n", FdoDevice); - - PdoDevice = FdoExtension->RootHubPdo; - - if (PdoDevice) - { - PdoExtension = PdoDevice->DeviceExtension; - - RootHubInitContext = PdoExtension->RootHubInitContext; - RootHubInitCallback = PdoExtension->RootHubInitCallback; - - PdoExtension->RootHubInitCallback = NULL; - PdoExtension->RootHubInitContext = NULL; - - if (RootHubInitCallback) - { - RootHubInitCallback(RootHubInitContext); - } - } - - DPRINT("USBPORT_DoRootHubCallback: exit\n"); -} - -VOID -NTAPI -USBPORT_SynchronizeRootHubCallback(IN PDEVICE_OBJECT FdoDevice, - IN PDEVICE_OBJECT Usb2FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - PUSBPORT_DEVICE_EXTENSION Usb2FdoExtension; - PDEVICE_RELATIONS CompanionControllersList; - PUSBPORT_DEVICE_EXTENSION CompanionFdoExtension; - PDEVICE_OBJECT * Entry; - ULONG ix; - - DPRINT("USBPORT_SynchronizeRootHubCallback: FdoDevice - %p, Usb2FdoDevice - %p\n", - FdoDevice, - Usb2FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - if (Usb2FdoDevice == NULL && - !(Packet->MiniPortFlags & USB_MINIPORT_FLAGS_USB2)) - { - /* Not Companion USB11 Controller */ - USBPORT_DoRootHubCallback(FdoDevice); - - FdoExtension->Flags &= ~USBPORT_FLAG_RH_INIT_CALLBACK; - InterlockedCompareExchange(&FdoExtension->RHInitCallBackLock, 0, 1); - - DPRINT("USBPORT_SynchronizeRootHubCallback: exit \n"); - return; - } - - /* USB2 or Companion USB11 */ - - DPRINT("USBPORT_SynchronizeRootHubCallback: FdoExtension->Flags - %p\n", - FdoExtension->Flags); - - if (!(FdoExtension->Flags & USBPORT_FLAG_COMPANION_HC)) - { - KeWaitForSingleObject(&FdoExtension->ControllerSemaphore, - Executive, - KernelMode, - FALSE, - NULL); - - FdoExtension->Flags |= USBPORT_FLAG_PWR_AND_CHIRP_LOCK; - - if (!(FdoExtension->Flags & (USBPORT_FLAG_HC_SUSPEND | - USBPORT_FLAG_POWER_AND_CHIRP_OK))) - { - USBPORT_RootHubPowerAndChirpAllCcPorts(FdoDevice); - FdoExtension->Flags |= USBPORT_FLAG_POWER_AND_CHIRP_OK; - } - - FdoExtension->Flags &= ~USBPORT_FLAG_PWR_AND_CHIRP_LOCK; - - KeReleaseSemaphore(&FdoExtension->ControllerSemaphore, - LOW_REALTIME_PRIORITY, - 1, - FALSE); - - CompanionControllersList = USBPORT_FindCompanionControllers(FdoDevice, - FALSE, - TRUE); - - if (CompanionControllersList) - { - Entry = &CompanionControllersList->Objects[0]; - - for (ix = 0; ix < CompanionControllersList->Count; ++ix) - { - CompanionFdoExtension = ((*Entry)->DeviceExtension); - - InterlockedCompareExchange(&CompanionFdoExtension->RHInitCallBackLock, - 0, - 1); - - ++Entry; - } - - ExFreePoolWithTag(CompanionControllersList, USB_PORT_TAG); - } - - USBPORT_DoRootHubCallback(FdoDevice); - - FdoExtension->Flags &= ~USBPORT_FLAG_RH_INIT_CALLBACK; - InterlockedCompareExchange(&FdoExtension->RHInitCallBackLock, 0, 1); - } - else - { - Usb2FdoExtension = Usb2FdoDevice->DeviceExtension; - - USBPORT_Wait(FdoDevice, 50); - - while (FdoExtension->RHInitCallBackLock) - { - USBPORT_Wait(FdoDevice, 10); - - Usb2FdoExtension->Flags |= USBPORT_FLAG_RH_INIT_CALLBACK; - USBPORT_SignalWorkerThread(Usb2FdoDevice); - } - - USBPORT_DoRootHubCallback(FdoDevice); - - FdoExtension->Flags &= ~USBPORT_FLAG_RH_INIT_CALLBACK; - } - - DPRINT("USBPORT_SynchronizeRootHubCallback: exit \n"); -} - -VOID -NTAPI -USBPORT_WorkerThread(IN PVOID StartContext) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - LARGE_INTEGER OldTime; - LARGE_INTEGER NewTime; - KIRQL OldIrql; - - DPRINT_CORE("USBPORT_WorkerThread ... \n"); - - FdoDevice = StartContext; - FdoExtension = FdoDevice->DeviceExtension; - - FdoExtension->WorkerThread = KeGetCurrentThread(); - - do - { - KeQuerySystemTime(&OldTime); - - KeWaitForSingleObject(&FdoExtension->WorkerThreadEvent, - Suspended, - KernelMode, - FALSE, - NULL); - - KeQuerySystemTime(&NewTime); - - KeAcquireSpinLock(&FdoExtension->WorkerThreadEventSpinLock, &OldIrql); - KeResetEvent(&FdoExtension->WorkerThreadEvent); - KeReleaseSpinLock(&FdoExtension->WorkerThreadEventSpinLock, OldIrql); - DPRINT_CORE("USBPORT_WorkerThread: run \n"); - - if (FdoExtension->MiniPortFlags & USBPORT_MPFLAG_INTERRUPTS_ENABLED) - { - USBPORT_DoSetPowerD0(FdoDevice); - - if (FdoExtension->Flags & USBPORT_FLAG_RH_INIT_CALLBACK) - { - PDEVICE_OBJECT USB2FdoDevice = NULL; - - USB2FdoDevice = USBPORT_FindUSB2Controller(FdoDevice); - USBPORT_SynchronizeRootHubCallback(FdoDevice, USB2FdoDevice); - } - } - - USBPORT_WorkerThreadHandler(FdoDevice); - } - while (!(FdoExtension->Flags & USBPORT_FLAG_WORKER_THREAD_ON)); - - PsTerminateSystemThread(0); -} - -NTSTATUS -NTAPI -USBPORT_CreateWorkerThread(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - NTSTATUS Status; - - DPRINT("USBPORT_CreateWorkerThread ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - FdoExtension->Flags &= ~USBPORT_FLAG_WORKER_THREAD_ON; - - KeInitializeEvent(&FdoExtension->WorkerThreadEvent, - NotificationEvent, - FALSE); - - Status = PsCreateSystemThread(&FdoExtension->WorkerThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - NULL, - USBPORT_WorkerThread, - (PVOID)FdoDevice); - - return Status; -} - -VOID -NTAPI -USBPORT_SynchronizeControllersStart(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT PdoDevice; - PUSBPORT_RHDEVICE_EXTENSION PdoExtension; - PDEVICE_OBJECT USB2FdoDevice = NULL; - PUSBPORT_DEVICE_EXTENSION USB2FdoExtension; - BOOLEAN IsOn; - - DPRINT_TIMER("USBPORT_SynchronizeControllersStart: FdoDevice - %p\n", - FdoDevice); - - FdoExtension = FdoDevice->DeviceExtension; - - PdoDevice = FdoExtension->RootHubPdo; - - if (!PdoDevice) - { - return; - } - - PdoExtension = PdoDevice->DeviceExtension; - - if (PdoExtension->RootHubInitCallback == NULL || - FdoExtension->Flags & USBPORT_FLAG_RH_INIT_CALLBACK) - { - return; - } - - DPRINT_TIMER("USBPORT_SynchronizeControllersStart: Flags - %p\n", - FdoExtension->Flags); - - if (FdoExtension->Flags & USBPORT_FLAG_COMPANION_HC) - { - IsOn = FALSE; - - USB2FdoDevice = USBPORT_FindUSB2Controller(FdoDevice); - - DPRINT_TIMER("USBPORT_SynchronizeControllersStart: USB2FdoDevice - %p\n", - USB2FdoDevice); - - if (USB2FdoDevice) - { - USB2FdoExtension = USB2FdoDevice->DeviceExtension; - - if (USB2FdoExtension->CommonExtension.PnpStateFlags & - USBPORT_PNP_STATE_STARTED) - { - IsOn = TRUE; - } - } - - if (!(FdoExtension->Flags & USBPORT_FLAG_NO_HACTION)) - { - goto Start; - } - - USB2FdoDevice = NULL; - } - - IsOn = TRUE; - - Start: - - if (IsOn && - !InterlockedCompareExchange(&FdoExtension->RHInitCallBackLock, 1, 0)) - { - FdoExtension->Flags |= USBPORT_FLAG_RH_INIT_CALLBACK; - USBPORT_SignalWorkerThread(FdoDevice); - - if (USB2FdoDevice) - { - USB2FdoExtension = USB2FdoDevice->DeviceExtension; - - USB2FdoExtension->Flags |= USBPORT_FLAG_RH_INIT_CALLBACK; - USBPORT_SignalWorkerThread(USB2FdoDevice); - } - } - - DPRINT_TIMER("USBPORT_SynchronizeControllersStart: exit\n"); -} - -VOID -NTAPI -USBPORT_TimerDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_REGISTRATION_PACKET Packet; - LARGE_INTEGER DueTime = {{0, 0}}; - ULONG TimerFlags; - PTIMER_WORK_QUEUE_ITEM IdleQueueItem; - KIRQL OldIrql; - KIRQL TimerOldIrql; - - DPRINT_TIMER("USBPORT_TimerDpc: Dpc - %p, DeferredContext - %p\n", - Dpc, - DeferredContext); - - FdoDevice = DeferredContext; - FdoExtension = FdoDevice->DeviceExtension; - Packet = &FdoExtension->MiniPortInterface->Packet; - - KeAcquireSpinLock(&FdoExtension->TimerFlagsSpinLock, &TimerOldIrql); - - TimerFlags = FdoExtension->TimerFlags; - - DPRINT_TIMER("USBPORT_TimerDpc: Flags - %p, TimerFlags - %p\n", - FdoExtension->Flags, - TimerFlags); - - if (FdoExtension->Flags & USBPORT_FLAG_HC_SUSPEND && - FdoExtension->Flags & USBPORT_FLAG_HC_WAKE_SUPPORT && - !(TimerFlags & USBPORT_TMFLAG_HC_RESUME)) - { - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &OldIrql); - Packet->PollController(FdoExtension->MiniPortExt); - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, OldIrql); - } - - USBPORT_SynchronizeControllersStart(FdoDevice); - - if (TimerFlags & USBPORT_TMFLAG_HC_SUSPENDED) - { - USBPORT_BadRequestFlush(FdoDevice); - goto Exit; - } - - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &OldIrql); - - if (!(FdoExtension->Flags & USBPORT_FLAG_HC_SUSPEND)) - { - Packet->CheckController(FdoExtension->MiniPortExt); - } - - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, OldIrql); - - if (FdoExtension->Flags & USBPORT_FLAG_HC_POLLING) - { - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &OldIrql); - Packet->PollController(FdoExtension->MiniPortExt); - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, OldIrql); - } - - USBPORT_IsrDpcHandler(FdoDevice, FALSE); - - DPRINT_TIMER("USBPORT_TimerDpc: USBPORT_TimeoutAllEndpoints UNIMPLEMENTED.\n"); - //USBPORT_TimeoutAllEndpoints(FdoDevice); - DPRINT_TIMER("USBPORT_TimerDpc: USBPORT_CheckIdleEndpoints UNIMPLEMENTED.\n"); - //USBPORT_CheckIdleEndpoints(FdoDevice); - - USBPORT_BadRequestFlush(FdoDevice); - - if (FdoExtension->IdleLockCounter > -1 && - !(TimerFlags & USBPORT_TMFLAG_IDLE_QUEUEITEM_ON)) - { - IdleQueueItem = ExAllocatePoolWithTag(NonPagedPool, - sizeof(TIMER_WORK_QUEUE_ITEM), - USB_PORT_TAG); - - DPRINT("USBPORT_TimerDpc: IdleLockCounter - %x, IdleQueueItem - %p\n", - FdoExtension->IdleLockCounter, - IdleQueueItem); - - if (IdleQueueItem) - { - RtlZeroMemory(IdleQueueItem, sizeof(TIMER_WORK_QUEUE_ITEM)); - - IdleQueueItem->WqItem.List.Flink = NULL; - IdleQueueItem->WqItem.WorkerRoutine = USBPORT_DoIdleNotificationCallback; - IdleQueueItem->WqItem.Parameter = IdleQueueItem; - - IdleQueueItem->FdoDevice = FdoDevice; - IdleQueueItem->Context = 0; - - FdoExtension->TimerFlags |= USBPORT_TMFLAG_IDLE_QUEUEITEM_ON; - - ExQueueWorkItem(&IdleQueueItem->WqItem, CriticalWorkQueue); - } - } - -Exit: - - KeReleaseSpinLock(&FdoExtension->TimerFlagsSpinLock, TimerOldIrql); - - if (TimerFlags & USBPORT_TMFLAG_TIMER_QUEUED) - { - DueTime.QuadPart -= FdoExtension->TimerValue * 10000 + - (KeQueryTimeIncrement() - 1); - - KeSetTimer(&FdoExtension->TimerObject, - DueTime, - &FdoExtension->TimerDpc); - } - - DPRINT_TIMER("USBPORT_TimerDpc: exit\n"); -} - -BOOLEAN -NTAPI -USBPORT_StartTimer(IN PDEVICE_OBJECT FdoDevice, - IN ULONG Time) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - LARGE_INTEGER DueTime = {{0, 0}}; - ULONG TimeIncrement; - BOOLEAN Result; - - DPRINT_TIMER("USBPORT_StartTimer: FdoDevice - %p, Time - %x\n", - FdoDevice, - Time); - - FdoExtension = FdoDevice->DeviceExtension; - - TimeIncrement = KeQueryTimeIncrement(); - - FdoExtension->TimerFlags |= USBPORT_TMFLAG_TIMER_QUEUED; - FdoExtension->TimerValue = Time; - - KeInitializeTimer(&FdoExtension->TimerObject); - KeInitializeDpc(&FdoExtension->TimerDpc, USBPORT_TimerDpc, FdoDevice); - - DueTime.QuadPart -= 10000 * Time + (TimeIncrement - 1); - - Result = KeSetTimer(&FdoExtension->TimerObject, - DueTime, - &FdoExtension->TimerDpc); - - return Result; -} - -PUSBPORT_COMMON_BUFFER_HEADER -NTAPI -USBPORT_AllocateCommonBuffer(IN PDEVICE_OBJECT FdoDevice, - IN SIZE_T BufferLength) -{ - PUSBPORT_COMMON_BUFFER_HEADER HeaderBuffer = NULL; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDMA_ADAPTER DmaAdapter; - PDMA_OPERATIONS DmaOperations; - SIZE_T HeaderSize; - ULONG Length = 0; - ULONG LengthPadded; - PHYSICAL_ADDRESS LogicalAddress; - ULONG_PTR BaseVA; - ULONG_PTR StartBufferVA; - ULONG_PTR StartBufferPA; - - DPRINT("USBPORT_AllocateCommonBuffer: FdoDevice - %p, BufferLength - %p\n", - FdoDevice, - BufferLength); - - if (BufferLength == 0) - goto Exit; - - FdoExtension = FdoDevice->DeviceExtension; - - DmaAdapter = FdoExtension->DmaAdapter; - DmaOperations = DmaAdapter->DmaOperations; - - HeaderSize = sizeof(USBPORT_COMMON_BUFFER_HEADER); - Length = ROUND_TO_PAGES(BufferLength + HeaderSize); - LengthPadded = Length - (BufferLength + HeaderSize); - - BaseVA = (ULONG_PTR)DmaOperations->AllocateCommonBuffer(DmaAdapter, - Length, - &LogicalAddress, - TRUE); - - if (!BaseVA) - goto Exit; - - StartBufferVA = BaseVA & ~(PAGE_SIZE - 1); - StartBufferPA = LogicalAddress.LowPart & ~(PAGE_SIZE - 1); - - HeaderBuffer = (PUSBPORT_COMMON_BUFFER_HEADER)(StartBufferVA + - BufferLength + - LengthPadded); - - HeaderBuffer->Length = Length; - HeaderBuffer->BaseVA = BaseVA; - HeaderBuffer->LogicalAddress = LogicalAddress; - - HeaderBuffer->BufferLength = BufferLength + LengthPadded; - HeaderBuffer->VirtualAddress = StartBufferVA; - HeaderBuffer->PhysicalAddress = StartBufferPA; - - RtlZeroMemory((PVOID)StartBufferVA, BufferLength + LengthPadded); - -Exit: - return HeaderBuffer; -} - -VOID -NTAPI -USBPORT_FreeCommonBuffer(IN PDEVICE_OBJECT FdoDevice, - IN PUSBPORT_COMMON_BUFFER_HEADER HeaderBuffer) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDMA_ADAPTER DmaAdapter; - PDMA_OPERATIONS DmaOperations; - - DPRINT("USBPORT_FreeCommonBuffer: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - - DmaAdapter = FdoExtension->DmaAdapter; - DmaOperations = DmaAdapter->DmaOperations; - - DmaOperations->FreeCommonBuffer(FdoExtension->DmaAdapter, - HeaderBuffer->Length, - HeaderBuffer->LogicalAddress, - (PVOID)HeaderBuffer->VirtualAddress, - TRUE); -} - -PUSBPORT_MINIPORT_INTERFACE -NTAPI -USBPORT_FindMiniPort(IN PDRIVER_OBJECT DriverObject) -{ - KIRQL OldIrql; - PLIST_ENTRY List; - PUSBPORT_MINIPORT_INTERFACE MiniPortInterface; - BOOLEAN IsFound = FALSE; - - DPRINT("USBPORT_FindMiniPort: ... \n"); - - KeAcquireSpinLock(&USBPORT_SpinLock, &OldIrql); - - for (List = USBPORT_MiniPortDrivers.Flink; - List != &USBPORT_MiniPortDrivers; - List = List->Flink) - { - MiniPortInterface = CONTAINING_RECORD(List, - USBPORT_MINIPORT_INTERFACE, - DriverLink); - - if (MiniPortInterface->DriverObject == DriverObject) - { - DPRINT("USBPORT_FindMiniPort: find MiniPortInterface - %p\n", - MiniPortInterface); - - IsFound = TRUE; - break; - } - } - - KeReleaseSpinLock(&USBPORT_SpinLock, OldIrql); - - if (IsFound) - return MiniPortInterface; - else - return NULL; - -} - -NTSTATUS -NTAPI -USBPORT_AddDevice(IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) -{ - NTSTATUS Status; - PUSBPORT_MINIPORT_INTERFACE MiniPortInterface; - ULONG DeviceNumber = 0; - WCHAR CharDeviceName[64]; - UNICODE_STRING DeviceName; - PDEVICE_OBJECT DeviceObject; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_COMMON_DEVICE_EXTENSION FdoCommonExtension; - PDEVICE_OBJECT LowerDevice; - ULONG Length; - - DPRINT("USBPORT_AddDevice: DriverObject - %p, PhysicalDeviceObject - %p\n", - DriverObject, - PhysicalDeviceObject); - - MiniPortInterface = USBPORT_FindMiniPort(DriverObject); - - if (!MiniPortInterface) - { - DPRINT("USBPORT_AddDevice: USBPORT_FindMiniPort not found MiniPortInterface\n"); - return STATUS_UNSUCCESSFUL; - } - - while (TRUE) - { - /* Construct device name */ - RtlStringCbPrintfW(CharDeviceName, - sizeof(CharDeviceName), - L"\\Device\\USBFDO-%d", - DeviceNumber); - - RtlInitUnicodeString(&DeviceName, CharDeviceName); - - Length = sizeof(USBPORT_DEVICE_EXTENSION) + - MiniPortInterface->Packet.MiniPortExtensionSize; - - /* Create device */ - Status = IoCreateDevice(DriverObject, - Length, - &DeviceName, - FILE_DEVICE_CONTROLLER, - 0, - FALSE, - &DeviceObject); - - /* Check for success */ - if (NT_SUCCESS(Status)) break; - - /* Is there a device object with that same name */ - if ((Status == STATUS_OBJECT_NAME_EXISTS) || - (Status == STATUS_OBJECT_NAME_COLLISION)) - { - /* Try the next name */ - DeviceNumber++; - continue; - } - - /* Bail out on other errors */ - if (!NT_SUCCESS(Status)) - { - DPRINT1("USBPORT_AddDevice: failed to create %wZ, Status %x\n", - &DeviceName, - Status); - - return Status; - } - } - - DPRINT("USBPORT_AddDevice: created device %p <%wZ>, Status %x\n", - DeviceObject, - &DeviceName, - Status); - - FdoExtension = DeviceObject->DeviceExtension; - FdoCommonExtension = &FdoExtension->CommonExtension; - - RtlZeroMemory(FdoExtension, sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoCommonExtension->SelfDevice = DeviceObject; - FdoCommonExtension->LowerPdoDevice = PhysicalDeviceObject; - FdoCommonExtension->IsPDO = FALSE; - - LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, - PhysicalDeviceObject); - - FdoCommonExtension->LowerDevice = LowerDevice; - - FdoCommonExtension->DevicePowerState = PowerDeviceD3; - - FdoExtension->MiniPortExt = (PVOID)((ULONG_PTR)FdoExtension + - sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoExtension->MiniPortInterface = MiniPortInterface; - FdoExtension->FdoNameNumber = DeviceNumber; - - KeInitializeSemaphore(&FdoExtension->DeviceSemaphore, 1, 1); - KeInitializeSemaphore(&FdoExtension->ControllerSemaphore, 1, 1); - - InitializeListHead(&FdoExtension->EndpointList); - InitializeListHead(&FdoExtension->DoneTransferList); - InitializeListHead(&FdoExtension->WorkerList); - InitializeListHead(&FdoExtension->EpStateChangeList); - InitializeListHead(&FdoExtension->MapTransferList); - InitializeListHead(&FdoExtension->DeviceHandleList); - InitializeListHead(&FdoExtension->IdleIrpList); - InitializeListHead(&FdoExtension->BadRequestList); - InitializeListHead(&FdoExtension->EndpointClosedList); - - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - return Status; -} - -VOID -NTAPI -USBPORT_Unload(IN PDRIVER_OBJECT DriverObject) -{ - PUSBPORT_MINIPORT_INTERFACE MiniPortInterface; - - DPRINT1("USBPORT_Unload: FIXME!\n"); - - MiniPortInterface = USBPORT_FindMiniPort(DriverObject); - - if (!MiniPortInterface) - { - DPRINT("USBPORT_Unload: CRITICAL ERROR!!! USBPORT_FindMiniPort not found MiniPortInterface\n"); - KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); - } - - DPRINT1("USBPORT_Unload: UNIMPLEMENTED. FIXME. \n"); - //MiniPortInterface->DriverUnload(DriverObject); // Call MiniPort _HCI_Unload -} - -ULONG -NTAPI -USBPORT_MiniportCompleteTransfer(IN PVOID MiniPortExtension, - IN PVOID MiniPortEndpoint, - IN PVOID TransferParameters, - IN USBD_STATUS USBDStatus, - IN ULONG TransferLength) -{ - PUSBPORT_TRANSFER Transfer; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - - DPRINT_CORE("USBPORT_MiniportCompleteTransfer: USBDStatus - %x, TransferLength - %x\n", - USBDStatus, - TransferLength); - - Transfer = CONTAINING_RECORD(TransferParameters, - USBPORT_TRANSFER, - TransferParameters); - - FdoDevice = Transfer->Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - - Transfer->CompletedTransferLen = TransferLength; - - RemoveEntryList(&Transfer->TransferLink); - - Transfer->USBDStatus = USBDStatus; - - ExInterlockedInsertTailList(&FdoExtension->DoneTransferList, - &Transfer->TransferLink, - &FdoExtension->DoneTransferSpinLock); - - return KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); + DPRINT1("USBPORT_InitializeIsoTransfer: UNIMPLEMENTED. FIXME.\n"); + return USBD_STATUS_NOT_SUPPORTED; } ULONG @@ -1983,789 +24,3 @@ return 0; } -VOID -NTAPI -USBPORT_AsyncTimerDpc(IN PRKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PUSBPORT_ASYNC_CALLBACK_DATA AsyncCallbackData; - - DPRINT("USBPORT_AsyncTimerDpc: ... \n"); - - AsyncCallbackData = DeferredContext; - FdoDevice = AsyncCallbackData->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - - (*AsyncCallbackData->CallbackFunction)(FdoExtension->MiniPortExt, - &AsyncCallbackData->CallbackContext); - - ExFreePoolWithTag(AsyncCallbackData, USB_PORT_TAG); -} - -ULONG -NTAPI -USBPORT_RequestAsyncCallback(IN PVOID MiniPortExtension, - IN ULONG TimerValue, - IN PVOID Buffer, - IN SIZE_T Length, - IN ASYNC_TIMER_CALLBACK * Callback) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_ASYNC_CALLBACK_DATA AsyncCallbackData; - LARGE_INTEGER DueTime = {{0, 0}}; - - DPRINT("USBPORT_RequestAsyncCallback: ... \n"); - - FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - - sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoDevice = FdoExtension->CommonExtension.SelfDevice; - - AsyncCallbackData = ExAllocatePoolWithTag(NonPagedPool, - sizeof(USBPORT_ASYNC_CALLBACK_DATA) + Length, - USB_PORT_TAG); - - if (!AsyncCallbackData) - { - DPRINT1("USBPORT_RequestAsyncCallback: Not allocated AsyncCallbackData!\n"); - return 0; - } - - RtlZeroMemory(AsyncCallbackData, - sizeof(USBPORT_ASYNC_CALLBACK_DATA) + Length); - - if (Length) - { - RtlCopyMemory(&AsyncCallbackData->CallbackContext, Buffer, Length); - } - - AsyncCallbackData->FdoDevice = FdoDevice; - AsyncCallbackData->CallbackFunction = Callback; - - KeInitializeTimer(&AsyncCallbackData->AsyncTimer); - - KeInitializeDpc(&AsyncCallbackData->AsyncTimerDpc, - USBPORT_AsyncTimerDpc, - AsyncCallbackData); - - DueTime.QuadPart -= (KeQueryTimeIncrement() - 1) + 10000 * TimerValue; - - KeSetTimer(&AsyncCallbackData->AsyncTimer, - DueTime, - &AsyncCallbackData->AsyncTimerDpc); - - return 0; -} - -PVOID -NTAPI -USBPORT_GetMappedVirtualAddress(IN PVOID PhysicalAddress, - IN PVOID MiniPortExtension, - IN PVOID MiniPortEndpoint) -{ - PUSBPORT_COMMON_BUFFER_HEADER HeaderBuffer; - PUSBPORT_ENDPOINT Endpoint; - ULONG Offset; - ULONG_PTR VirtualAddress; - - DPRINT_CORE("USBPORT_GetMappedVirtualAddress ... \n"); - - Endpoint = (PUSBPORT_ENDPOINT)((ULONG_PTR)MiniPortEndpoint - - sizeof(USBPORT_ENDPOINT)); - - if (!Endpoint) - { - ASSERT(FALSE); - } - - HeaderBuffer = Endpoint->HeaderBuffer; - - Offset = (ULONG_PTR)PhysicalAddress - HeaderBuffer->PhysicalAddress; - VirtualAddress = HeaderBuffer->VirtualAddress + Offset; - - return (PVOID)VirtualAddress; -} - -ULONG -NTAPI -USBPORT_InvalidateEndpoint(IN PVOID MiniPortExtension, - IN PVOID MiniPortEndpoint) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_ENDPOINT Endpoint; - - DPRINT_CORE("USBPORT_InvalidateEndpoint: ... \n"); - - FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - - sizeof(USBPORT_DEVICE_EXTENSION)); - - FdoDevice = FdoExtension->CommonExtension.SelfDevice; - - if (!MiniPortEndpoint) - { - USBPORT_InvalidateEndpointHandler(FdoDevice, - NULL, - INVALIDATE_ENDPOINT_ONLY); - return 0; - } - - Endpoint = (PUSBPORT_ENDPOINT)((ULONG_PTR)MiniPortEndpoint - - sizeof(USBPORT_ENDPOINT)); - - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_ONLY); - - return 0; -} - -VOID -NTAPI -USBPORT_CompleteTransfer(IN PURB Urb, - IN USBD_STATUS TransferStatus) -{ - struct _URB_CONTROL_TRANSFER *UrbTransfer; - PUSBPORT_TRANSFER Transfer; - NTSTATUS Status; - PIRP Irp; - KIRQL OldIrql; - PRKEVENT Event; - BOOLEAN WriteToDevice; - BOOLEAN IsFlushSuccess; - PMDL Mdl; - ULONG_PTR CurrentVa; - SIZE_T TransferLength; - PUSBPORT_ENDPOINT Endpoint; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDMA_OPERATIONS DmaOperations; - - DPRINT("USBPORT_CompleteTransfer: Urb - %p, TransferStatus - %X\n", - Urb, - TransferStatus); - - UrbTransfer = &Urb->UrbControlTransfer; - Transfer = UrbTransfer->hca.Reserved8[0]; - - Transfer->USBDStatus = TransferStatus; - Status = USBPORT_USBDStatusToNtStatus(Urb, TransferStatus); - - UrbTransfer->TransferBufferLength = Transfer->CompletedTransferLen; - - if (Transfer->Flags & TRANSFER_FLAG_DMA_MAPPED) - { - Endpoint = Transfer->Endpoint; - FdoDevice = Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - DmaOperations = FdoExtension->DmaAdapter->DmaOperations; - - WriteToDevice = Transfer->Direction == USBPORT_DMA_DIRECTION_TO_DEVICE; - Mdl = UrbTransfer->TransferBufferMDL; - CurrentVa = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - TransferLength = UrbTransfer->TransferBufferLength; - - IsFlushSuccess = DmaOperations->FlushAdapterBuffers(FdoExtension->DmaAdapter, - Mdl, - Transfer->MapRegisterBase, - (PVOID)CurrentVa, - TransferLength, - WriteToDevice); - - if (!IsFlushSuccess) - { - DPRINT("USBPORT_CompleteTransfer: no FlushAdapterBuffers !!!\n"); - ASSERT(FALSE); - } - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - DmaOperations->FreeMapRegisters(FdoExtension->DmaAdapter, - Transfer->MapRegisterBase, - Transfer->NumberOfMapRegisters); - - KeLowerIrql(OldIrql); - } - - if (Urb->UrbHeader.UsbdFlags & USBD_FLAG_ALLOCATED_MDL) - { - IoFreeMdl(Transfer->TransferBufferMDL); - Urb->UrbHeader.UsbdFlags |= ~USBD_FLAG_ALLOCATED_MDL; - } - - Urb->UrbControlTransfer.hca.Reserved8[0] = NULL; - Urb->UrbHeader.UsbdFlags |= ~USBD_FLAG_ALLOCATED_TRANSFER; - - Irp = Transfer->Irp; - - if (Irp) - { - if (!NT_SUCCESS(Status)) - { - //DbgBreakPoint(); - DPRINT1("USBPORT_CompleteTransfer: Irp - %p complete with Status - %lx\n", - Irp, - Status); - - USBPORT_DumpingURB(Urb); - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - KeLowerIrql(OldIrql); - } - - Event = Transfer->Event; - - if (Event) - { - KeSetEvent(Event, EVENT_INCREMENT, FALSE); - } - - ExFreePoolWithTag(Transfer, USB_PORT_TAG); - - DPRINT_CORE("USBPORT_CompleteTransfer: exit\n"); -} - -IO_ALLOCATION_ACTION -NTAPI -USBPORT_MapTransfer(IN PDEVICE_OBJECT FdoDevice, - IN PIRP Irp, - IN PVOID MapRegisterBase, - IN PVOID Context) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PDMA_ADAPTER DmaAdapter; - PUSBPORT_TRANSFER Transfer; - PURB Urb; - PUSBPORT_ENDPOINT Endpoint; - PMDL Mdl; - ULONG_PTR CurrentVa; - PUSBPORT_SCATTER_GATHER_LIST sgList; - SIZE_T CurrentLength; - ULONG ix; - BOOLEAN WriteToDevice; - PHYSICAL_ADDRESS PhAddr = {{0, 0}}; - PHYSICAL_ADDRESS PhAddress = {{0, 0}}; - SIZE_T TransferLength; - SIZE_T SgCurrentLength; - SIZE_T ElementLength; - PUSBPORT_DEVICE_HANDLE DeviceHandle; - PDMA_OPERATIONS DmaOperations; - - DPRINT_CORE("USBPORT_MapTransfer: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - DmaAdapter = FdoExtension->DmaAdapter; - DmaOperations = DmaAdapter->DmaOperations; - - Transfer = Context; - - Urb = Transfer->Urb; - Endpoint = Transfer->Endpoint; - TransferLength = Transfer->TransferParameters.TransferBufferLength; - - Mdl = Urb->UrbControlTransfer.TransferBufferMDL; - CurrentVa = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - - Transfer->SgList.CurrentVa = CurrentVa; - Transfer->SgList.MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); - - sgList = &Transfer->SgList; - sgList->Flags = 0; - - Transfer->MapRegisterBase = MapRegisterBase; - - ix = 0; - CurrentLength = 0; - - do - { - WriteToDevice = Transfer->Direction == USBPORT_DMA_DIRECTION_TO_DEVICE; - ASSERT(Transfer->Direction != 0); - - PhAddress = DmaOperations->MapTransfer(DmaAdapter, - Mdl, - MapRegisterBase, - (PVOID)CurrentVa, - &TransferLength, - WriteToDevice); - - DPRINT_CORE("USBPORT_MapTransfer: PhAddress.LowPart - %p, PhAddress.HighPart - %x, TransferLength - %x\n", - PhAddress.LowPart, - PhAddress.HighPart, - TransferLength); - - PhAddress.HighPart = 0; - SgCurrentLength = TransferLength; - - do - { - ElementLength = 0x1000 - (PhAddress.LowPart & 0xFFF); - - if (ElementLength > SgCurrentLength) - ElementLength = SgCurrentLength; - - DPRINT_CORE("USBPORT_MapTransfer: PhAddress.LowPart - %p, HighPart - %x, ElementLength - %x\n", - PhAddress.LowPart, - PhAddress.HighPart, - ElementLength); - - sgList->SgElement[ix].SgPhysicalAddress = PhAddress; - sgList->SgElement[ix].SgTransferLength = ElementLength; - sgList->SgElement[ix].SgOffset = CurrentLength + - (TransferLength - SgCurrentLength); - - PhAddress.LowPart += ElementLength; - SgCurrentLength -= ElementLength; - - ++ix; - } - while (SgCurrentLength); - - if ((PhAddr.LowPart == PhAddress.LowPart) && - (PhAddr.HighPart == PhAddress.HighPart)) - { - ASSERT(FALSE); - } - - PhAddr = PhAddress; - - CurrentLength += TransferLength; - CurrentVa += TransferLength; - - TransferLength = Transfer->TransferParameters.TransferBufferLength - - CurrentLength; - } - while (CurrentLength != Transfer->TransferParameters.TransferBufferLength); - - Transfer->SgList.SgElementCount = ix; - Transfer->Flags |= TRANSFER_FLAG_DMA_MAPPED; - - ASSERT(Transfer->TransferParameters.TransferBufferLength <= - Endpoint->EndpointProperties.MaxTransferSize); - - KeAcquireSpinLock(&Endpoint->EndpointSpinLock, &Endpoint->EndpointOldIrql); - InsertTailList(&Endpoint->TransferList, &Transfer->TransferLink); - KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); - - DeviceHandle = Urb->UrbHeader.UsbdDeviceHandle; - InterlockedDecrement(&DeviceHandle->DeviceHandleLock); - - if (USBPORT_EndpointWorker(Endpoint, 0)) - { - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_WORKER_THREAD); - } - - return DeallocateObjectKeepRegisters; -} - -VOID -NTAPI -USBPORT_FlushMapTransfers(IN PDEVICE_OBJECT FdoDevice) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - PLIST_ENTRY MapTransferList; - PUSBPORT_TRANSFER Transfer; - ULONG NumMapRegisters; - PMDL Mdl; - SIZE_T TransferBufferLength; - ULONG_PTR VirtualAddr; - KIRQL OldIrql; - NTSTATUS Status; - PDMA_OPERATIONS DmaOperations; - - DPRINT_CORE("USBPORT_FlushMapTransfers: ... \n"); - - FdoExtension = FdoDevice->DeviceExtension; - DmaOperations = FdoExtension->DmaAdapter->DmaOperations; - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - while (TRUE) - { - MapTransferList = &FdoExtension->MapTransferList; - - if (IsListEmpty(&FdoExtension->MapTransferList)) - { - KeLowerIrql(OldIrql); - return; - } - - Transfer = CONTAINING_RECORD(MapTransferList->Flink, - USBPORT_TRANSFER, - TransferLink); - - RemoveHeadList(MapTransferList); - - Mdl = Transfer->Urb->UrbControlTransfer.TransferBufferMDL; - TransferBufferLength = Transfer->TransferParameters.TransferBufferLength; - VirtualAddr = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - - NumMapRegisters = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr, - TransferBufferLength); - - Transfer->NumberOfMapRegisters = NumMapRegisters; - - Status = DmaOperations->AllocateAdapterChannel(FdoExtension->DmaAdapter, - FdoDevice, - NumMapRegisters, - USBPORT_MapTransfer, - Transfer); - - if (!NT_SUCCESS(Status)) - ASSERT(FALSE); - } - - KeLowerIrql(OldIrql); -} - -USBD_STATUS -NTAPI -USBPORT_AllocateTransfer(IN PDEVICE_OBJECT FdoDevice, - IN PURB Urb, - IN PUSBPORT_DEVICE_HANDLE DeviceHandle, - IN PIRP Irp, - IN PRKEVENT Event) -{ - PUSBPORT_DEVICE_EXTENSION FdoExtension; - SIZE_T TransferLength; - PMDL Mdl; - ULONG_PTR VirtualAddr; - ULONG PagesNeed = 0; - SIZE_T PortTransferLength; - SIZE_T FullTransferLength; - PUSBPORT_TRANSFER Transfer; - PUSBPORT_PIPE_HANDLE PipeHandle; - USBD_STATUS USBDStatus; - - DPRINT_CORE("USBPORT_AllocateTransfer: FdoDevice - %p, Urb - %p, DeviceHandle - %p, Irp - %p, Event - %p\n", - FdoDevice, - Urb, - DeviceHandle, - Irp, - Event); - - FdoExtension = FdoDevice->DeviceExtension; - - TransferLength = Urb->UrbControlTransfer.TransferBufferLength; - PipeHandle = Urb->UrbControlTransfer.PipeHandle; - - if (TransferLength) - { - Mdl = Urb->UrbControlTransfer.TransferBufferMDL; - VirtualAddr = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - - PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr, - TransferLength); - } - - if (Urb->UrbHeader.Function == URB_FUNCTION_ISOCH_TRANSFER) - { - DPRINT1("USBPORT_AllocateTransfer: ISOCH_TRANSFER UNIMPLEMENTED. FIXME.\n"); - } - - PortTransferLength = sizeof(USBPORT_TRANSFER) + - PagesNeed * sizeof(USBPORT_SCATTER_GATHER_ELEMENT); - - FullTransferLength = PortTransferLength + - FdoExtension->MiniPortInterface->Packet.MiniPortTransferSize; - - Transfer = ExAllocatePoolWithTag(NonPagedPool, - FullTransferLength, - USB_PORT_TAG); - - if (Transfer) - { - RtlZeroMemory(Transfer, FullTransferLength); - - Transfer->Irp = Irp; - Transfer->Urb = Urb; - Transfer->Endpoint = PipeHandle->Endpoint; - Transfer->Event = Event; - Transfer->PortTransferLength = PortTransferLength; - Transfer->FullTransferLength = FullTransferLength; - - Transfer->MiniportTransfer = (PVOID)((ULONG_PTR)Transfer + - PortTransferLength); - - Urb->UrbControlTransfer.hca.Reserved8[0] = Transfer; - Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_TRANSFER; - - USBDStatus = USBD_STATUS_SUCCESS; - } - else - { - USBDStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; - } - - DPRINT_CORE("USBPORT_AllocateTransfer: return USBDStatus - %x\n", - USBDStatus); - - return USBDStatus; -} - -NTSTATUS -NTAPI -USBPORT_Dispatch(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PUSBPORT_COMMON_DEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION IoStack; - NTSTATUS Status = STATUS_SUCCESS; - - DeviceExtension = DeviceObject->DeviceExtension; - IoStack = IoGetCurrentIrpStackLocation(Irp); - - if (DeviceExtension->PnpStateFlags & USBPORT_PNP_STATE_FAILED) - { - DPRINT1("USBPORT_Dispatch: USBPORT_PNP_STATE_FAILED\n"); - DbgBreakPoint(); - } - - switch (IoStack->MajorFunction) - { - case IRP_MJ_DEVICE_CONTROL: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO IRP_MJ_DEVICE_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_PdoDeviceControl(DeviceObject, Irp); - } - else - { - DPRINT("USBPORT_Dispatch: FDO IRP_MJ_DEVICE_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_FdoDeviceControl(DeviceObject, Irp); - } - - break; - - case IRP_MJ_INTERNAL_DEVICE_CONTROL: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO IRP_MJ_INTERNAL_DEVICE_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_PdoInternalDeviceControl(DeviceObject, Irp); - } - else - { - DPRINT("USBPORT_Dispatch: FDO IRP_MJ_INTERNAL_DEVICE_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_FdoInternalDeviceControl(DeviceObject, Irp); - } - - break; - - case IRP_MJ_POWER: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO IRP_MJ_POWER. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_PdoPower(DeviceObject, Irp); - } - else - { - DPRINT("USBPORT_Dispatch: FDO IRP_MJ_POWER. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_FdoPower(DeviceObject, Irp); - } - - break; - - case IRP_MJ_SYSTEM_CONTROL: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO IRP_MJ_SYSTEM_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - DPRINT("USBPORT_Dispatch: FDO IRP_MJ_SYSTEM_CONTROL. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(DeviceExtension->LowerDevice, Irp); - } - - break; - - case IRP_MJ_PNP: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO IRP_MJ_PNP. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_PdoPnP(DeviceObject, Irp); - } - else - { - DPRINT("USBPORT_Dispatch: FDO IRP_MJ_PNP. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - - Status = USBPORT_FdoPnP(DeviceObject, Irp); - } - - break; - - case IRP_MJ_CREATE: - case IRP_MJ_CLOSE: - DPRINT("USBPORT_Dispatch: IRP_MJ_CREATE | IRP_MJ_CLOSE\n"); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - - default: - if (DeviceExtension->IsPDO) - { - DPRINT("USBPORT_Dispatch: PDO unhandled IRP_MJ_???. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - } - else - { - DPRINT("USBPORT_Dispatch: FDO unhandled IRP_MJ_???. Major - %d, Minor - %d\n", - IoStack->MajorFunction, - IoStack->MinorFunction); - } - - Status = STATUS_INVALID_DEVICE_REQUEST; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; - } - - DPRINT("USBPORT_Dispatch: Status - %x\n", Status); - return Status; -} - -ULONG -NTAPI -USBPORT_GetHciMn(VOID) -{ - return USBPORT_HCI_MN; -} - -NTSTATUS -NTAPI -USBPORT_RegisterUSBPortDriver(IN PDRIVER_OBJECT DriverObject, - IN ULONG Version, - IN PUSBPORT_REGISTRATION_PACKET RegPacket) -{ - PUSBPORT_MINIPORT_INTERFACE MiniPortInterface; - - DPRINT("USBPORT_RegisterUSBPortDriver: DriverObject - %p, Version - %p, RegPacket - %p\n", - DriverObject, - Version, - RegPacket); - - DPRINT("USBPORT_RegisterUSBPortDriver: sizeof(USBPORT_MINIPORT_INTERFACE) - %x\n", - sizeof(USBPORT_MINIPORT_INTERFACE)); - - DPRINT("USBPORT_RegisterUSBPortDriver: sizeof(USBPORT_DEVICE_EXTENSION) - %x\n", - sizeof(USBPORT_DEVICE_EXTENSION)); - - if (Version < USB10_MINIPORT_INTERFACE_VERSION) - { - return STATUS_UNSUCCESSFUL; - } - - if (!USBPORT_Initialized) - { - InitializeListHead(&USBPORT_MiniPortDrivers); - InitializeListHead(&USBPORT_USB1FdoList); - InitializeListHead(&USBPORT_USB2FdoList); - - KeInitializeSpinLock(&USBPORT_SpinLock); - USBPORT_Initialized = TRUE; - } - - MiniPortInterface = ExAllocatePoolWithTag(NonPagedPool, - sizeof(USBPORT_MINIPORT_INTERFACE), - USB_PORT_TAG); - if (!MiniPortInterface) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(MiniPortInterface, sizeof(USBPORT_MINIPORT_INTERFACE)); - - MiniPortInterface->DriverObject = DriverObject; - MiniPortInterface->DriverUnload = DriverObject->DriverUnload; - MiniPortInterface->Version = Version; - - ExInterlockedInsertTailList(&USBPORT_MiniPortDrivers, - &MiniPortInterface->DriverLink, - &USBPORT_SpinLock); - - DriverObject->DriverExtension->AddDevice = USBPORT_AddDevice; - DriverObject->DriverUnload = USBPORT_Unload; - - DriverObject->MajorFunction[IRP_MJ_CREATE] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_PNP] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_POWER] = USBPORT_Dispatch; - DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = USBPORT_Dispatch; - - RegPacket->UsbPortDbgPrint = USBPORT_DbgPrint; - RegPacket->UsbPortTestDebugBreak = USBPORT_TestDebugBreak; - RegPacket->UsbPortAssertFailure = USBPORT_AssertFailure; - RegPacket->UsbPortGetMiniportRegistryKeyValue = USBPORT_GetMiniportRegistryKeyValue; - RegPacket->UsbPortInvalidateRootHub = USBPORT_InvalidateRootHub; - RegPacket->UsbPortInvalidateEndpoint = USBPORT_InvalidateEndpoint; - RegPacket->UsbPortCompleteTransfer = USBPORT_MiniportCompleteTransfer; - RegPacket->UsbPortCompleteIsoTransfer = USBPORT_CompleteIsoTransfer; - RegPacket->UsbPortLogEntry = USBPORT_LogEntry; - RegPacket->UsbPortGetMappedVirtualAddress = USBPORT_GetMappedVirtualAddress; - RegPacket->UsbPortRequestAsyncCallback = USBPORT_RequestAsyncCallback; - RegPacket->UsbPortReadWriteConfigSpace = USBPORT_ReadWriteConfigSpace; - RegPacket->UsbPortWait = USBPORT_Wait; - RegPacket->UsbPortInvalidateController = USBPORT_InvalidateController; - RegPacket->UsbPortBugCheck = USBPORT_BugCheck; - RegPacket->UsbPortNotifyDoubleBuffer = USBPORT_NotifyDoubleBuffer; - - RtlCopyMemory(&MiniPortInterface->Packet, - RegPacket, - sizeof(USBPORT_REGISTRATION_PACKET)); - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -DriverEntry(IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) -{ - return STATUS_SUCCESS; -} Modified: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -531,7 +531,7 @@ PIRP irp; KIRQL OldIrql; - DPRINT_CORE("USBPORT_CancelTransferIrp: Irp - %p\n", Irp); + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp); PdoExtension = DeviceObject->DeviceExtension; FdoDevice = PdoExtension->FdoDevice; @@ -549,7 +549,7 @@ Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; Endpoint = Transfer->Endpoint; - DPRINT_CORE("USBPORT_CancelTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", irp, Urb, Transfer); Modified: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -588,7 +588,7 @@ PDEVICE_OBJECT FdoDevice; PUSBPORT_DEVICE_EXTENSION FdoExtension; - DPRINT("USBPORT_SoftInterruptDpc: ... \n"); + DPRINT_INT("USBPORT_SoftInterruptDpc: ... \n"); FdoDevice = DeferredContext; FdoExtension = FdoDevice->DeviceExtension; @@ -606,7 +606,7 @@ PUSBPORT_DEVICE_EXTENSION FdoExtension; LARGE_INTEGER DueTime = {{0, 0}}; - DPRINT("USBPORT_SoftInterrupt: ... \n"); + DPRINT_INT("USBPORT_SoftInterrupt: ... \n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1079,7 +1079,8 @@ FdoExtension = FdoDevice->DeviceExtension; Packet = &FdoExtension->MiniPortInterface->Packet; - DPRINT_INT("USBPORT_InterruptService: FdoExtension->Flags - %lx\n", + DPRINT_INT("USBPORT_InterruptService: FdoExtension[%p]->Flags - %08X\n", + FdoExtension, FdoExtension->Flags); if (FdoExtension->Flags & USBPORT_FLAG_INTERRUPT_ENABLED && @@ -1936,7 +1937,7 @@ //MiniPortInterface->DriverUnload(DriverObject); // Call MiniPort _HCI_Unload } -ULONG +VOID NTAPI USBPORT_MiniportCompleteTransfer(IN PVOID MiniPortExtension, IN PVOID MiniPortEndpoint, @@ -1969,18 +1970,7 @@ &Transfer->TransferLink, &FdoExtension->DoneTransferSpinLock); - return KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); -} - -ULONG -NTAPI -USBPORT_CompleteIsoTransfer(IN PVOID MiniPortExtension, - IN PVOID MiniPortEndpoint, - IN PVOID TransferParameters, - IN ULONG TransferLength) -{ - DPRINT1("USBPORT_CompleteIsoTransfer: UNIMPLEMENTED. FIXME.\n"); - return 0; + KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); } VOID @@ -2309,7 +2299,7 @@ do { - ElementLength = 0x1000 - (PhAddress.LowPart & 0xFFF); + ElementLength = PAGE_SIZE - (PhAddress.LowPart & (PAGE_SIZE - 1)); if (ElementLength > SgCurrentLength) ElementLength = SgCurrentLength; @@ -2331,9 +2321,9 @@ } while (SgCurrentLength); - if ((PhAddr.LowPart == PhAddress.LowPart) && - (PhAddr.HighPart == PhAddress.HighPart)) - { + if (PhAddr.QuadPart == PhAddress.QuadPart) + { + DPRINT1("USBPORT_MapTransfer: PhAddr == PhAddress\n"); ASSERT(FALSE); } Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -862,6 +862,22 @@ IN PDEVICE_OBJECT RootHubPdo, IN PUNICODE_STRING DestinationString); +/* iso.c */ +USBD_STATUS +NTAPI +USBPORT_InitializeIsoTransfer( + IN PDEVICE_OBJECT FdoDevice, + IN struct _URB_ISOCH_TRANSFER * Urb, + IN PUSBPORT_TRANSFER Transfer); + +ULONG +NTAPI +USBPORT_CompleteIsoTransfer( + IN PVOID MiniPortExtension, + IN PVOID MiniPortEndpoint, + IN PVOID TransferParameters, + IN ULONG TransferLength); + /* pnp.c */ NTSTATUS NTAPI Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Sat Sep 2 22:48:45 2017 @@ -43,7 +43,7 @@ typedef struct _USBPORT_RESOURCES { ULONG ResourcesTypes; - ULONG HcFlavor; + USB_CONTROLLER_FLAVOR HcFlavor; ULONG InterruptVector; KIRQL InterruptLevel; UCHAR Padded1[3]; @@ -364,7 +364,7 @@ PVOID, PVOID); -typedef ULONG +typedef VOID (NTAPI *PUSBPORT_COMPLETE_TRANSFER)( PVOID, PVOID, @@ -581,6 +581,8 @@ C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 32 + 76 * sizeof(PVOID)); #define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device +#define USBPORT_MAX_DEVICE_ADDRESS 127 + typedef struct _USBPORT_ENDPOINT_PROPERTIES { USHORT DeviceAddress; USHORT EndpointAddress;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs