Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 01/01: [DISKPART] Improve the command table to support subcommands and start work on the create command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=566e8989c311d20e3ae04… commit 566e8989c311d20e3ae04fd580fcc6a2fc2cebc5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 15 12:27:53 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 15 12:27:53 2022 +0200 [DISKPART] Improve the command table to support subcommands and start work on the create command - Extend the command table to support subcommands. - Get rid of the existing subcommand code. - Use the new subcommand suport for the help system. - Start work on the create command. @Translators: Please do not translate any changes yet, because I will improve help system in one of the next steps. --- base/system/diskpart/create.c | 109 ++++++++++++++++++++++++- base/system/diskpart/detail.c | 58 ++++--------- base/system/diskpart/diskpart.h | 85 ++++++++++++++++++-- base/system/diskpart/help.c | 68 +++++++++++++--- base/system/diskpart/interpreter.c | 161 ++++++++++++++++++++++++++----------- base/system/diskpart/lang/en-US.rc | 55 ++++++++++++- base/system/diskpart/list.c | 61 ++++++-------- base/system/diskpart/misc.c | 12 ++- base/system/diskpart/resource.h | 17 +++- base/system/diskpart/select.c | 76 ++++++----------- base/system/diskpart/uniqueid.c | 53 ++++-------- 11 files changed, 513 insertions(+), 242 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 50e349e082d..a933da2c5ae 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -8,7 +8,114 @@ #include "diskpart.h" -BOOL create_main(INT argc, LPWSTR *argv) +BOOL +CreateExtendedPartition( + INT argc, + PWSTR *argv) { + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + ConPrintf(StdOut, L"Not implemented yet!\n"); + + return TRUE; +} + + +BOOL +CreateLogicalPartition( + INT argc, + PWSTR *argv) +{ + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } + + ConPrintf(StdOut, L"Not implemented yet!\n"); + + return TRUE; +} + + +BOOL +CreatePrimaryPartition( + INT argc, + PWSTR *argv) +{ + LARGE_INTEGER liSize, liOffset; + INT i; +// BOOL bNoErr = FALSE; + PWSTR pszSuffix = NULL; + + liSize.QuadPart = -1; + liOffset.QuadPart = -1; + +/* + if (CurrentDisk == NULL) + { + ConResPuts(StdOut, IDS_SELECT_NO_DISK); + return TRUE; + } +*/ + + for (i = 3; i < argc; i++) + { + if (HasPrefix(argv[i], L"size=", &pszSuffix)) + { + /* size=<N> (MB) */ + ConPrintf(StdOut, L"Size : %s\n", pszSuffix); + + liSize.QuadPart = _wcstoui64(pszSuffix, NULL, 10); + if (((liSize.QuadPart == 0) && (errno == ERANGE)) || + (liSize.QuadPart < 0)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"offset=", &pszSuffix)) + { + /* offset=<N> (KB) */ + ConPrintf(StdOut, L"Offset : %s\n", pszSuffix); + + liOffset.QuadPart = _wcstoui64(pszSuffix, NULL, 10); + if (((liOffset.QuadPart == 0) && (errno == ERANGE)) || + (liOffset.QuadPart < 0)) + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + else if (HasPrefix(argv[i], L"id=", &pszSuffix)) + { + /* id=<Byte>|<GUID> */ + ConPrintf(StdOut, L"Id : %s\n", pszSuffix); + } + else if (HasPrefix(argv[i], L"align=", &pszSuffix)) + { + /* align=<N> */ + ConPrintf(StdOut, L"Align : %s\n", pszSuffix); + } + else if (_wcsicmp(argv[i], L"noerr") == 0) + { + /* noerr */ + ConPrintf(StdOut, L"NoErr\n", pszSuffix); +// bNoErr = TRUE; + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; + } + } + + ConPrintf(StdOut, L"Size: %I64d\n", liSize.QuadPart); + ConPrintf(StdOut, L"Offset: %I64d\n", liOffset.QuadPart); + return TRUE; } diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c index 464085149fc..0c0de3e262a 100644 --- a/base/system/diskpart/detail.c +++ b/base/system/diskpart/detail.c @@ -13,24 +13,23 @@ /* FUNCTIONS ******************************************************************/ -static -VOID +BOOL DetailDisk( INT argc, - LPWSTR *argv) + PWSTR *argv) { DPRINT("DetailDisk()\n"); if (argc > 2) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); - return; + return TRUE; } /* TODO: Print more disk details */ @@ -40,14 +39,15 @@ DetailDisk( ConResPrintf(StdOut, IDS_DETAIL_INFO_TARGET, CurrentDisk->TargetId); ConResPrintf(StdOut, IDS_DETAIL_INFO_LUN_ID, CurrentDisk->Lun); ConPuts(StdOut, L"\n"); + + return TRUE; } -static -VOID +BOOL DetailPartition( INT argc, - LPWSTR *argv) + PWSTR *argv) { PPARTENTRY PartEntry; ULONGLONG PartOffset; @@ -57,19 +57,19 @@ DetailPartition( if (argc > 2) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_PARTITION_NO_DISK); - return; + return TRUE; } if (CurrentPartition == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); - return; + return TRUE; } PartEntry = CurrentPartition; @@ -83,55 +83,31 @@ DetailPartition( ConResPrintf(StdOut, IDS_DETAIL_PARTITION_ACTIVE, PartEntry->BootIndicator ? L"Yes" : L"No"); ConResPrintf(StdOut, IDS_DETAIL_PARTITION_OFFSET, PartOffset); ConPuts(StdOut, L"\n"); + + return TRUE; } -static -VOID +BOOL DetailVolume( INT argc, - LPWSTR *argv) + PWSTR *argv) { DPRINT("DetailVolume()\n"); if (argc > 2) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (CurrentVolume == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_VOLUME); - return; - } - - /* TODO: Print volume details */ - -} - - -BOOL -detail_main( - INT argc, - LPWSTR *argv) -{ - /* gets the first word from the string */ - if (argc == 1) - { - ConResPuts(StdOut, IDS_HELP_CMD_DETAIL); return TRUE; } - /* determines which details to print (disk, partition, etc.) */ - if (!wcsicmp(argv[1], L"disk")) - DetailDisk(argc, argv); - else if (!wcsicmp(argv[1], L"partition")) - DetailPartition(argc, argv); - else if (!wcsicmp(argv[1], L"volume")) - DetailVolume(argc, argv); - else - ConResPuts(StdOut, IDS_HELP_CMD_DETAIL); + /* TODO: Print volume details */ return TRUE; } diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 877f0063351..a3f21d3ccdc 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -52,7 +52,9 @@ typedef struct _COMMAND { - LPWSTR name; + PWSTR cmd1; + PWSTR cmd2; + PWSTR cmd3; BOOL (*func)(INT, WCHAR**); INT help; INT help_desc; @@ -233,7 +235,20 @@ BOOL compact_main(INT argc, LPWSTR *argv); BOOL convert_main(INT argc, LPWSTR *argv); /* create.c */ -BOOL create_main(INT argc, LPWSTR *argv); +BOOL +CreateExtendedPartition( + INT argc, + PWSTR *argv); + +BOOL +CreateLogicalPartition( + INT argc, + PWSTR *argv); + +BOOL +CreatePrimaryPartition( + INT argc, + PWSTR *argv); /* delete.c */ BOOL delete_main(INT argc, LPWSTR *argv); @@ -242,7 +257,20 @@ BOOL delete_main(INT argc, LPWSTR *argv); BOOL detach_main(INT argc, LPWSTR *argv); /* detail.c */ -BOOL detail_main(INT argc, LPWSTR *argv); +BOOL +DetailDisk( + INT argc, + PWSTR *argv); + +BOOL +DetailPartition( + INT argc, + PWSTR *argv); + +BOOL +DetailVolume( + INT argc, + PWSTR *argv); /* diskpart.c */ @@ -266,7 +294,8 @@ BOOL gpt_main(INT argc, LPWSTR *argv); /* help.c */ BOOL help_main(INT argc, LPWSTR *argv); -VOID help_cmdlist(VOID); +VOID HelpCommandList(VOID); +BOOL HelpCommand(PCOMMAND pCommand); /* import. c */ BOOL import_main(INT argc, LPWSTR *argv); @@ -280,7 +309,25 @@ BOOL InterpretCmd(INT argc, LPWSTR *argv); VOID InterpretMain(VOID); /* list.c */ -BOOL list_main(INT argc, LPWSTR *argv); +BOOL +ListDisk( + INT argc, + PWSTR *argv); + +BOOL +ListPartition( + INT argc, + PWSTR *argv); + +BOOL +ListVolume( + INT argc, + PWSTR *argv); + +BOOL +ListVirtualDisk( + INT argc, + PWSTR *argv); /* merge.c */ BOOL merge_main(INT argc, LPWSTR *argv); @@ -297,7 +344,8 @@ IsHexString( BOOL HasPrefix( _In_ PWSTR pszString, - _In_ PWSTR pszPrefix); + _In_ PWSTR pszPrefix, + _Out_opt_ PWSTR *pszSuffix); ULONGLONG RoundingDivide( @@ -343,8 +391,26 @@ BOOL retain_main(INT argc, LPWSTR *argv); BOOL san_main(INT argc, LPWSTR *argv); /* select.c */ -BOOL select_main(INT argc, LPWSTR *argv); +BOOL +SelectDisk( + INT argc, + PWSTR *argv); + +BOOL +SelectPartition( + INT argc, + PWSTR *argv); +BOOL +SelectVolume( + INT argc, + PWSTR *argv); +/* +BOOL +SelectVirtualDisk( + INT argc, + PWSTR *argv); +*/ /* setid.c */ BOOL setid_main(INT argc, LPWSTR *argv); @@ -352,6 +418,9 @@ BOOL setid_main(INT argc, LPWSTR *argv); BOOL shrink_main(INT argc, LPWSTR *argv); /* uniqueid.c */ -BOOL uniqueid_main(INT argc, LPWSTR *argv); +BOOL +UniqueIdDisk( + _In_ INT argc, + _In_ PWSTR *argv); #endif /* DISKPART_H */ diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index c13b29ff9e6..d11e8f02f54 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -9,10 +9,11 @@ #include "diskpart.h" /* - * help_cmdlist(): + * HelpCommandList(): * shows all the available commands and basic descriptions for diskpart */ -VOID help_cmdlist(VOID) +VOID +HelpCommandList(VOID) { PCOMMAND cmdptr; @@ -21,36 +22,79 @@ VOID help_cmdlist(VOID) ConPuts(StdOut, L"\n"); /* List all the commands and the basic descriptions */ - for (cmdptr = cmds; cmdptr->name; cmdptr++) - ConResPuts(StdOut, cmdptr->help_desc); + for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) + if (cmdptr->help_desc != IDS_NONE) + ConResPuts(StdOut, cmdptr->help_desc); ConPuts(StdOut, L"\n"); } + +BOOL +HelpCommand( + PCOMMAND pCommand) +{ + if (pCommand->help != IDS_NONE) + { + ConResPuts(StdOut, pCommand->help); +// ConPuts(StdOut, L"\n"); + } + + return TRUE; +} + + /* help_main(char *arg): * main entry point for the help command. Gives help to users who needs it. */ BOOL help_main(INT argc, LPWSTR *argv) { PCOMMAND cmdptr; + PCOMMAND cmdptr1 = NULL; + PCOMMAND cmdptr2 = NULL; + PCOMMAND cmdptr3 = NULL; if (argc == 1) { - help_cmdlist(); + HelpCommandList(); return TRUE; } /* Scan internal command table */ - for (cmdptr = cmds; cmdptr->name; cmdptr++) + for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) + { + if ((cmdptr1 == NULL) && + (wcsicmp(argv[1], cmdptr->cmd1) == 0)) + cmdptr1 = cmdptr; + + if ((cmdptr2 == NULL) && + (argc >= 3) && + (wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (wcsicmp(argv[2], cmdptr->cmd2) == 0)) + cmdptr2 = cmdptr; + + if ((cmdptr3 == NULL) && + (argc >= 4) && + (wcsicmp(argv[1], cmdptr->cmd1) == 0) && + (wcsicmp(argv[2], cmdptr->cmd2) == 0) && + (wcsicmp(argv[3], cmdptr->cmd3) == 0)) + cmdptr3 = cmdptr; + } + + if (cmdptr3 != NULL) + { + return HelpCommand(cmdptr3); + } + else if (cmdptr2 != NULL) + { + return HelpCommand(cmdptr2); + } + else if (cmdptr1 != NULL) { - if (_wcsicmp(argv[1], cmdptr->name) == 0) - { - ConResPuts(StdOut, cmdptr->help); - return TRUE; - } + return HelpCommand(cmdptr1); } - help_cmdlist(); + HelpCommandList(); return TRUE; } diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index dde15688029..4229baf262b 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -15,46 +15,72 @@ BOOL rem_main(INT argc, LPWSTR *argv); COMMAND cmds[] = { - {L"active", active_main, IDS_HELP_CMD_ACTIVE, IDS_HELP_CMD_DESC_ACTIVE}, - {L"add", add_main, IDS_HELP_CMD_ADD, IDS_HELP_CMD_DESC_ADD}, - {L"assign", assign_main, IDS_HELP_CMD_ASSIGN, IDS_HELP_CMD_DESC_ASSIGN}, - {L"attach", attach_main, IDS_HELP_CMD_ATTACH, IDS_HELP_CMD_DESC_ATTACH}, - {L"attributes", attributes_main, IDS_HELP_CMD_ATTRIBUTES, IDS_HELP_CMD_DESC_ATTRIBUTES}, - {L"automount", automount_main, IDS_HELP_CMD_AUTOMOUNT, IDS_HELP_CMD_DESC_AUTOMOUNT}, - {L"break", break_main, IDS_HELP_CMD_BREAK, IDS_HELP_CMD_DESC_BREAK}, - {L"clean", clean_main, IDS_HELP_CMD_CLEAN, IDS_HELP_CMD_DESC_CLEAN}, - {L"compact", compact_main, IDS_HELP_CMD_COMPACT, IDS_HELP_CMD_DESC_COMPACT}, - {L"convert", convert_main, IDS_HELP_CMD_CONVERT, IDS_HELP_CMD_DESC_CONVERT}, - {L"create", create_main, IDS_HELP_CMD_CREATE, IDS_HELP_CMD_DESC_CREATE}, - {L"delete", delete_main, IDS_HELP_CMD_DELETE, IDS_HELP_CMD_DESC_DELETE}, - {L"detail", detail_main, IDS_HELP_CMD_DETAIL, IDS_HELP_CMD_DESC_DETAIL}, - {L"detach", detach_main, IDS_HELP_CMD_DETACH, IDS_HELP_CMD_DESC_DETACH}, - {L"dump", dump_main, IDS_NONE, IDS_NONE}, - {L"exit", NULL, IDS_NONE, IDS_HELP_CMD_DESC_EXIT}, - {L"expand", expand_main, IDS_HELP_CMD_EXPAND, IDS_HELP_CMD_DESC_EXPAND}, - {L"extend", extend_main, IDS_HELP_CMD_EXTEND, IDS_HELP_CMD_DESC_EXTEND}, - {L"filesystems", filesystems_main, IDS_HELP_CMD_FILESYSTEMS, IDS_HELP_CMD_DESC_FS}, - {L"format", format_main, IDS_HELP_CMD_FORMAT, IDS_HELP_CMD_DESC_FORMAT}, - {L"gpt", gpt_main, IDS_HELP_CMD_GPT, IDS_HELP_CMD_DESC_GPT}, - {L"help", help_main, IDS_HELP_CMD_HELP, IDS_HELP_CMD_DESC_HELP}, - {L"import", import_main, IDS_HELP_CMD_IMPORT, IDS_HELP_CMD_DESC_IMPORT}, - {L"inactive", inactive_main, IDS_HELP_CMD_INACTIVE, IDS_HELP_CMD_DESC_INACTIVE}, - {L"list", list_main, IDS_HELP_CMD_LIST, IDS_HELP_CMD_DESC_LIST}, - {L"merge", merge_main, IDS_HELP_CMD_MERGE, IDS_HELP_CMD_DESC_MERGE}, - {L"offline", offline_main, IDS_HELP_CMD_OFFLINE, IDS_HELP_CMD_DESC_OFFLINE}, - {L"online", online_main, IDS_HELP_CMD_ONLINE, IDS_HELP_CMD_DESC_ONLINE}, - {L"recover", recover_main, IDS_HELP_CMD_RECOVER, IDS_HELP_CMD_DESC_RECOVER}, - {L"rem", NULL, IDS_NONE, IDS_HELP_CMD_DESC_REM}, - {L"remove", remove_main, IDS_HELP_CMD_REMOVE, IDS_HELP_CMD_DESC_REMOVE}, - {L"repair", repair_main, IDS_HELP_CMD_REPAIR, IDS_HELP_CMD_DESC_REPAIR}, - {L"rescan", rescan_main, IDS_HELP_CMD_RESCAN, IDS_HELP_CMD_DESC_RESCAN}, - {L"retain", retain_main, IDS_HELP_CMD_RETAIN, IDS_HELP_CMD_DESC_RETAIN}, - {L"san", san_main, IDS_HELP_CMD_SAN, IDS_HELP_CMD_DESC_SAN}, - {L"select", select_main, IDS_HELP_CMD_SELECT, IDS_HELP_CMD_DESC_SELECT}, - {L"setid", setid_main, IDS_HELP_CMD_SETID, IDS_HELP_CMD_DESC_SETID}, - {L"shrink", shrink_main, IDS_HELP_CMD_SHRINK, IDS_HELP_CMD_DESC_SHRINK}, - {L"uniqueid", uniqueid_main, IDS_HELP_CMD_UNIQUEID, IDS_HELP_CMD_DESC_UNIQUEID}, - {NULL, NULL, IDS_NONE, IDS_NONE} + {L"active", NULL, NULL, active_main, IDS_HELP_CMD_ACTIVE, IDS_HELP_CMD_DESC_ACTIVE}, + {L"add", NULL, NULL, add_main, IDS_HELP_CMD_ADD, IDS_HELP_CMD_DESC_ADD}, + {L"assign", NULL, NULL, assign_main, IDS_HELP_CMD_ASSIGN, IDS_HELP_CMD_DESC_ASSIGN}, + {L"attach", NULL, NULL, attach_main, IDS_HELP_CMD_ATTACH, IDS_HELP_CMD_DESC_ATTACH}, + {L"attributes", NULL, NULL, attributes_main, IDS_HELP_CMD_ATTRIBUTES, IDS_HELP_CMD_DESC_ATTRIBUTES}, + {L"automount", NULL, NULL, automount_main, IDS_HELP_CMD_AUTOMOUNT, IDS_HELP_CMD_DESC_AUTOMOUNT}, + {L"break", NULL, NULL, break_main, IDS_HELP_CMD_BREAK, IDS_HELP_CMD_DESC_BREAK}, + {L"clean", NULL, NULL, clean_main, IDS_HELP_CMD_CLEAN, IDS_HELP_CMD_DESC_CLEAN}, + {L"compact", NULL, NULL, compact_main, IDS_HELP_CMD_COMPACT, IDS_HELP_CMD_DESC_COMPACT}, + {L"convert", NULL, NULL, convert_main, IDS_HELP_CMD_CONVERT, IDS_HELP_CMD_DESC_CONVERT}, + + {L"create", NULL, NULL, NULL, IDS_HELP_CMD_CREATE, IDS_HELP_CMD_DESC_CREATE}, + {L"create", L"partition", NULL, NULL, IDS_HELP_CMD_CREATE_PARTITION, IDS_NONE}, + {L"create", L"partition", L"extended", CreateExtendedPartition, IDS_HELP_CMD_CREATE_PARTITION_EXTENDED, IDS_NONE}, + {L"create", L"partition", L"logical", CreateLogicalPartition, IDS_HELP_CMD_CREATE_PARTITION_LOGICAL, IDS_NONE}, + {L"create", L"partition", L"primary", CreatePrimaryPartition, IDS_HELP_CMD_CREATE_PARTITION_PRIMARY, IDS_NONE}, + + {L"delete", NULL, NULL, delete_main, IDS_HELP_CMD_DELETE, IDS_HELP_CMD_DESC_DELETE}, + + {L"detail", NULL, NULL, NULL, IDS_HELP_CMD_DETAIL, IDS_HELP_CMD_DESC_DETAIL}, + {L"detail", L"disk", NULL, DetailDisk, IDS_HELP_CMD_DETAIL_DISK, IDS_NONE}, + {L"detail", L"partition", NULL, DetailPartition, IDS_HELP_CMD_DETAIL_PARTITION, IDS_NONE}, + {L"detail", L"volume", NULL, DetailVolume, IDS_HELP_CMD_DETAIL_VOLUME, IDS_NONE}, + + {L"detach", NULL, NULL, detach_main, IDS_HELP_CMD_DETACH, IDS_HELP_CMD_DESC_DETACH}, + {L"dump", NULL, NULL, dump_main, IDS_NONE, IDS_NONE}, + {L"exit", NULL, NULL, NULL, IDS_NONE, IDS_HELP_CMD_DESC_EXIT}, + {L"expand", NULL, NULL, expand_main, IDS_HELP_CMD_EXPAND, IDS_HELP_CMD_DESC_EXPAND}, + {L"extend", NULL, NULL, extend_main, IDS_HELP_CMD_EXTEND, IDS_HELP_CMD_DESC_EXTEND}, + {L"filesystems", NULL, NULL, filesystems_main, IDS_HELP_CMD_FILESYSTEMS, IDS_HELP_CMD_DESC_FS}, + {L"format", NULL, NULL, format_main, IDS_HELP_CMD_FORMAT, IDS_HELP_CMD_DESC_FORMAT}, + {L"gpt", NULL, NULL, gpt_main, IDS_HELP_CMD_GPT, IDS_HELP_CMD_DESC_GPT}, + {L"help", NULL, NULL, help_main, IDS_HELP_CMD_HELP, IDS_HELP_CMD_DESC_HELP}, + {L"import", NULL, NULL, import_main, IDS_HELP_CMD_IMPORT, IDS_HELP_CMD_DESC_IMPORT}, + {L"inactive", NULL, NULL, inactive_main, IDS_HELP_CMD_INACTIVE, IDS_HELP_CMD_DESC_INACTIVE}, + + {L"list", NULL, NULL, NULL, IDS_HELP_CMD_LIST, IDS_HELP_CMD_DESC_LIST}, + {L"list", L"disk", NULL, ListDisk, IDS_HELP_CMD_LIST_DISK, IDS_NONE}, + {L"list", L"partition", NULL, ListPartition, IDS_HELP_CMD_LIST_PARTITION, IDS_NONE}, + {L"list", L"volume", NULL, ListVolume, IDS_HELP_CMD_LIST_VOLUME, IDS_NONE}, + {L"list", L"vdisk", NULL, ListVirtualDisk, IDS_HELP_CMD_LIST_VDISK, IDS_NONE}, + + {L"merge", NULL, NULL, merge_main, IDS_HELP_CMD_MERGE, IDS_HELP_CMD_DESC_MERGE}, + {L"offline", NULL, NULL, offline_main, IDS_HELP_CMD_OFFLINE, IDS_HELP_CMD_DESC_OFFLINE}, + {L"online", NULL, NULL, online_main, IDS_HELP_CMD_ONLINE, IDS_HELP_CMD_DESC_ONLINE}, + {L"recover", NULL, NULL, recover_main, IDS_HELP_CMD_RECOVER, IDS_HELP_CMD_DESC_RECOVER}, + {L"rem", NULL, NULL, NULL, IDS_NONE, IDS_HELP_CMD_DESC_REM}, + {L"remove", NULL, NULL, remove_main, IDS_HELP_CMD_REMOVE, IDS_HELP_CMD_DESC_REMOVE}, + {L"repair", NULL, NULL, repair_main, IDS_HELP_CMD_REPAIR, IDS_HELP_CMD_DESC_REPAIR}, + {L"rescan", NULL, NULL, rescan_main, IDS_HELP_CMD_RESCAN, IDS_HELP_CMD_DESC_RESCAN}, + {L"retain", NULL, NULL, retain_main, IDS_HELP_CMD_RETAIN, IDS_HELP_CMD_DESC_RETAIN}, + {L"san", NULL, NULL, san_main, IDS_HELP_CMD_SAN, IDS_HELP_CMD_DESC_SAN}, + + {L"select", NULL, NULL, NULL, IDS_HELP_CMD_SELECT, IDS_HELP_CMD_DESC_SELECT}, + {L"select", L"disk", NULL, SelectDisk, IDS_HELP_CMD_SELECT_DISK, IDS_NONE}, + {L"select", L"partition", NULL, SelectPartition, IDS_HELP_CMD_SELECT_PARTITION, IDS_NONE}, + {L"select", L"volume", NULL, SelectVolume, IDS_HELP_CMD_SELECT_VOLUME, IDS_NONE}, +// {L"select", L"vdisk", NULL, SelectVirtualDisk, IDS_HELP_CMD_SELECT_VDISK, IDS_NONE}, + + {L"setid", NULL, NULL, setid_main, IDS_HELP_CMD_SETID, IDS_HELP_CMD_DESC_SETID}, + {L"shrink", NULL, NULL, shrink_main, IDS_HELP_CMD_SHRINK, IDS_HELP_CMD_DESC_SHRINK}, + + {L"uniqueid", NULL, NULL, NULL, IDS_HELP_CMD_UNIQUEID, IDS_HELP_CMD_DESC_UNIQUEID}, + {L"uniqueid", L"disk", NULL, UniqueIdDisk, IDS_HELP_CMD_UNIQUEID_DISK, IDS_NONE}, + + {NULL, NULL, NULL, NULL, IDS_NONE, IDS_NONE} }; @@ -66,9 +92,14 @@ COMMAND cmds[] = * determines which function to invoke. */ BOOL -InterpretCmd(int argc, LPWSTR *argv) +InterpretCmd( + int argc, + LPWSTR *argv) { PCOMMAND cmdptr; + PCOMMAND cmdptr1 = NULL; + PCOMMAND cmdptr2 = NULL; + PCOMMAND cmdptr3 = NULL; /* If no args provided */ if (argc < 1) @@ -76,20 +107,56 @@ InterpretCmd(int argc, LPWSTR *argv) /* First, determine if the user wants to exit or to use a comment */ - if(wcsicmp(argv[0], L"exit") == 0) + if (wcsicmp(argv[0], L"exit") == 0) return FALSE; - if(wcsicmp(argv[0], L"rem") == 0) + if (wcsicmp(argv[0], L"rem") == 0) return TRUE; /* Scan internal command table */ - for (cmdptr = cmds; cmdptr->name; cmdptr++) + for (cmdptr = cmds; cmdptr->cmd1; cmdptr++) + { + if ((cmdptr1 == NULL) && + (wcsicmp(argv[0], cmdptr->cmd1) == 0)) + cmdptr1 = cmdptr; + + if ((cmdptr2 == NULL) && + (argc >= 2) && + (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (wcsicmp(argv[1], cmdptr->cmd2) == 0)) + cmdptr2 = cmdptr; + + if ((cmdptr3 == NULL) && + (argc >= 3) && + (wcsicmp(argv[0], cmdptr->cmd1) == 0) && + (wcsicmp(argv[1], cmdptr->cmd2) == 0) && + (wcsicmp(argv[2], cmdptr->cmd3) == 0)) + cmdptr3 = cmdptr; + } + + if (cmdptr3 != NULL) { - if (wcsicmp(argv[0], cmdptr->name) == 0) - return cmdptr->func(argc, argv); + if (cmdptr3->func == NULL) + return HelpCommand(cmdptr3); + else + return cmdptr3->func(argc, argv); + } + else if (cmdptr2 != NULL) + { + if (cmdptr2->func == NULL) + return HelpCommand(cmdptr2); + else + return cmdptr2->func(argc, argv); + } + else if (cmdptr1 != NULL) + { + if (cmdptr1->func == NULL) + return HelpCommand(cmdptr1); + else + return cmdptr1->func(argc, argv); } - help_cmdlist(); + HelpCommandList(); return TRUE; } diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 7729fa17897..c869ef128ef 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -220,7 +220,25 @@ END STRINGTABLE BEGIN IDS_HELP_CMD_CREATE "\n\ -<Add create command help text here>\n\n" +PARTITION - Create a partition.\n\ +VOLUME - Create a volume.\n\ +VDISK - Create a virtual disk file.\n\n" + + IDS_HELP_CMD_CREATE_PARTITION "\n\ +EFI - Create an EFI system partition.\n\ +EXTENDED - Create an extended partition.\n\ +LOGICAL - Create a logical drive.\n\ +MSR - Create an MSR partition.\n\ +PRIMARY - Create a primary partition.\n\n" + + IDS_HELP_CMD_CREATE_PARTITION_EXTENDED "\n\ + Create an exteded partition.\n\n" + + IDS_HELP_CMD_CREATE_PARTITION_LOGICAL "\n\ + Create a logical drive.\n\n" + + IDS_HELP_CMD_CREATE_PARTITION_PRIMARY "\n\ + Create a primary partition.\n\n" END /* Delete help description */ @@ -235,6 +253,12 @@ STRINGTABLE BEGIN IDS_HELP_CMD_DETAIL "\n\ <Add detail command help text here>\n\n" + IDS_HELP_CMD_DETAIL_DISK "\n\ +<Add detail disk command help text here>\n\n" + IDS_HELP_CMD_DETAIL_PARTITION "\n\ +<Add detail partition command help text here>\n\n" + IDS_HELP_CMD_DETAIL_VOLUME "\n\ +<Add detail volume command help text here>\n\n" END /* Detach help description */ @@ -304,7 +328,16 @@ END STRINGTABLE BEGIN IDS_HELP_CMD_LIST "\n\ -<Add list command help text here>\n\n" +DISK - Show a list of disks.\n\ +PARTITION - Show a list of partitions on the selected disk.\n\ +VOLUME - Show a list of volumes.\n\ +VDISK - Show a list of virtual disk files.\n\n" + IDS_HELP_CMD_LIST_DISK "\n\ + Display a list of disks.\n\n\ +Syntax: LIST DISK\n\n\ + Shows a list of disks and additional infomation about the disks.\n\n\ +Example:\n\n\ + LIST DISK\n\n" END /* Merge help descriptions */ @@ -374,7 +407,18 @@ END STRINGTABLE BEGIN IDS_HELP_CMD_SELECT "\n\ -<Add SELECT command help text here>\n\n" +DISK - Moves the focus to the disk.\n\ +PARTITION - Moves the focus to the partition.\n\ +VOLUME - Moves the focus to the volume.\n\ +VDISK - Moves the focus to the virtual disk.\n\n" + IDS_HELP_CMD_SELECT_DISK "\n\ +<Add SELECT DISK command help text here>\n\n" + IDS_HELP_CMD_SELECT_PARTITION "\n\ +<Add SELECT PARTITION command help text here>\n\n" + IDS_HELP_CMD_SELECT_VOLUME "\n\ +<Add SELECT VOLUME command help text here>\n\n" + IDS_HELP_CMD_SELECT_VDISK "\n\ +<Add SELECT VDISK command help text here>\n\n" END /* Setid help descriptions */ @@ -395,5 +439,8 @@ END STRINGTABLE BEGIN IDS_HELP_CMD_UNIQUEID "\n\ -<Add UNIQUEID command help text here>\n\n" +DISK - Used to display or set the ID of a GUID partition table\n\ + or the Signature of an MBR partition table.\n\n" + IDS_HELP_CMD_UNIQUEID_DISK "\n\ +<Add UNIQUEID DISK command help text here>\n\n" END diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index a6a2ebfde89..4eb1d8fb823 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -13,9 +13,10 @@ /* FUNCTIONS ******************************************************************/ -static -VOID -ListDisk(VOID) +BOOL +ListDisk( + INT argc, + PWSTR *argv) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; @@ -68,11 +69,15 @@ ListDisk(VOID) } ConPuts(StdOut, L"\n\n"); + + return TRUE; } -static -VOID -ListPartition(VOID) + +BOOL +ListPartition( + INT argc, + PWSTR *argv) { PLIST_ENTRY Entry; PPARTENTRY PartEntry; @@ -85,7 +90,7 @@ ListPartition(VOID) if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_LIST_PARTITION_NO_DISK); - return; + return TRUE; } /* Header labels */ @@ -205,11 +210,15 @@ ListPartition(VOID) } ConPuts(StdOut, L"\n"); + + return TRUE; } -static -VOID -ListVolume(VOID) + +BOOL +ListVolume( + INT argc, + PWSTR *argv) { PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; @@ -253,38 +262,16 @@ ListVolume(VOID) } ConPuts(StdOut, L"\n\n"); -} -static -VOID -ListVdisk(VOID) -{ - ConPuts(StdOut, L"List VDisk!!\n"); + return TRUE; } + BOOL -list_main( +ListVirtualDisk( INT argc, - LPWSTR *argv) + PWSTR *argv) { - /* gets the first word from the string */ - if (argc == 1) - { - ConResPuts(StdOut, IDS_HELP_CMD_LIST); - return TRUE; - } - - /* determines which to list (disk, partition, etc.) */ - if (!wcsicmp(argv[1], L"disk")) - ListDisk(); - else if (!wcsicmp(argv[1], L"partition")) - ListPartition(); - else if (!wcsicmp(argv[1], L"volume")) - ListVolume(); - else if (!wcsicmp(argv[1], L"vdisk")) - ListVdisk(); - else - ConResPuts(StdOut, IDS_HELP_CMD_LIST); - + ConPuts(StdOut, L"ListVirtualDisk()!\n"); return TRUE; } diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index 65ba3a0ddb0..b46651b670b 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -57,9 +57,17 @@ IsHexString( BOOL HasPrefix( _In_ PWSTR pszString, - _In_ PWSTR pszPrefix) + _In_ PWSTR pszPrefix, + _Out_opt_ PWSTR *ppszSuffix) { - return (_wcsnicmp(pszString, pszPrefix, wcslen(pszPrefix)) == 0); + INT nPrefixLength, ret; + + nPrefixLength = wcslen(pszPrefix); + ret = _wcsnicmp(pszString, pszPrefix, nPrefixLength); + if ((ret == 0) && (ppszSuffix != NULL)) + *ppszSuffix = &pszString[nPrefixLength]; + + return (ret == 0); } diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 44ad22cdee6..ed77b249e06 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -127,10 +127,16 @@ #define IDS_HELP_CMD_COMPACT 113 #define IDS_HELP_CMD_CONVERT 114 #define IDS_HELP_CMD_CREATE 115 -#define IDS_HELP_CMD_CREATE_PARTITION 180 +#define IDS_HELP_CMD_CREATE_PARTITION 180 +#define IDS_HELP_CMD_CREATE_PARTITION_EXTENDED 181 +#define IDS_HELP_CMD_CREATE_PARTITION_LOGICAL 182 +#define IDS_HELP_CMD_CREATE_PARTITION_PRIMARY 183 #define IDS_HELP_CMD_DELETE 116 #define IDS_HELP_CMD_DETACH 117 #define IDS_HELP_CMD_DETAIL 118 +#define IDS_HELP_CMD_DETAIL_DISK 184 +#define IDS_HELP_CMD_DETAIL_PARTITION 185 +#define IDS_HELP_CMD_DETAIL_VOLUME 186 #define IDS_HELP_CMD_EXPAND 119 #define IDS_HELP_CMD_EXTEND 120 #define IDS_HELP_CMD_FILESYSTEMS 121 @@ -140,6 +146,10 @@ #define IDS_HELP_CMD_IMPORT 125 #define IDS_HELP_CMD_INACTIVE 126 #define IDS_HELP_CMD_LIST 127 +#define IDS_HELP_CMD_LIST_DISK 190 +#define IDS_HELP_CMD_LIST_PARTITION 191 +#define IDS_HELP_CMD_LIST_VOLUME 192 +#define IDS_HELP_CMD_LIST_VDISK 193 #define IDS_HELP_CMD_MERGE 128 #define IDS_HELP_CMD_OFFLINE 129 #define IDS_HELP_CMD_ONLINE 130 @@ -150,8 +160,13 @@ #define IDS_HELP_CMD_RETAIN 135 #define IDS_HELP_CMD_SAN 136 #define IDS_HELP_CMD_SELECT 137 +#define IDS_HELP_CMD_SELECT_DISK 190 +#define IDS_HELP_CMD_SELECT_PARTITION 191 +#define IDS_HELP_CMD_SELECT_VOLUME 192 +#define IDS_HELP_CMD_SELECT_VDISK 193 #define IDS_HELP_CMD_SETID 138 #define IDS_HELP_CMD_SHRINK 139 #define IDS_HELP_CMD_UNIQUEID 140 +#define IDS_HELP_CMD_UNIQUEID_DISK 141 #define IDS_ERROR_INVALID_ARGS 211 diff --git a/base/system/diskpart/select.c b/base/system/diskpart/select.c index aa2432484ae..dcc9adb8f0d 100644 --- a/base/system/diskpart/select.c +++ b/base/system/diskpart/select.c @@ -13,11 +13,10 @@ /* FUNCTIONS ******************************************************************/ -static -VOID +BOOL SelectDisk( INT argc, - LPWSTR *argv) + PWSTR *argv) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; @@ -28,7 +27,7 @@ SelectDisk( if (argc > 3) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (argc == 2) @@ -37,20 +36,20 @@ SelectDisk( ConResPuts(StdOut, IDS_SELECT_NO_DISK); else ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); - return; + return TRUE; } if (!IsDecString(argv[2])) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } ulValue = wcstoul(argv[2], NULL, 10); if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } CurrentDisk = NULL; @@ -65,21 +64,21 @@ SelectDisk( CurrentDisk = DiskEntry; CurrentPartition = NULL; ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); - return; + return TRUE; } Entry = Entry->Flink; } ConResPuts(StdErr, IDS_SELECT_DISK_INVALID); + return TRUE; } -static -VOID +BOOL SelectPartition( INT argc, - LPWSTR *argv) + PWSTR *argv) { PLIST_ENTRY Entry; PPARTENTRY PartEntry; @@ -91,13 +90,13 @@ SelectPartition( if (argc > 3) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_PARTITION_NO_DISK); - return; + return TRUE; } if (argc == 2) @@ -106,20 +105,20 @@ SelectPartition( ConResPuts(StdOut, IDS_SELECT_NO_PARTITION); else ConResPrintf(StdOut, IDS_SELECT_PARTITION, CurrentPartition); - return; + return TRUE; } if (!IsDecString(argv[2])) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } ulValue = wcstoul(argv[2], NULL, 10); if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } Entry = CurrentDisk->PrimaryPartListHead.Flink; @@ -133,7 +132,7 @@ SelectPartition( { CurrentPartition = PartEntry; ConResPrintf(StdOut, IDS_SELECT_PARTITION, PartNumber); - return; + return TRUE; } PartNumber++; @@ -153,7 +152,7 @@ SelectPartition( { CurrentPartition = PartEntry; ConResPrintf(StdOut, IDS_SELECT_PARTITION, PartNumber); - return; + return TRUE; } PartNumber++; @@ -162,14 +161,14 @@ SelectPartition( } ConResPuts(StdErr, IDS_SELECT_PARTITION_INVALID); + return TRUE; } -static -VOID +BOOL SelectVolume( INT argc, - LPWSTR *argv) + PWSTR *argv) { PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; @@ -180,7 +179,7 @@ SelectVolume( if (argc > 3) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } if (argc == 2) @@ -189,20 +188,20 @@ SelectVolume( ConResPuts(StdOut, IDS_SELECT_NO_VOLUME); else ConResPrintf(StdOut, IDS_SELECT_VOLUME, CurrentVolume->VolumeNumber); - return; + return TRUE; } if (!IsDecString(argv[2])) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } ulValue = wcstoul(argv[2], NULL, 10); if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } CurrentVolume = NULL; @@ -216,37 +215,12 @@ SelectVolume( { CurrentVolume = VolumeEntry; ConResPrintf(StdOut, IDS_SELECT_VOLUME, CurrentVolume->VolumeNumber); - return; + return TRUE; } Entry = Entry->Flink; } ConResPuts(StdErr, IDS_SELECT_VOLUME_INVALID); -} - - -BOOL -select_main( - INT argc, - LPWSTR *argv) -{ - /* gets the first word from the string */ - if (argc == 1) - { - ConResPuts(StdOut, IDS_HELP_CMD_SELECT); - return TRUE; - } - - /* determines which to list (disk, partition, etc.) */ - if (!wcsicmp(argv[1], L"disk")) - SelectDisk(argc, argv); - else if (!wcsicmp(argv[1], L"partition")) - SelectPartition(argc, argv); - else if (!wcsicmp(argv[1], L"volume")) - SelectVolume(argc, argv); - else - ConResPuts(StdOut, IDS_HELP_CMD_SELECT); - return TRUE; } diff --git a/base/system/diskpart/uniqueid.c b/base/system/diskpart/uniqueid.c index 28c206ec65d..0637112cdb9 100644 --- a/base/system/diskpart/uniqueid.c +++ b/base/system/diskpart/uniqueid.c @@ -13,18 +13,18 @@ /* FUNCTIONS ******************************************************************/ -static -VOID +BOOL UniqueIdDisk( _In_ INT argc, - _In_ LPWSTR *argv) + _In_ PWSTR *argv) { - ULONG ulLength, ulValue; + PWSTR pszSuffix = NULL; + ULONG ulValue; if (CurrentDisk == NULL) { ConResPuts(StdOut, IDS_SELECT_NO_DISK); - return; + return TRUE; } if (argc == 2) @@ -32,39 +32,34 @@ UniqueIdDisk( ConPuts(StdOut, L"\n"); ConPrintf(StdOut, L"Disk ID: %08lx\n", CurrentDisk->LayoutBuffer->Signature); ConPuts(StdOut, L"\n"); - return; + return TRUE; } if (argc != 3) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; - } - - ulLength = wcslen(argv[2]); - if ((ulLength <= 3) || (ulLength > 11)) - { - ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } - if (!HasPrefix(argv[2], L"ID=")) + if (!HasPrefix(argv[2], L"ID=", &pszSuffix)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } - if (!IsHexString(&argv[2][3])) + if ((pszSuffix == NULL) || + (wcslen(pszSuffix) > 8) || + (IsHexString(pszSuffix) == FALSE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } - ulValue = wcstoul(&argv[2][3], NULL, 16); + ulValue = wcstoul(pszSuffix, NULL, 16); if ((ulValue == 0) && (errno == ERANGE)) { ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return; + return TRUE; } ConPrintf(StdOut, L"Setting the disk signature is not implemented yet!\n"); @@ -74,23 +69,5 @@ UniqueIdDisk( // SetDiskLayout(CurrentDisk); #endif -} - - -BOOL uniqueid_main(INT argc, LPWSTR *argv) -{ - /* gets the first word from the string */ - if (argc == 1) - { - ConResPuts(StdOut, IDS_HELP_CMD_UNIQUEID); - return TRUE; - } - - /* determines which details to print (disk, partition, etc.) */ - if (!wcsicmp(argv[1], L"disk")) - UniqueIdDisk(argc, argv); - else - ConResPuts(StdOut, IDS_HELP_CMD_UNIQUEID); - return TRUE; }

