Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75914: [KERNEL32] Rewrite SetFileAttributesW() to make it W2K3 compliant. Notable improvements: - Supports reparse points - Doesn't query attributes to set them (speedup!) This fixes ...
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 16:13:15 2017 New Revision: 75914 URL: http://svn.reactos.org/svn/reactos?rev=75914&view=rev Log: [KERNEL32] Rewrite SetFileAttributesW() to make it W2K3 compliant. Notable improvements: - Supports reparse points - Doesn't query attributes to set them (speedup!) This fixes a few failures in tests committed in r75236. CORE-13495 Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] Wed Sep 20 16:13:15 2017 @@ -897,81 +897,104 @@ /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI SetFileAttributesW(LPCWSTR lpFileName, - DWORD dwFileAttributes) -{ - FILE_BASIC_INFORMATION FileInformation; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING FileName; - HANDLE FileHandle; - NTSTATUS Status; - - TRACE ("SetFileAttributeW(%S, 0x%lx) called\n", lpFileName, dwFileAttributes); - - /* Validate and translate the filename */ - if (!RtlDosPathNameToNtPathName_U (lpFileName, - &FileName, - NULL, - NULL)) - { - WARN ("Invalid path\n"); - SetLastError (ERROR_BAD_PATHNAME); - return FALSE; - } - TRACE ("FileName: \'%wZ\'\n", &FileName); - - /* build the object attributes */ - InitializeObjectAttributes (&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - /* Open the file */ - Status = NtOpenFile (&FileHandle, - SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeUnicodeString (&FileName); - if (!NT_SUCCESS (Status)) - { - WARN ("NtOpenFile() failed (Status %lx)\n", Status); - BaseSetLastNTError (Status); - return FALSE; - } - - Status = NtQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileInformation, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - WARN ("SetFileAttributes NtQueryInformationFile failed with status 0x%08x\n", Status); - NtClose (FileHandle); - BaseSetLastNTError (Status); - return FALSE; - } - - FileInformation.FileAttributes = dwFileAttributes; - Status = NtSetInformationFile(FileHandle, - &IoStatusBlock, - &FileInformation, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - NtClose (FileHandle); - if (!NT_SUCCESS(Status)) - { - WARN ("SetFileAttributes NtSetInformationFile failed with status 0x%08x\n", Status); - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; + DWORD dwFileAttributes) +{ + NTSTATUS Status; + PWSTR PathUBuffer; + HANDLE FileHandle; + UNICODE_STRING NtPathU; + IO_STATUS_BLOCK IoStatusBlock; + RTL_RELATIVE_NAME_U RelativeName; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_BASIC_INFORMATION FileInformation; + + /* Get relative name */ + if (!RtlDosPathNameToRelativeNtPathName_U(lpFileName, &NtPathU, NULL, &RelativeName)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Save buffer to allow later freeing */ + PathUBuffer = NtPathU.Buffer; + + /* If we have relative name (and root dir), use them instead */ + if (RelativeName.RelativeName.Length != 0) + { + NtPathU.Length = RelativeName.RelativeName.Length; + NtPathU.MaximumLength = RelativeName.RelativeName.MaximumLength; + NtPathU.Buffer = RelativeName.RelativeName.Buffer; + } + else + { + RelativeName.ContainingDirectory = NULL; + } + + /* Prepare the object attribute for opening the file */ + InitializeObjectAttributes(&ObjectAttributes, &NtPathU, + OBJ_CASE_INSENSITIVE, + RelativeName.ContainingDirectory, NULL); + + /* Attempt to open the file, while supporting reparse point */ + Status = NtOpenFile(&FileHandle, FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_REPARSE_POINT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT); + /* If opening failed, check whether it was because of reparse point support */ + if (!NT_SUCCESS(Status)) + { + /* Nope, just quit */ + if (Status != STATUS_INVALID_PARAMETER) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + BaseSetLastNTError(Status); + + return FALSE; + } + + /* Yes, retry without */ + Status = NtOpenFile(&FileHandle, FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + BaseSetLastNTError(Status); + + return FALSE; + } + } + + /* We don't need strings anylonger */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathUBuffer); + + /* Zero our structure, we'll only set file attributes */ + ZeroMemory(&FileInformation, sizeof(FileInformation)); + /* Set the attributes, filtering only allowed attributes, and forcing normal attribute */ + FileInformation.FileAttributes = (dwFileAttributes & FILE_ATTRIBUTE_VALID_SET_FLAGS) | FILE_ATTRIBUTE_NORMAL; + + /* Finally, set the attributes */ + Status = NtSetInformationFile(FileHandle, &IoStatusBlock, &FileInformation, + sizeof(FILE_BASIC_INFORMATION), FileBasicInformation); + /* Close the file */ + NtClose(FileHandle); + + /* If it failed, set the error and fail */ + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + + return FALSE; + } + + return TRUE; } /*

1 0

[pschweitzer] 75913: [FSUTIL] Implement fsutil volume diskfree
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 11:41:28 2017 New Revision: 75913 URL: http://svn.reactos.org/svn/reactos?rev=75913&view=rev Log: [FSUTIL] Implement fsutil volume diskfree Modified: trunk/reactos/base/applications/cmdutils/fsutil/volume.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] Wed Sep 20 11:41:28 2017 @@ -10,10 +10,12 @@ /* Add handlers here for subcommands */ static HandlerProc DismountMain; +static HandlerProc DiskFreeMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ { DismountMain, _T("dismount"), _T("Dismounts a volume") }, + { DiskFreeMain, _T("diskfree"), _T("Prints free space on a volume") }, }; static int @@ -80,6 +82,32 @@ return 0; } +static int +DiskFreeMain(int argc, const TCHAR *argv[]) +{ + ULARGE_INTEGER FreeAvail, TotalNumber, TotalNumberFree; + + /* We need a path */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil volume diskfree <volume path>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil volume diskfree c:\n")); + return 1; + } + + if (!GetDiskFreeSpaceEx(argv[1], &FreeAvail, &TotalNumber, &TotalNumberFree)) + { + PrintErrorMessage(GetLastError()); + return 1; + } + + _ftprintf(stdout, _T("Total free bytes\t\t: %I64i\n"), TotalNumberFree.QuadPart); + _ftprintf(stdout, _T("Total bytes\t\t\t: %I64i\n"), TotalNumber.QuadPart); + _ftprintf(stdout, _T("Total free available bytes\t: %I64i\n"), FreeAvail.QuadPart); + + return 0; +} + static void PrintUsage(const TCHAR * Command) {

1 0