2 years, 7 months

[reactos] 01/01: [NOTEPAD] Less flickering title bar (#4516)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d690f041149ee3607dab… commit 1d690f041149ee3607dabd2136fb0e96ee9d517a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun May 15 14:38:43 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 15 14:38:43 2022 +0900 [NOTEPAD] Less flickering title bar (#4516) When typing text on NotePad, then NotePad title bar flickers. - Save previous modification flag. - If no change in modification flag, do not set the title bar text. --- base/applications/notepad/dialog.c | 14 ++++++++++++-- base/applications/notepad/main.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 3befb566503..7a0e0fac6cc 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -68,6 +68,13 @@ void UpdateWindowCaption(BOOL clearModifyAlert) TCHAR szCaption[MAX_STRING_LEN]; TCHAR szNotepad[MAX_STRING_LEN]; TCHAR szFilename[MAX_STRING_LEN]; + BOOL isModified = !!SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0); + + if (!clearModifyAlert && isModified == Globals.bWasModified) + { + /* We are in the same state as before, don't change the caption */ + return; + } /* Load the name of the application */ LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); @@ -84,14 +91,17 @@ void UpdateWindowCaption(BOOL clearModifyAlert) { StringCbPrintf(szCaption, sizeof(szCaption), _T("%s - %s"), szFilename, szNotepad); + + Globals.bWasModified = FALSE; } else { - BOOL isModified = (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0) ? TRUE : FALSE); - /* Update the caption based upon if the user has modified the contents of the file or not */ StringCbPrintf(szCaption, sizeof(szCaption), _T("%s%s - %s"), (isModified ? _T("*") : _T("")), szFilename, szNotepad); + + /* We will modify the caption below */ + Globals.bWasModified = isModified; } /* Update the window caption */ diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h index 65a8782f909..349be218118 100644 --- a/base/applications/notepad/main.h +++ b/base/applications/notepad/main.h @@ -80,6 +80,7 @@ typedef struct FINDREPLACE find; WNDPROC EditProc; RECT main_rect; + BOOL bWasModified; } NOTEPAD_GLOBALS; extern NOTEPAD_GLOBALS Globals;

2 years, 7 months

[reactos] 01/01: [KBDJA][NTUSER] Improve scancode_to_vk data (#4515)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99d9fc698fd3475c8f153… commit 99d9fc698fd3475c8f1531c5cc51649f948fdb57 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun May 15 12:53:12 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 15 12:53:12 2022 +0900 [KBDJA][NTUSER] Improve scancode_to_vk data (#4515) - Fix scancode_to_vk variable. - Add special handling to win32k!ProcessKeyEvent function for Japanese. CORE-11700 --- dll/keyboard/kbdja/kbdja.c | 16 ++++++++-------- win32ss/user/ntuser/keyboard.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdja/kbdja.c index ac081050918..eb09fe6d211 100644 --- a/dll/keyboard/kbdja/kbdja.c +++ b/dll/keyboard/kbdja/kbdja.c @@ -48,16 +48,17 @@ ROSDATA USHORT scancode_to_vk[] = { VK_LCONTROL, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', - 'L', VK_OEM_PLUS, VK_OEM_1, VK_PROCESSKEY, + 'L', VK_OEM_PLUS, VK_OEM_1, VK_KANJI | KBDSPECIAL, VK_LSHIFT, VK_OEM_6, /* - 2c - */ /* Third letters row */ 'Z', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KBDEXT, /* - 37 - */ /* Bottom Row */ - VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + VK_MULTIPLY | KBDMULTIVK, + VK_LMENU, VK_SPACE, VK_OEM_ATTN | KBDSPECIAL, /* - 3b - */ /* F-Keys */ @@ -88,16 +89,15 @@ ROSDATA USHORT scancode_to_vk[] = { VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, VK_F21, VK_F22, VK_F23, /* - 6f - */ - /* Not sure who uses these codes */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_OEM_COPY | KBDSPECIAL, VK_EMPTY, /* - 72 - */ VK_EMPTY, VK_OEM_102, VK_EMPTY, VK_EMPTY, /* - 76 - */ /* One more f-key */ VK_F24, /* - 77 - */ - VK_EMPTY, VK_EMPTY, VK_CONVERT, VK_EMPTY, - VK_NONCONVERT, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ + VK_EMPTY, VK_EMPTY, VK_CONVERT | KBDSPECIAL, VK_EMPTY, + VK_NONCONVERT | KBDSPECIAL, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ VK_EMPTY, /* - 80 - */ 0 @@ -205,7 +205,7 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { { '7', 0, {'7', '\''} }, { '8', 0, {'8', '('} }, { '9', 0, {'9', ')'} }, - { '0', 0, {'0', 0 } }, + { '0', 0, {'0', WCH_NONE} }, /*Japanese Keys*/ { VK_OEM_7, 0, { '^','~'} }, diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 08a7b6861c8..3ecc03ff433 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -811,6 +811,19 @@ ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD d /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ wSimpleVk = IntSimplifyVk(wVk); + + if (PRIMARYLANGID(gusLanguageID) == LANG_JAPANESE) + { + /* Japanese special! */ + if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) + { + if (wSimpleVk == VK_OEM_ATTN) + wSimpleVk = VK_CAPITAL; + else if (wSimpleVk == VK_OEM_COPY) + wSimpleVk = VK_OEM_FINISH; + } + } + bWasSimpleDown = IS_KEY_DOWN(gafAsyncKeyState, wSimpleVk); /* Update key without shifts */

2 years, 7 months

[reactos] 06/06: [WIN32SS] Implement display acceleration level 5 (ie no acceleration)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81aa81e38f00745e58119… commit 81aa81e38f00745e5811972ab471c2d7cc9763a9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 22:26:22 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Implement display acceleration level 5 (ie no acceleration) This is a easy as forcing usage of panning driver. --- win32ss/gdi/eng/pdevobj.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 293dae4b967..c8af5c7e9c3 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -301,7 +301,7 @@ PDEVOBJ_vFilterDriverHooks( if (dwAccelerationLevel >= 5) { /* Disable all display accelerations */ - UNIMPLEMENTED; + /* (nothing to do. Already handled in PDEVOBJ_Create) */ } } @@ -506,7 +506,8 @@ PDEVOBJ_Create( ppdev->dwAccelerationLevel = dwAccelerationLevel; /* Copy the function table */ - if (pdm->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) + if ((ldevtype == LDEV_DEVICE_DISPLAY && dwAccelerationLevel >= 5) || + pdm->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) { ULONG i;

2 years, 7 months

[reactos] 05/06: [WIN32SS] Implement panning driver

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e0f2fc01c8fd44432ccd… commit 4e0f2fc01c8fd44432ccd3553ad3f9ec6e4e7bef Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 22:23:32 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Implement panning driver This can be configured in registry with DefaultSettings.XPanning and DefaultSettings.YPanning, which describe the real screen resolution. DefaultSettings.XResolution and DefaultSettings.YResolution describe the resolution of the virtual screen. --- win32ss/CMakeLists.txt | 1 + win32ss/gdi/eng/pandisp.c | 501 ++++++++++++++++++++++++++++++++++++++++++++++ win32ss/gdi/eng/pdevobj.c | 22 +- 3 files changed, 523 insertions(+), 1 deletion(-) diff --git a/win32ss/CMakeLists.txt b/win32ss/CMakeLists.txt index 0a7dd1492de..16026d6275e 100644 --- a/win32ss/CMakeLists.txt +++ b/win32ss/CMakeLists.txt @@ -78,6 +78,7 @@ list(APPEND SOURCE gdi/eng/engmisc.c gdi/eng/mouse.c gdi/eng/multidisp.c + gdi/eng/pandisp.c gdi/eng/paint.c gdi/eng/pathobj.c gdi/eng/pdevobj.c diff --git a/win32ss/gdi/eng/pandisp.c b/win32ss/gdi/eng/pandisp.c new file mode 100644 index 00000000000..9f1a4f8c916 --- /dev/null +++ b/win32ss/gdi/eng/pandisp.c @@ -0,0 +1,501 @@ +/* + * PROJECT: ReactOS Win32k subsystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Pan-Display driver + * COPYRIGHT: Copyright 2022 Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +#define TAG_PAN 'DnaP' +#define GETPFN(name) ((PFN_Drv##name)(pandev->apfn[INDEX_Drv##name])) + +static DHPDEV gPan; /* FIXME: remove once PanSynchronize() is called periodically */ + +typedef struct _PANDEV +{ + ULONG iBitmapFormat; + HDEV hdev; + SIZEL szlDesktop; /* Size of the whole desktop */ + RECTL rclViewport; /* Viewport area */ + HSURF hsurf; /* Global surface */ + HSURF hsurfShadow; /* Our shadow surface, used for drawing */ + SURFOBJ *psoShadow; + + /* Underlying PDEVOBJ */ + ULONG flUnderlyingGraphicsCaps; + SIZEL szlScreen; + DHPDEV dhpdevScreen; + BOOL enabledScreen; /* underlying surface enabled */ + SURFOBJ *surfObjScreen; + PFN apfn[INDEX_LAST]; /* Functions of underlying PDEVOBJ */ +} PANDEV, *PPANDEV; + +BOOL +APIENTRY +PanSynchronize( + _In_ DHPDEV dhpdev, + _In_ PRECTL prcl) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + RECTL rclDest; + POINTL ptlSrc; + + /* FIXME: for now, copy the whole shadow buffer. We might try to optimize that */ + + ptlSrc.x = pandev->rclViewport.left; + ptlSrc.y = pandev->rclViewport.top; + + rclDest.top = rclDest.left = 0; + rclDest.bottom = pandev->szlScreen.cy; + rclDest.right = pandev->szlScreen.cx; + + return EngCopyBits(pandev->surfObjScreen, pandev->psoShadow, NULL, NULL, &rclDest, &ptlSrc); +} + +DHPDEV +APIENTRY +PanEnablePDEV( + _In_ PDEVMODEW pdm, + _In_ LPWSTR pwszLogAddress, + _In_ ULONG cPat, + _In_reads_opt_(cPat) HSURF *phsurfPatterns, + _In_ ULONG cjCaps, + _Out_writes_bytes_(cjCaps) PULONG pdevcaps, + _In_ ULONG cjDevInfo, + _Out_writes_bytes_(cjDevInfo) PDEVINFO pdi, + _In_ HDEV hdev, + _In_ LPWSTR pwszDeviceName, + _In_ HANDLE hDriver) +{ + PPANDEV pandev; + PPDEVOBJ ppdev = (PPDEVOBJ)hdev; + DEVMODEW underlyingDevmode; + PGDIINFO pGdiInfo = (PGDIINFO)pdevcaps; + + DPRINT("PanEnablePDEV(ppdev %p %dx%dx%d -> %dx%dx%d %d Hz)\n", + ppdev, + pdm->dmPelsWidth, pdm->dmPelsHeight, pdm->dmBitsPerPel, + pdm->dmPanningWidth, pdm->dmPanningHeight, pdm->dmBitsPerPel, pdm->dmDisplayFrequency); + + ASSERT(pdm->dmPanningWidth <= pdm->dmPelsWidth && pdm->dmPanningHeight <= pdm->dmPelsHeight); + + /* Allocate PANDEV */ + pandev = EngAllocMem(FL_ZERO_MEMORY, sizeof(PANDEV), TAG_PAN); + if (!pandev) + { + DPRINT1("Failed to allocate memory\n"); + return NULL; + } + + /* Copy device pointers to our structure (do not copy ppdev->apfn, + * as it contains our local pointers!) */ + RtlCopyMemory(pandev->apfn, ppdev->pldev->apfn, sizeof(pandev->apfn)); + + /* Enable underlying PDEV */ + underlyingDevmode = *pdm; + underlyingDevmode.dmPelsWidth = pdm->dmPanningWidth; + underlyingDevmode.dmPelsHeight = pdm->dmPanningHeight; + pandev->dhpdevScreen = GETPFN(EnablePDEV)(&underlyingDevmode, + pwszLogAddress, + cPat, + phsurfPatterns, + cjCaps, + pdevcaps, + cjDevInfo, + pdi, + hdev, + pwszDeviceName, + hDriver); + if (!pandev->dhpdevScreen) + { + DPRINT1("Failed to enable underlying PDEV\n"); + EngFreeMem(pandev); + return NULL; + } + + pandev->iBitmapFormat = pdi->iDitherFormat; + pandev->szlDesktop.cx = pdm->dmPelsWidth; + pandev->szlDesktop.cy = pdm->dmPelsHeight; + pandev->szlScreen.cx = pdm->dmPanningWidth; + pandev->szlScreen.cy = pdm->dmPanningHeight; + pandev->flUnderlyingGraphicsCaps = pdi->flGraphicsCaps; + + /* Upgrade some capabilities */ + pGdiInfo->ulHorzRes = pdm->dmPelsWidth; + pGdiInfo->ulVertRes = pdm->dmPelsHeight; + pdi->flGraphicsCaps |= GCAPS_PANNING; + pdi->flGraphicsCaps2 = GCAPS2_SYNCFLUSH | GCAPS2_SYNCTIMER; + + gPan = (DHPDEV)pandev; + return (DHPDEV)pandev; +} + +VOID +APIENTRY +PanCompletePDEV( + _In_ DHPDEV dhpdev, + _In_ HDEV hdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanCompletePDEV(%p %p)\n", dhpdev, hdev); + + pandev->hdev = hdev; + GETPFN(CompletePDEV)(pandev->dhpdevScreen, hdev); +} + +VOID +APIENTRY +PanDisablePDEV( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanDisablePDEV(%p)\n", dhpdev); + + GETPFN(DisablePDEV)(pandev->dhpdevScreen); + EngFreeMem(pandev); +} + +VOID +APIENTRY +PanDisableSurface( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + + DPRINT("PanDisableSurface(%p)\n", dhpdev); + + /* Note that we must handle a not fully initialized pandev, as this + * function is also called from PanEnableSurface in case of error. */ + + if (pandev->psoShadow) + { + EngUnlockSurface(pandev->psoShadow); + pandev->psoShadow = NULL; + } + if (pandev->hsurfShadow) + { + EngDeleteSurface(pandev->hsurfShadow); + pandev->hsurfShadow = NULL; + } + if (pandev->hsurf) + { + EngDeleteSurface(pandev->hsurf); + pandev->hsurf = NULL; + } + if (pandev->surfObjScreen) + { + EngUnlockSurface(pandev->surfObjScreen); + pandev->surfObjScreen = NULL; + } + if (pandev->enabledScreen) + { + GETPFN(DisableSurface)(pandev->dhpdevScreen); + pandev->enabledScreen = FALSE; + } +} + +HSURF +APIENTRY +PanEnableSurface( + _In_ DHPDEV dhpdev) +{ + PPANDEV pandev = (PPANDEV)dhpdev; + HSURF surfScreen; + + /* Move viewport to center of screen */ + pandev->rclViewport.left = (pandev->szlDesktop.cx - pandev->szlScreen.cx) / 2; + pandev->rclViewport.top = (pandev->szlDesktop.cy - pandev->szlScreen.cy) / 2; + pandev->rclViewport.right = pandev->rclViewport.left + pandev->szlScreen.cx; + pandev->rclViewport.bottom = pandev->rclViewport.top + pandev->szlScreen.cy; + + /* Enable underlying device */ + surfScreen = GETPFN(EnableSurface)(pandev->dhpdevScreen); + if (!surfScreen) + { + DPRINT1("Failed to enable underlying surface\n"); + goto failure; + } + pandev->enabledScreen = TRUE; + + pandev->surfObjScreen = EngLockSurface(surfScreen); + if (!pandev->surfObjScreen) + { + DPRINT1("Failed to lock underlying surface\n"); + goto failure; + } + + /* Create device surface */ + pandev->hsurf = EngCreateDeviceSurface(NULL, pandev->szlDesktop, pandev->iBitmapFormat); + if (!pandev->hsurf) + { + DPRINT1("EngCreateDeviceSurface() failed\n"); + goto failure; + } + + if (!EngAssociateSurface(pandev->hsurf, pandev->hdev, HOOK_ALPHABLEND | + HOOK_BITBLT | + HOOK_COPYBITS | + HOOK_GRADIENTFILL | + HOOK_STROKEPATH | + HOOK_SYNCHRONIZE | + HOOK_TEXTOUT)) + { + DPRINT1("EngAssociateSurface() failed\n"); + goto failure; + } + + /* Create shadow surface */ + pandev->hsurfShadow = (HSURF)EngCreateBitmap(pandev->szlDesktop, pandev->szlDesktop.cx, pandev->iBitmapFormat, BMF_TOPDOWN, NULL); + if (!pandev->hsurfShadow) + { + DPRINT1("EngCreateBitmap() failed\n"); + goto failure; + } + + pandev->psoShadow = EngLockSurface(pandev->hsurfShadow); + if (!pandev->psoShadow) + { + DPRINT1("EngLockSurface() failed\n"); + goto failure; + } + + return pandev->hsurf; + +failure: + PanDisableSurface(dhpdev); + return NULL; +} + +BOOL +APIENTRY +PanBitBlt( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclTrg, + _In_opt_ PPOINTL pptlSrc, + _In_opt_ PPOINTL pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ PPOINTL pptlBrush, + _In_ ROP4 rop4) +{ + PPANDEV pandev; + BOOL res; + + if (psoTrg->iType == STYPE_DEVICE) + { + pandev = (PPANDEV)psoTrg->dhpdev; + psoTrg = pandev->psoShadow; + } + if (psoSrc && psoSrc->iType == STYPE_DEVICE) + { + pandev = (PPANDEV)psoSrc->dhpdev; + psoSrc = pandev->psoShadow; + } + + res = EngBitBlt(psoTrg, psoSrc, psoMask, pco, pxlo, prclTrg, pptlSrc, pptlMask, pbo, pptlBrush, rop4); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +BOOL +APIENTRY +PanCopyBits( + _Inout_ SURFOBJ *psoDest, + _In_opt_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclDest, + _In_opt_ PPOINTL pptlSrc) +{ + /* Easy. Just call the more general function PanBitBlt */ + return PanBitBlt(psoDest, psoSrc, NULL, pco, pxlo, prclDest, pptlSrc, NULL, NULL, NULL, ROP4_SRCCOPY); +} + +BOOL +APIENTRY +PanStrokePath( + _Inout_ SURFOBJ *pso, + _In_ PATHOBJ *ppo, + _In_ CLIPOBJ *pco, + _In_opt_ XFORMOBJ *pxo, + _In_ BRUSHOBJ *pbo, + _In_ PPOINTL pptlBrushOrg, + _In_ PLINEATTRS plineattrs, + _In_ MIX mix) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return FALSE; +} + +BOOL +APIENTRY +PanTextOut( + _Inout_ SURFOBJ *pso, + _In_ STROBJ *pstro, + _In_ FONTOBJ *pfo, + _In_ CLIPOBJ *pco, + _In_opt_ PRECTL prclExtra, + _In_opt_ PRECTL prclOpaque, + _In_ BRUSHOBJ *pboFore, + _In_ BRUSHOBJ *pboOpaque, + _In_ PPOINTL pptlOrg, + _In_ MIX mix) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return FALSE; +} + +VOID +APIENTRY +PanMovePointer( + _Inout_ SURFOBJ *pso, + _In_ LONG x, + _In_ LONG y, + _In_ PRECTL prcl) +{ + PPANDEV pandev = (PPANDEV)pso->dhpdev; + PFN_DrvMovePointer pfnMovePointer; + BOOL bChanged = FALSE; + + DPRINT("PanMovePointer(%d, %d)\n", x, y); + + /* FIXME: MouseSafetyOnDrawStart/MouseSafetyOnDrawEnd like to call us to hide/show the cursor, + * without real reason (see 5b0f6dcceeae3cf21f2535e2c523c0bf2749ea6b). Ignore those calls */ + if (x < 0 || y >= 0) return; + + /* We don't set DrvSetPointerShape, so we must not be called + * with x < 0 (hide cursor) or y >= 0 (we have GCAPS_PANNING) */ + ASSERT(x >= 0 && y < 0); + + /* Call underlying MovePointer function */ + if (pandev->flUnderlyingGraphicsCaps & GCAPS_PANNING) + { + pfnMovePointer = GETPFN(MovePointer); + if (pfnMovePointer) + pfnMovePointer(pandev->surfObjScreen, x, y, prcl); + } + + y += pso->sizlBitmap.cy; + + if (x < pandev->rclViewport.left) + { + pandev->rclViewport.left = x; + pandev->rclViewport.right = x + pandev->szlScreen.cx; + bChanged = TRUE; + } + else if (x >= pandev->rclViewport.right) + { + pandev->rclViewport.right = x + 1; + pandev->rclViewport.left = x - pandev->szlScreen.cx; + bChanged = TRUE; + } + if (y < pandev->rclViewport.top) + { + pandev->rclViewport.top = y; + pandev->rclViewport.bottom = y + pandev->szlScreen.cy; + bChanged = TRUE; + } + else if (y >= pandev->rclViewport.bottom) + { + pandev->rclViewport.bottom = y + 1; + pandev->rclViewport.top = y - pandev->szlScreen.cy; + bChanged = TRUE; + } + + if (bChanged) + PanSynchronize(pso->dhpdev, NULL); +} + +BOOL +APIENTRY +PanAlphaBlend( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoSrc, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PRECTL prclDest, + _In_ PRECTL prclSrc, + _In_ BLENDOBJ *pBlendObj) +{ + PPANDEV pandev = (PPANDEV)psoDest->dhpdev; + BOOL res; + + res = EngAlphaBlend(pandev->psoShadow, psoSrc, pco, pxlo, prclDest, prclSrc, pBlendObj); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +BOOL +APIENTRY +PanGradientFill( + _Inout_ SURFOBJ *pso, + _In_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ PTRIVERTEX pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ PRECTL prclExtents, + _In_ PPOINTL pptlDitherOrg, + _In_ ULONG ulMode) +{ + PPANDEV pandev = (PPANDEV)pso->dhpdev; + BOOL res; + + res = EngGradientFill(pandev->psoShadow, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); + + /* FIXME: PanSynchronize must be called periodically, as we have the GCAPS2_SYNCTIMER flag. + * That's not the case, so call PanSynchronize() manually */ + if (res) + PanSynchronize(gPan, NULL); + + return res; +} + +DRVFN gPanDispDrvFn[] = +{ + /* required */ + { INDEX_DrvEnablePDEV, (PFN) PanEnablePDEV }, + { INDEX_DrvCompletePDEV, (PFN) PanCompletePDEV }, + { INDEX_DrvDisablePDEV, (PFN) PanDisablePDEV }, + { INDEX_DrvEnableSurface, (PFN) PanEnableSurface }, + { INDEX_DrvDisableSurface, (PFN) PanDisableSurface }, + + /* required for device-managed surfaces */ + { INDEX_DrvCopyBits, (PFN) PanCopyBits }, + { INDEX_DrvStrokePath, (PFN) PanStrokePath }, + { INDEX_DrvTextOut, (PFN) PanTextOut }, + + /* optional, but required for panning functionality */ + { INDEX_DrvSynchronize, (PFN) PanSynchronize }, + { INDEX_DrvMovePointer, (PFN) PanMovePointer }, + + /* optional */ + { INDEX_DrvBitBlt, (PFN) PanBitBlt }, + { INDEX_DrvAlphaBlend, (PFN) PanAlphaBlend }, + { INDEX_DrvGradientFill, (PFN) PanGradientFill }, +}; + +ULONG gPanDispDrvCount = RTL_NUMBER_OF(gPanDispDrvFn); diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index c16fd43bf4b..293dae4b967 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -21,6 +21,9 @@ MultiEnableDriver( _In_ ULONG cj, _Inout_bytecount_(cj) PDRVENABLEDATA pded); +extern DRVFN gPanDispDrvFn[]; +extern ULONG gPanDispDrvCount; + CODE_SEG("INIT") NTSTATUS NTAPI @@ -503,7 +506,24 @@ PDEVOBJ_Create( ppdev->dwAccelerationLevel = dwAccelerationLevel; /* Copy the function table */ - ppdev->pfn = ppdev->pldev->pfn; + if (pdm->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) + { + ULONG i; + + /* Initialize missing fields */ + if (!(pdm->dmFields & DM_PANNINGWIDTH)) + pdm->dmPanningWidth = pdm->dmPelsWidth; + if (!(pdm->dmFields & DM_PANNINGHEIGHT)) + pdm->dmPanningHeight = pdm->dmPelsHeight; + + /* Replace vtable by panning vtable */ + for (i = 0; i < gPanDispDrvCount; i++) + ppdev->apfn[gPanDispDrvFn[i].iFunc] = gPanDispDrvFn[i].pfn; + } + else + { + ppdev->pfn = ppdev->pldev->pfn; + } /* Call the driver to enable the PDEV */ if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL))

2 years, 7 months

[reactos] 04/06: [WIN32SS] mouse: call panning driver when moving pointer

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d2c8ce3366a8d1fafae… commit 83d2c8ce3366a8d1fafae52ee804a70c66e8a6b9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 14 15:41:44 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] mouse: call panning driver when moving pointer Yes, if a driver supports both hardware pointers and panning, it will be called twice on each move. --- win32ss/gdi/eng/mouse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/gdi/eng/mouse.c b/win32ss/gdi/eng/mouse.c index 21f67f7fdcc..c8de250aa1f 100644 --- a/win32ss/gdi/eng/mouse.c +++ b/win32ss/gdi/eng/mouse.c @@ -820,6 +820,11 @@ GreMovePointer( pdc->ppdev->pfnMovePointer(pso, x, y, prcl); else if (pdc->ppdev->flFlags & PDEV_SOFTWARE_POINTER) EngMovePointer(pso, x, y, prcl); + + /* If panning device, and we're not hiding the cursor, notify cursor's current position. + * (driver may already have been called if it also supports hardware pointers) */ + if (pdc->ppdev->devinfo.flGraphicsCaps & GCAPS_PANNING && y >= 0) + pdc->ppdev->pfnMovePointer(pso, x, y - pso->sizlBitmap.cy, NULL); } /* Release PDEV lock */

2 years, 7 months

[reactos] 03/06: [WIN32SS] mouse: use pointer flags in PDEVOBJ

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57c07ba117dca721676df… commit 57c07ba117dca721676dfa3876b26e3fd63c4106 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat May 14 15:37:29 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] mouse: use pointer flags in PDEVOBJ When changing pointer cursor: - use PDEV_HARDWARE_POINTER flag if using hardware pointer - use PDEV_SOFTWARE_POINTER flag if using software pointer - keep pfnMovePointer as an accelerator to driver function (if available) and never change it - fix bug (2 pointers) when switching between hardware and software pointer When moving pointer: - check PDEV_HARDWARE_POINTER flag to know if we need to call the driver - check PDEV_SOFTWARE_POINTER flag to know if we need to call EngMovePointer --- win32ss/gdi/eng/mouse.c | 50 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/eng/mouse.c b/win32ss/gdi/eng/mouse.c index 677a0e68eee..21f67f7fdcc 100644 --- a/win32ss/gdi/eng/mouse.c +++ b/win32ss/gdi/eng/mouse.c @@ -618,6 +618,8 @@ IntEngSetPointerShape( ULONG ulResult = SPS_DECLINE; PFN_DrvSetPointerShape pfnSetPointerShape; PPDEVOBJ ppdev = GDIDEV(pso); + BOOL bHardwarePointer = FALSE; + BOOL bSoftwarePointer = TRUE; pfnSetPointerShape = GDIDEVFUNCS(pso).SetPointerShape; @@ -638,15 +640,15 @@ IntEngSetPointerShape( y, prcl, fl); - } - /* Check if the driver accepted it */ - if (ulResult == SPS_ACCEPT_NOEXCLUDE) - { - /* Set MovePointer to the driver function */ - ppdev->pfnMovePointer = GDIDEVFUNCS(pso).MovePointer; + /* Check if the driver accepted it */ + if (ulResult == SPS_ACCEPT_NOEXCLUDE) + bHardwarePointer = TRUE; + + bSoftwarePointer = !bHardwarePointer; } - else + + if (bSoftwarePointer) { /* Set software pointer */ ulResult = EngSetPointerShape(pso, @@ -659,10 +661,31 @@ IntEngSetPointerShape( y, prcl, fl); - /* Set MovePointer to the eng function */ - ppdev->pfnMovePointer = EngMovePointer; } + if (!bSoftwarePointer && ppdev->flFlags & PDEV_SOFTWARE_POINTER) + { + /* Disable software pointer */ + EngMovePointer(pso, -1, -1, NULL); + } + + if (!bHardwarePointer && ppdev->flFlags & PDEV_HARDWARE_POINTER) + { + /* Disable hardware pointer */ + ppdev->pfnMovePointer(pso, -1, -1, NULL); + } + + /* Update flags */ + if (bSoftwarePointer) + ppdev->flFlags |= PDEV_SOFTWARE_POINTER; + else + ppdev->flFlags &= ~PDEV_SOFTWARE_POINTER; + + if (bHardwarePointer) + ppdev->flFlags |= PDEV_HARDWARE_POINTER; + else + ppdev->flFlags &= ~PDEV_HARDWARE_POINTER; + return ulResult; } @@ -787,11 +810,16 @@ GreMovePointer( /* Check if we need to move it */ if(pdc->ppdev->SafetyRemoveLevel == 0) { + SURFOBJ* pso = &pdc->ppdev->pSurface->SurfObj; + /* Store the cursor exclude position in the PDEV */ prcl = &pdc->ppdev->Pointer.Exclude; - /* Call Eng/Drv function */ - pdc->ppdev->pfnMovePointer(&pdc->ppdev->pSurface->SurfObj, x, y, prcl); + /* Send new position of the hot spot of the pointer (will likely redraw cursor) */ + if (pdc->ppdev->flFlags & PDEV_HARDWARE_POINTER) + pdc->ppdev->pfnMovePointer(pso, x, y, prcl); + else if (pdc->ppdev->flFlags & PDEV_SOFTWARE_POINTER) + EngMovePointer(pso, x, y, prcl); } /* Release PDEV lock */

2 years, 7 months

[reactos] 02/06: [WIN32SS] Handle panning in LDEVOBJ_bProbeAndCaptureDevmode

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37c2bb3985c5724e9c3d0… commit 37c2bb3985c5724e9c3d00472f6f3419d65266d1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 21:56:00 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Handle panning in LDEVOBJ_bProbeAndCaptureDevmode - search a graphic mode corresponding to real screen resolution (not virtual panning one) - when capturing the selected mode, copy from input the virtual panning resolution - when searching the best mode, also try without panning --- win32ss/gdi/eng/ldevobj.c | 53 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index cb6a8bbbe32..43c0e0fdf94 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -688,6 +688,14 @@ LDEVOBJ_bGetClosestMode( if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) return TRUE; + /* Remove panning (if specified) */ + if (RequestedMode->dmFields & (DM_PANNINGWIDTH | DM_PANNINGHEIGHT)) + { + RequestedMode->dmFields &= ~(DM_PANNINGWIDTH | DM_PANNINGHEIGHT); + if (LDEVOBJ_bProbeAndCaptureDevmode(pGraphicsDevice, RequestedMode, pSelectedMode, FALSE)) + return TRUE; + } + /* Fall back to first mode */ WARN("Fall back to first available mode\n"); *pSelectedMode = pGraphicsDevice->pDevModeList[0].pdm; @@ -718,21 +726,36 @@ LDEVOBJ_bProbeAndCaptureDevmode( else { /* Search if requested mode exists */ + DWORD dmPelsWidth = RequestedMode->dmPelsWidth; + DWORD dmPelsHeight = RequestedMode->dmPelsHeight; + DWORD dmFields = RequestedMode->dmFields; + + if (dmFields & DM_PANNINGWIDTH) + { + dmFields |= DM_PELSWIDTH; + dmPelsWidth = RequestedMode->dmPanningWidth; + } + if (dmFields & DM_PANNINGHEIGHT) + { + dmFields |= DM_PELSHEIGHT; + dmPelsHeight = RequestedMode->dmPanningHeight; + } + for (i = 0; i < pGraphicsDevice->cDevModes; i++) { pdmCurrent = pGraphicsDevice->pDevModeList[i].pdm; /* Compare asked DEVMODE fields * Only compare those that are valid in both DEVMODE structs */ - dwFields = pdmCurrent->dmFields & RequestedMode->dmFields; + dwFields = pdmCurrent->dmFields & dmFields; /* For now, we only need those */ if ((dwFields & DM_BITSPERPEL) && (pdmCurrent->dmBitsPerPel != RequestedMode->dmBitsPerPel)) continue; if ((dwFields & DM_PELSWIDTH) && - (pdmCurrent->dmPelsWidth != RequestedMode->dmPelsWidth)) continue; + (pdmCurrent->dmPelsWidth != dmPelsWidth)) continue; if ((dwFields & DM_PELSHEIGHT) && - (pdmCurrent->dmPelsHeight != RequestedMode->dmPelsHeight)) continue; + (pdmCurrent->dmPelsHeight != dmPelsHeight)) continue; if ((dwFields & DM_DISPLAYFREQUENCY) && (pdmCurrent->dmDisplayFrequency != RequestedMode->dmDisplayFrequency)) continue; @@ -743,10 +766,10 @@ LDEVOBJ_bProbeAndCaptureDevmode( if (!pdmSelected) { WARN("Requested mode not found (%dx%dx%d %d Hz)\n", - RequestedMode->dmFields & DM_PELSWIDTH ? RequestedMode->dmPelsWidth : 0, - RequestedMode->dmFields & DM_PELSHEIGHT ? RequestedMode->dmPelsHeight : 0, - RequestedMode->dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, - RequestedMode->dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); + dmFields & DM_PELSWIDTH ? dmPelsWidth : 0, + dmFields & DM_PELSHEIGHT ? dmPelsHeight : 0, + dmFields & DM_BITSPERPEL ? RequestedMode->dmBitsPerPel : 0, + dmFields & DM_DISPLAYFREQUENCY ? RequestedMode->dmDisplayFrequency : 0); return FALSE; } } @@ -762,6 +785,22 @@ LDEVOBJ_bProbeAndCaptureDevmode( (PVOID)((ULONG_PTR)pdmSelected + pdmSelected->dmSize), pdmSelected->dmDriverExtra); + if (!bSearchClosestMode) + { + if (RequestedMode->dmFields & DM_PANNINGWIDTH) + { + pdm->dmFields |= DM_PANNINGWIDTH; + pdm->dmPanningWidth = pdm->dmPelsWidth; + pdm->dmPelsWidth = RequestedMode->dmPelsWidth; + } + if (RequestedMode->dmFields & DM_PANNINGHEIGHT) + { + pdm->dmFields |= DM_PANNINGHEIGHT; + pdm->dmPanningHeight = pdm->dmPelsHeight; + pdm->dmPelsHeight = RequestedMode->dmPelsHeight; + } + } + *pSelectedMode = pdm; return TRUE; }