[ekohl] 75912: explorer: Improve Japanese resource Patch by Katayama Hirofumi MZ. CORE-13809
by ekohl＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: ekohl Date: Wed Sep 20 10:35:55 2017 New Revision: 75912 URL: http://svn.reactos.org/svn/reactos?rev=75912&view=rev Log: explorer: Improve Japanese resource Patch by Katayama Hirofumi MZ. CORE-13809 Modified: trunk/reactos/base/shell/explorer/lang/ja-JP.rc Modified: trunk/reactos/base/shell/explorer/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/j… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/ja-JP.rc [iso-8859-1] Wed Sep 20 10:35:55 2017 @@ -5,19 +5,19 @@ POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF - MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "ç¾å¨æ¥æã®ä¿®æ£(&A)", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "éç¥ãã«ã¹ã¿ãã¤ãº(&C)...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM SEPARATOR + MENUITEM "éãã¦è¡¨ç¤º(&S)", ID_SHELL_CMD_CASCADE_WND + MENUITEM "ã¦ã£ã³ãã¦ãä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_SHELL_CMD_TILE_WND_H + MENUITEM "ã¦ã£ã³ãã¦ãå·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&E)", ID_SHELL_CMD_TILE_WND_V + MENUITEM "ãã¹ã¯ãããã®è¡¨ç¤º(&S)", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "åã«æ»ã(&U)", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "ã¿ã¹ã¯ ããã¼ã¸ã£", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR MENUITEM "ã¿ã¹ã¯ ãã¼ãåºå®ãã(&L)", ID_LOCKTASKBAR - MENUITEM "ããããã£(R)", ID_SHELL_CMD_PROPERTIES + MENUITEM "ããããã£(&R)", ID_SHELL_CMD_PROPERTIES END END @@ -100,88 +100,88 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 - LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 +CAPTION "éç¥ã®ã«ã¹ã¿ãã¤ãº" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + LTEXT "ReactOS ã¯ãã¢ã¯ãã£ãã§ç·æ¥ãªéç¥ã«å¯¾ãã¦ã¢ã¤ã³ã³ãè¡¨ç¤ºããéã¢ã¯ãã£ããªãã®ãé ãã¾ããä»¥ä¸ã®ãªã¹ãã®ä¸ã®é ç®ã«å¯¾ãã¦ãã®åä½ãå¤æ´ã§ãã¾ãã", IDC_STATIC, 6, 6, 220, 30 + LTEXT "é ç®ãé¸æããéç¥ã®åä½ãé¸ãã§ä¸ãã:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 50, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS - PUSHBUTTON "&Restore Defaults", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + PUSHBUTTON "è¦å®å¤ã«æ»ã(&R)", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 176, 220, 50, 14 END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 +CAPTION "ã¯ã©ã·ãã¯ ã¹ã¿ã¼ãã¡ãã¥ã¼ã®ã«ã¹ã¿ãã¤ãº" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +{ + GROUPBOX "ã¹ã¿ã¼ãã¡ãã¥ã¼", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 - LTEXT "You can customize your Start menu by adding or removing items.", IDC_STATIC, 48, 17, 108, 39 - PUSHBUTTON "A&dd...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 - PUSHBUTTON "&Remove...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 - PUSHBUTTON "Ad&vanced", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 - PUSHBUTTON "&Sort", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + LTEXT "ã¹ã¿ã¼ãã¡ãã¥ã¼ã«é ç®ãè¿½å ã¾ãã¯åé¤ãã¦ãã«ã¹ã¿ãã¤ãºã§ãã¾ãã", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "è¿½å (&D)...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "åé¤(&R)...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "ä¸ç´èåã(&V)", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "ä¸¦ã¹æ¿ã(&S)", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 - LTEXT "To remove records of recently accessed documents, programs, and Web sites, click Clear.", IDC_STATIC, 49, 85, 108, 33 - PUSHBUTTON "&Clear", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 - LTEXT "Advanced S&tart menu options:", IDC_STATIC, 8, 129, 150, 8 + LTEXT "æè¿ã¢ã¯ã»ã¹ããææ¸ãããã°ã©ã ãWebãµã¤ãã®è¨é²ãæ¶ãã«ã¯ã[ã¯ãªã¢] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "ã¯ãªã¢(&C)", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "ä¸ç´èåãã¹ã¿ã¼ãã¡ãã¥ã¼ã®ãªãã·ã§ã³(&T):", IDC_STATIC, 8, 129, 150, 8 CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE DEFPUSHBUTTON "OK", IDOK, 122, 220, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 176, 220, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 176, 220, 50, 14 } IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 +CAPTION "ãã¡ã¤ã«åã®è¦å" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +{ + DEFPUSHBUTTON "ç¡è¦(&I)", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "ååã®å¤æ´(&R)", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "èµ·åæã«ãã®ãã§ãã¯ãè¡ããªã(&D)", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "'%s' ã¨ããååã®ä¸æ£ãªååã®ãã¡ã¤ã«ã¾ãã¯ãã©ã«ãããããããã¢ããªã±ã¼ã·ã§ã³ãæ©è½ããªãããç¥ãã¾ããã'%s' ã®ååãå¤æ´ããã°ããã®åé¡ã¯ä¿®æ£ããã¾ããä»ããååãå¤æ´ãããã§ããï¼", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -CAPTION "Advanced" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 - AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 - AUTOCHECKBOX "Highlight &newly installed programs", IDC_HIGHLIGHT, 14, 35, 224, 10 - LTEXT "Start &menu items:", IDC_STATIC, 7, 53, 238, 8 +CAPTION "ä¸ç´èåã" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +{ + GROUPBOX "ã¹ã¿ã¼ãã¡ãã¥ã¼ã®è¨å® ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "ãã¦ã¹ã§ä¸å®æéãµãã¡ãã¥ã¼ã«ã¨ã©ã¾ãã°ããããéãã¾ã(&O)", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "æ°ããã¤ã³ã¹ãã¼ã«ããããã°ã©ã ãå¼·èª¿è¡¨ç¤ºãã¾ã(&N)", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "ã¹ã¿ã¼ãã¡ãã¥ã¼ã®é ç®(&M):", IDC_STATIC, 7, 53, 238, 8 CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE - GROUPBOX "Recent documents ", IDC_STATIC, 7, 133, 238, 56 - LTEXT "Select this option to provide quick access to the documents you opened most recently. Clearing this list does not delete the documents.", IDC_STATIC, 14, 144, 224, 21 - AUTOCHECKBOX "List my most &recently opened documents", IDC_RECENTLY, 14, 168, 147, 10 - PUSHBUTTON "&Clear List", IDC_CLEAR, 182, 168, 55, 14 + GROUPBOX "æè¿ã®ææ¸ ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "æè¿éããææ¸ã¸ã®ç´ æ©ãã¢ã¯ã»ã¹ã®ããã«ããã®ãªãã·ã§ã³ãé¸æãã¦ä¸ããããã®ãªã¹ããã¯ãªã¢ãã¦ãææ¸ãåé¤ãã¾ããã", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "æè¿éããææ¸ããªã¹ãã¢ãããã(&R)", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "ãªã¹ãã®ã¯ãªã¢(&C)", IDC_CLEAR, 182, 168, 55, 14 } IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME CAPTION "General" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 +FONT 9, "MS UI Gothic", 0, 0, 0x1 +{ + GROUPBOX "ããã°ã©ã ã®ã¢ã¤ã³ã³ãµã¤ãºãé¸æ ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE ICON IDC_SMALLICON, 151, 18, 20, 20, SS_CENTERIMAGE - AUTORADIOBUTTON "&Large icons", IDC_CHOOSELARGE, 43, 25, 53, 10 - AUTORADIOBUTTON "&Small icons", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP - GROUPBOX "Programs ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "The Start menu contains shortcuts to the programs you use most often. Clearing the list of shortcuts does not delete the programs.", IDC_STATIC, 14, 63, 224, 20 - LTEXT "&Number of programs on Start menu:", IDC_STATIC, 14, 86, 112, 8 + AUTORADIOBUTTON "å¤§ããªã¢ã¤ã³ã³(&L)", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "å°ããªã¢ã¤ã³ã³(&S)", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "ããã°ã©ã ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "ã¹ã¿ã¼ãã¡ãã¥ã¼ã¯ãããä½¿ãããã°ã©ã ã¸ã®ã·ã§ã¼ãã«ãããè¡¨ç¤ºããã¾ããã·ã§ã¼ãã«ããã®ãªã¹ããã¯ãªã¢ãã¦ããããã°ã©ã ã¯åé¤ããã¾ããã", IDC_STATIC, 14, 63, 224, 20 + LTEXT "ã¹ã¿ã¼ãã¡ãã¥ã¼ã«è¡¨ç¤ºããããã°ã©ã ã®åæ°(&N):", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Clear List", IDC_CLEARLIST, 182, 98, 57, 14 - GROUPBOX "Show on Start menu ", IDC_STATIC, 7, 126, 238, 63 - AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 + PUSHBUTTON "ãªã¹ããã¯ãªã¢ãã(&C)", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "ã¹ã¿ã¼ãã¡ãã¥ã¼ã«è¡¨ç¤º ", IDC_STATIC, 7, 126, 238, 63 + AUTOCHECKBOX "ã¤ã³ã¿ã¼ããã(&I):", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL - AUTOCHECKBOX "&E-mail:", IDC_SHOWEMAIL, 14, 157, 37, 10 + AUTOCHECKBOX "é»åã¡ã¼ã«(&E):", IDC_SHOWEMAIL, 14, 157, 37, 10 COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL } @@ -191,7 +191,7 @@ IDS_PROPERTIES "ããããã£(&R)" IDS_OPEN_ALL_USERS "éã - All Users(&P)" IDS_EXPLORE_ALL_USERS "ã¨ã¯ã¹ããã¼ã© - All Users(&E)" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "ã·ã¹ãã ã¯ãã¨ã¯ã¹ããã¼ã©ãèµ·åã§ãã¾ãããã¬ã¸ã¹ããªãå£ãã¦ããããå©ç¨ä¸å¯ã ããã§ãã" END STRINGTABLE

1 0

[pschweitzer] 75911: [VFATLIB] Fix a really bad bug in VfatChkdsk(), the routine used to check a volume: In case readwrite is enabled (ie, volume fixing is allowed), when the volume is opened, it i...
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 08:45:28 2017 New Revision: 75911 URL: http://svn.reactos.org/svn/reactos?rev=75911&view=rev Log: [VFATLIB] Fix a really bad bug in VfatChkdsk(), the routine used to check a volume: In case readwrite is enabled (ie, volume fixing is allowed), when the volume is opened, it is also locked. If the volume has the clean shutdown bit and is to be checked only if that one is not set, then the volume lock is leaked. This makes the volume then totally unusable later on (any later open will fail). Because r75772 fixed volume locking on non-system partition, this totally broke (access denied) any secondary FAT volume in ROS. Now, we just properly release the lock when required, also made a comment more explicit to avoid later bugs like that. CORE-13805 Modified: trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/fslib/vfatlib/vfat… ============================================================================== --- trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Wed Sep 20 08:45:28 2017 @@ -402,11 +402,15 @@ verify = TRUE; salvage_files = TRUE; - /* Open filesystem */ + /* Open filesystem and lock it */ fs_open(DriveRoot, FsCheckFlags & FSCHECK_READ_WRITE); if (CheckOnlyIfDirty && !fs_isdirty()) { + /* Unlock volume if required */ + if (FsCheckFlags & FSCHECK_READ_WRITE) + fs_lock(FALSE); + /* No need to check FS */ return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); }