2 years, 7 months

[reactos] 01/06: [WIN32SS] Copy function table earlier, and use it in all PDEVOBJ operations

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=185f2dac855b55d328fd5… commit 185f2dac855b55d328fd547ef4faaa0f3df7a42b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 8 21:51:10 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat May 14 21:29:12 2022 +0200 [WIN32SS] Copy function table earlier, and use it in all PDEVOBJ operations --- win32ss/gdi/eng/pdevobj.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 65469cfce76..c16fd43bf4b 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -176,7 +176,7 @@ PDEVOBJ_bEnablePDEV( ULONG i; /* Get the DrvEnablePDEV function */ - pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV; + pfnEnablePDEV = ppdev->pfn.EnablePDEV; /* Call the drivers DrvEnablePDEV function */ TRACE("DrvEnablePDEV(pdevmode %p (%dx%dx%d %d Hz) hdev %p (%S))\n", @@ -243,7 +243,7 @@ PDEVOBJ_vCompletePDEV( { /* Call the drivers DrvCompletePDEV function */ TRACE("DrvCompletePDEV(dhpdev %p hdev %p)\n", ppdev->dhpdev, ppdev); - ppdev->pldev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); + ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); } static @@ -314,7 +314,7 @@ PDEVOBJ_pSurface( { /* Call the drivers DrvEnableSurface */ TRACE("DrvEnableSurface(dhpdev %p)\n", ppdev->dhpdev); - hsurf = ppdev->pldev->pfn.EnableSurface(ppdev->dhpdev); + hsurf = ppdev->pfn.EnableSurface(ppdev->dhpdev); TRACE("DrvEnableSurface(dhpdev %p) => hsurf %p\n", ppdev->dhpdev, hsurf); if (hsurf== NULL) { @@ -502,6 +502,9 @@ PDEVOBJ_Create( ppdev->pldev = pldev; ppdev->dwAccelerationLevel = dwAccelerationLevel; + /* Copy the function table */ + ppdev->pfn = ppdev->pldev->pfn; + /* Call the driver to enable the PDEV */ if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL)) { @@ -511,9 +514,6 @@ PDEVOBJ_Create( return NULL; } - /* Copy the function table */ - ppdev->pfn = ppdev->pldev->pfn; - /* Tell the driver that the PDEV is ready */ PDEVOBJ_vCompletePDEV(ppdev);

2 years, 7 months

[reactos] 01/01: [NTOS:MM] Charge and free quotas for VAD allocations

by Tuur Martens

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=884356a06e1589271595e… commit 884356a06e1589271595e198e0a32c35d29d6059 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Thu May 12 08:11:52 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat May 14 15:09:50 2022 +0200 [NTOS:MM] Charge and free quotas for VAD allocations Charge quotas for VAD allocations and free the quotas again when the VADs are freed. CORE-18028 --- ntoskrnl/mm/ARM3/mdlsup.c | 5 +++++ ntoskrnl/mm/ARM3/procsup.c | 27 +++++++++++++++++++++++++-- ntoskrnl/mm/ARM3/section.c | 9 +++++++++ ntoskrnl/mm/ARM3/virtual.c | 26 ++++++++++++++++++++++---- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 9332ec3153e..0d74949cd16 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -158,6 +158,10 @@ MiMapLockedPagesInUserSpace( MiInsertVad((PMMVAD)Vad, &Process->VadRoot); + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + goto Error; + /* Check if this is uncached */ if (CacheAttribute != MiCached) { @@ -319,6 +323,7 @@ MiUnmapLockedPagesInUserSpace( /* Remove it from the process VAD tree */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); /* MiRemoveNode should have removed us if we were the hint */ ASSERT(Process->VadRoot.NodeHint != Vad); diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index dd04b68fb83..2ddd91c5ca2 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -97,6 +97,13 @@ MiCreatePebOrTeb(IN PEPROCESS Process, return STATUS_NO_MEMORY; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + /* Success */ return STATUS_SUCCESS; } @@ -154,6 +161,9 @@ MmDeleteTeb(IN PEPROCESS Process, /* Remove the VAD */ ExFreePool(Vad); + + /* Return the quota the VAD used */ + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } /* Release the address space lock */ @@ -842,7 +852,8 @@ MmCreateTeb(IN PEPROCESS Process, #ifdef _M_AMD64 static NTSTATUS -MiInsertSharedUserPageVad(VOID) +MiInsertSharedUserPageVad( + _In_ PEPROCESS Process) { PMMVAD_LONG Vad; ULONG_PTR BaseAddress; @@ -890,6 +901,15 @@ MiInsertSharedUserPageVad(VOID) return Status; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of quota.\n"); + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + + /* Success */ return STATUS_SUCCESS; } @@ -1012,7 +1032,7 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, #ifdef _M_AMD64 /* On x64 we need a VAD for the shared user page */ - Status = MiInsertSharedUserPageVad(); + Status = MiInsertSharedUserPageVad(Process); if (!NT_SUCCESS(Status)) { DPRINT1("MiCreateSharedUserPageVad() failed: 0x%lx\n", Status); @@ -1300,6 +1320,9 @@ MmCleanProcessAddressSpace(IN PEPROCESS Process) /* Free the VAD memory */ ExFreePool(Vad); + + /* Return the quota the VAD used */ + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } /* Lock the working set */ diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index 4a65209d38b..40d942f7703 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -915,6 +915,7 @@ MiUnmapViewOfSection(IN PEPROCESS Process, /* Remove the VAD */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); /* Remove the PTEs for this view, which also releases the working set lock */ MiRemoveMappedView(Process, Vad); @@ -1489,6 +1490,13 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, StartAddress = 0; } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } + /* Insert the VAD */ Status = MiInsertVadEx((PMMVAD)Vad, &StartAddress, @@ -1498,6 +1506,7 @@ MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, AllocationType); if (!NT_SUCCESS(Status)) { + PsReturnProcessNonPagedPoolQuota(PsGetCurrentProcess(), sizeof(MMVAD_LONG)); return Status; } diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index f178edbb909..c5c5a5283b0 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -4790,6 +4790,15 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, goto FailPathNoLock; } + // Charge quotas for the VAD + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Quota exceeded.\n"); + ExFreePoolWithTag(Vad, 'SdaV'); + goto FailPathNoLock; + } + // // Detach and dereference the target process if // it was different from the current process @@ -5416,6 +5425,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } else { @@ -5448,6 +5458,7 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } else { @@ -5522,6 +5533,17 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, goto FailPath; } + // Charge quota for the new VAD + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of process quota whilst creating new VAD!\n"); + ExFreePoolWithTag(NewVad, 'SdaV'); + Status = STATUS_QUOTA_EXCEEDED; + goto FailPath; + } + // // This new VAD describes the second chunk, so we keep the end // address of the original and adjust the start to point past @@ -5534,10 +5556,6 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, NewVad->u.VadFlags.CommitCharge = 0; ASSERT(NewVad->EndingVpn >= NewVad->StartingVpn); - // - // TODO: charge quota for the new VAD - // - // // Get the commit charge for the released region //

2 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022