1 0

[pschweitzer] 75910: [FSUTIL] Implement fsutil volume dismount CORE-13805
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 08:15:10 2017 New Revision: 75910 URL: http://svn.reactos.org/svn/reactos?rev=75910&view=rev Log: [FSUTIL] Implement fsutil volume dismount CORE-13805 Added: trunk/reactos/base/applications/cmdutils/fsutil/volume.c (with props) Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -4,6 +4,7 @@ fsinfo.c fsutil.c hardlink.c + volume.c fsutil.h) add_executable(fsutil ${SOURCE} fsutil.rc) set_module_type(fsutil win32cui UNICODE) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -12,12 +12,14 @@ HandlerProc DirtyMain; HandlerProc FsInfoMain; HandlerProc HardLinkMain; +HandlerProc VolumeMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") }, { FsInfoMain, _T("fsinfo"), _T("Gathers informations about file systems") }, { HardLinkMain, _T("hardlink"), _T("Handles hard links") }, + { VolumeMain, _T("volume"), _T("Manages volumes") }, }; static void Added: trunk/reactos/base/applications/cmdutils/fsutil/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/volume.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] Wed Sep 20 08:15:10 2017 @@ -0,0 +1,96 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/volume.c + * PURPOSE: FSutil volumes management + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "fsutil.h" + +/* Add handlers here for subcommands */ +static HandlerProc DismountMain; +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { DismountMain, _T("dismount"), _T("Dismounts a volume") }, +}; + +static int +LockOrUnlockVolume(HANDLE Volume, BOOLEAN Lock) +{ + DWORD Operation; + ULONG BytesRead; + + Operation = (Lock ? FSCTL_LOCK_VOLUME : FSCTL_UNLOCK_VOLUME); + if (DeviceIoControl(Volume, Operation, NULL, 0, NULL, 0, + &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + return 1; + } + + return 0; +} + +static int +DismountMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + ULONG BytesRead; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil volume dismount <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil volume dismount d:\n")); + return 1; + } + + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); + if (Volume == INVALID_HANDLE_VALUE) + { + return 1; + } + + /* Attempt to lock the volume */ + if (LockOrUnlockVolume(Volume, TRUE)) + { + CloseHandle(Volume); + return 1; + } + + /* Issue the dismount command */ + if (DeviceIoControl(Volume, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, + 0, &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + LockOrUnlockVolume(Volume, FALSE); + CloseHandle(Volume); + return 1; + } + + /* Unlock and quit */ + LockOrUnlockVolume(Volume, FALSE); + CloseHandle(Volume); + + _ftprintf(stdout, _T("The %s volume has been dismounted\n"), argv[1]); + + return 0; +} + +static void +PrintUsage(const TCHAR * Command) +{ + PrintDefaultUsage(_T(" VOLUME "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); +} + +int +VolumeMain(int argc, const TCHAR *argv[]) +{ + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/volume.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 75909: [FSUTIL] Define handlers type
by pschweitzer＠svn.reactos.org 20 Sep '17

20 Sep '17

Author: pschweitzer Date: Wed Sep 20 07:50:48 2017 New Revision: 75909 URL: http://svn.reactos.org/svn/reactos?rev=75909&view=rev Log: [FSUTIL] Define handlers type Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -10,8 +10,8 @@ #include <winioctl.h> /* Add handlers here for subcommands */ -static int QueryMain(int argc, const TCHAR *argv[]); -static int SetMain(int argc, const TCHAR *argv[]); +static HandlerProc QueryMain; +static HandlerProc SetMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int DrivesMain(int argc, const TCHAR *argv[]); -static int DriveTypeMain(int argc, const TCHAR *argv[]); -static int VolumeInfoMain(int argc, const TCHAR *argv[]); +static HandlerProc DrivesMain; +static HandlerProc DriveTypeMain; +static HandlerProc VolumeInfoMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,9 +9,9 @@ #include "fsutil.h" /* Add handlers here for commands */ -int DirtyMain(int argc, const TCHAR *argv[]); -int FsInfoMain(int argc, const TCHAR *argv[]); -int HardLinkMain(int argc, const TCHAR *argv[]); +HandlerProc DirtyMain; +HandlerProc FsInfoMain; +HandlerProc HardLinkMain; static HandlerItem HandlersList[] = { /* Proc, name, help */ Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -5,9 +5,12 @@ #include <tchar.h> #include <stdio.h> +typedef int (HandlerProc)(int argc, const TCHAR *argv[]); +typedef HandlerProc * pHandlerProc; + typedef struct { - int (*Handler)(int argc, const TCHAR *argv[]); + pHandlerProc Handler; const TCHAR * Command; const TCHAR * Desc; } HandlerItem; Modified: trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/hardlink.c [iso-8859-1] Wed Sep 20 07:50:48 2017 @@ -9,7 +9,7 @@ #include "fsutil.h" /* Add handlers here for subcommands */ -static int CreateMain(int argc, const TCHAR *argv[]); +static HandlerProc CreateMain; static HandlerItem HandlersList[] = { /* Proc, name, help */

1 0

[pschweitzer] 75908: [FASTFAT] Only perform dismount check on close/cleanup for volume opening. This prevents random dismounts and fixes 1st stage when ENABLE_SWAPOUT is enabled in FastFAT (disable...
by pschweitzer＠svn.reactos.org 19 Sep '17

19 Sep '17

Author: pschweitzer Date: Tue Sep 19 21:19:55 2017 New Revision: 75908 URL: http://svn.reactos.org/svn/reactos?rev=75908&view=rev Log: [FASTFAT] Only perform dismount check on close/cleanup for volume opening. This prevents random dismounts and fixes 1st stage when ENABLE_SWAPOUT is enabled in FastFAT (disabled by default). CORE-13805 Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/close.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Tue Sep 19 21:19:55 2017 @@ -25,6 +25,7 @@ { PVFATFCB pFcb; PVFATCCB pCcb; + BOOLEAN IsVolume; PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; PFILE_OBJECT FileObject = IrpContext->FileObject; @@ -36,7 +37,8 @@ if (!pFcb) return STATUS_SUCCESS; - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); + if (IsVolume) { pFcb->OpenHandleCount--; @@ -145,7 +147,7 @@ } #ifdef ENABLE_SWAPOUT - if (BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) + if (IsVolume && BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) { VfatCheckForDismount(DeviceExt, FALSE); } Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Tue Sep 19 21:19:55 2017 @@ -25,6 +25,7 @@ { PVFATFCB pFcb; PVFATCCB pCcb; + BOOLEAN IsVolume; NTSTATUS Status = STATUS_SUCCESS; DPRINT("VfatCloseFile(DeviceExt %p, FileObject %p)\n", @@ -39,7 +40,8 @@ return STATUS_SUCCESS; } - if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); + if (IsVolume) { DPRINT("Volume\n"); FileObject->FsContext2 = NULL; @@ -59,7 +61,7 @@ } #ifdef ENABLE_SWAPOUT - if (DeviceExt->OpenHandleCount == 0) + if (IsVolume && DeviceExt->OpenHandleCount == 0) { VfatCheckForDismount(DeviceExt, FALSE); }

1 0

[tfaber] 75907: [USBPORT] - Simplify some loops in USBPORT_OpenInterface. No logical changes
by tfaber＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: tfaber Date: Mon Sep 18 12:01:12 2017 New Revision: 75907 URL: http://svn.reactos.org/svn/reactos?rev=75907&view=rev Log: [USBPORT] - Simplify some loops in USBPORT_OpenInterface. No logical changes Modified: trunk/reactos/drivers/usb/usbport/device.c Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Mon Sep 18 12:01:12 2017 @@ -304,17 +304,12 @@ RtlZeroMemory(InterfaceHandle, HandleLength); - if (NumEndpoints > 0) - { - PipeHandle = &InterfaceHandle->PipeHandle[0]; - - for (ix = 0; ix < NumEndpoints; ++ix) - { - PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; - PipeHandle->Endpoint = NULL; - - PipeHandle += 1; - } + for (ix = 0; ix < NumEndpoints; ++ix) + { + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; + PipeHandle->Endpoint = NULL; } IsAllocated = TRUE; @@ -335,79 +330,71 @@ Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (NumEndpoints) - { - PipeHandle = &InterfaceHandle->PipeHandle[0]; - + for (ix = 0; ix < NumEndpoints; ++ix) + { + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) + { + if (Descriptor->bLength == 0) + { + break; + } + else + { + Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + + Descriptor->bLength); + } + } + + if (InterfaceInfo->Pipes[ix].PipeFlags & USBD_PF_CHANGE_MAX_PACKET) + { + Descriptor->wMaxPacketSize = InterfaceInfo->Pipes[ix].MaximumPacketSize; + } + + RtlCopyMemory(&PipeHandle->EndpointDescriptor, + Descriptor, + sizeof(USB_ENDPOINT_DESCRIPTOR)); + + PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; + PipeHandle->PipeFlags = InterfaceInfo->Pipes[ix].PipeFlags; + PipeHandle->Endpoint = NULL; + + wMaxPacketSize = Descriptor->wMaxPacketSize; + + /* USB 2.0 Specification, 5.9 High-Speed, High Bandwidth Endpoints */ + MaxPacketSize = (wMaxPacketSize & 0x7FF) * (((wMaxPacketSize >> 11) & 3) + 1); + + InterfaceInfo->Pipes[ix].EndpointAddress = Descriptor->bEndpointAddress; + InterfaceInfo->Pipes[ix].PipeType = Descriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK; + InterfaceInfo->Pipes[ix].MaximumPacketSize = MaxPacketSize; + InterfaceInfo->Pipes[ix].PipeHandle = (USBD_PIPE_HANDLE)-1; + InterfaceInfo->Pipes[ix].Interval = Descriptor->bInterval; + + Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + + Descriptor->bLength); + } + + if (USBD_SUCCESS(USBDStatus)) + { for (ix = 0; ix < NumEndpoints; ++ix) { - while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) - { - if (Descriptor->bLength == 0) - { - break; - } - else - { - Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + - Descriptor->bLength); - } - } - - if (InterfaceInfo->Pipes[ix].PipeFlags & USBD_PF_CHANGE_MAX_PACKET) - { - Descriptor->wMaxPacketSize = InterfaceInfo->Pipes[ix].MaximumPacketSize; - } - - RtlCopyMemory(&PipeHandle->EndpointDescriptor, - Descriptor, - sizeof(USB_ENDPOINT_DESCRIPTOR)); - - PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; - PipeHandle->PipeFlags = InterfaceInfo->Pipes[ix].PipeFlags; - PipeHandle->Endpoint = NULL; - - wMaxPacketSize = Descriptor->wMaxPacketSize; - - /* USB 2.0 Specification, 5.9 High-Speed, High Bandwidth Endpoints */ - MaxPacketSize = (wMaxPacketSize & 0x7FF) * (((wMaxPacketSize >> 11) & 3) + 1); - - InterfaceInfo->Pipes[ix].EndpointAddress = Descriptor->bEndpointAddress; - InterfaceInfo->Pipes[ix].PipeType = Descriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK; - InterfaceInfo->Pipes[ix].MaximumPacketSize = MaxPacketSize; - InterfaceInfo->Pipes[ix].PipeHandle = (USBD_PIPE_HANDLE)-1; - InterfaceInfo->Pipes[ix].Interval = Descriptor->bInterval; - - Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)Descriptor + - Descriptor->bLength); - - PipeHandle += 1; - } - } - - if (USBD_SUCCESS(USBDStatus)) - { + PipeInfo = &InterfaceInfo->Pipes[ix]; + PipeHandle = &InterfaceHandle->PipeHandle[ix]; + + Status = USBPORT_OpenPipe(FdoDevice, + DeviceHandle, + PipeHandle, + &USBDStatus); + + if (!NT_SUCCESS(Status)) + break; + + PipeInfo->PipeHandle = PipeHandle; + } + if (NumEndpoints) { - PipeInfo = &InterfaceInfo->Pipes[0]; - PipeHandle = &InterfaceHandle->PipeHandle[0]; - - for (ix = 0; ix < NumEndpoints; ++ix) - { - Status = USBPORT_OpenPipe(FdoDevice, - DeviceHandle, - PipeHandle, - &USBDStatus); - - if (!NT_SUCCESS(Status)) - break; - - PipeInfo->PipeHandle = PipeHandle; - - PipeHandle += 1; - PipeInfo += 1; - } - USBPORT_USBDStatusToNtStatus(Urb, USBDStatus); } } @@ -847,7 +834,7 @@ PipeHandleList = PipeHandleList->Flink; - if (!(PipeHandle->Flags & PIPE_HANDLE_FLAG_NULL_PACKET_SIZE) && + if (!(PipeHandle->Flags & PIPE_HANDLE_FLAG_NULL_PACKET_SIZE) && USBPORT_EndpointHasQueuedTransfers(FdoDevice, PipeHandle->Endpoint, NULL)) { return TRUE;

1 0

[tfaber] 75906: [USBPORT] - Rename NumInterfaces to NumEndpoints in USBPORT_OpenInterface
by tfaber＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: tfaber Date: Mon Sep 18 11:50:42 2017 New Revision: 75906 URL: http://svn.reactos.org/svn/reactos?rev=75906&view=rev Log: [USBPORT] - Rename NumInterfaces to NumEndpoints in USBPORT_OpenInterface Modified: trunk/reactos/drivers/usb/usbport/device.c Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Mon Sep 18 11:50:42 2017 @@ -256,7 +256,7 @@ PUSBPORT_PIPE_HANDLE PipeHandle; PUSB_ENDPOINT_DESCRIPTOR Descriptor; PUSBD_PIPE_INFORMATION PipeInfo; - ULONG NumInterfaces; + ULONG NumEndpoints; SIZE_T Length; SIZE_T HandleLength; BOOLEAN IsAllocated = FALSE; @@ -273,10 +273,10 @@ InterfaceInfo->AlternateSetting, &InterfaceInfo->AlternateSetting); - NumInterfaces = InterfaceDescriptor->bNumEndpoints; + NumEndpoints = InterfaceDescriptor->bNumEndpoints; Length = sizeof(USBD_INTERFACE_INFORMATION) + - (NumInterfaces - 1) * sizeof(USBD_PIPE_INFORMATION); + (NumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); if (InterfaceInfo->AlternateSetting && IsSetInterface) { @@ -290,7 +290,7 @@ else { HandleLength = sizeof(USBPORT_INTERFACE_HANDLE) + - (NumInterfaces - 1) * sizeof(USBPORT_PIPE_HANDLE); + (NumEndpoints - 1) * sizeof(USBPORT_PIPE_HANDLE); InterfaceHandle = ExAllocatePoolWithTag(NonPagedPool, HandleLength, @@ -304,11 +304,11 @@ RtlZeroMemory(InterfaceHandle, HandleLength); - if (NumInterfaces > 0) + if (NumEndpoints > 0) { PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { PipeHandle->Flags = PIPE_HANDLE_FLAG_CLOSED; PipeHandle->Endpoint = NULL; @@ -335,11 +335,11 @@ Descriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); - if (NumInterfaces) + if (NumEndpoints) { PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { while (Descriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE) { @@ -387,12 +387,12 @@ if (USBD_SUCCESS(USBDStatus)) { - if (NumInterfaces) + if (NumEndpoints) { PipeInfo = &InterfaceInfo->Pipes[0]; PipeHandle = &InterfaceHandle->PipeHandle[0]; - for (ix = 0; ix < NumInterfaces; ++ix) + for (ix = 0; ix < NumEndpoints; ++ix) { Status = USBPORT_OpenPipe(FdoDevice, DeviceHandle, @@ -424,7 +424,7 @@ { if (InterfaceHandle) { - if (NumInterfaces) + if (NumEndpoints) { DPRINT1("USBPORT_OpenInterface: USBDStatus - %lx\n", USBDStatus); }

1 0

[dquintana] 75905: * The work has been merged to trunk, this branch is now obsolete.
by dquintana＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: dquintana Date: Mon Sep 18 08:49:20 2017 New Revision: 75905 URL: http://svn.reactos.org/svn/reactos?rev=75905&view=rev Log: * The work has been merged to trunk, this branch is now obsolete. Removed: branches/GSoC_2017/rapps/

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