Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/03: [MKHIVE] Minor code rearrangement.
by Hermès Bélusca-Maïto 20 Oct '18

20 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aef566c19e57cc26c94a9… commit aef566c19e57cc26c94a9a8dc593bf5e48a41163 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 20 16:49:30 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 20 19:52:07 2018 +0200 [MKHIVE] Minor code rearrangement. --- sdk/tools/mkhive/registry.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/tools/mkhive/registry.c b/sdk/tools/mkhive/registry.c index 8ee8d36ec8..9628f67573 100644 --- a/sdk/tools/mkhive/registry.c +++ b/sdk/tools/mkhive/registry.c @@ -66,7 +66,7 @@ static CMHIVE BcdHive; /* \Registry\Machine\BCD00000000 */ // See http://amnesia.gtisc.gatech.edu/~moyix/suzibandit.ltd.uk/MSc/Registry%20Str… // Appendix 12 "The Registry NT Security Descriptor" for more information. // -// Those SECURITY_DESCRIPTORs were obtained by dumping the security block "sk" +// These SECURITY_DESCRIPTORs were obtained by dumping the security block "sk" // of registry hives created by setting their permissions to be the same as // the ones of the BCD, SOFTWARE, or SYSTEM, SAM and .DEFAULT system hives. // A cross-check was subsequently done with the system hives to verify that @@ -1010,10 +1010,10 @@ Quit: static BOOL ConnectRegistry( IN HKEY RootKey, + IN PCWSTR Path, IN PCMHIVE HiveToConnect, IN PUCHAR SecurityDescriptor, - IN ULONG SecurityDescriptorLength, - IN PCWSTR Path) + IN ULONG SecurityDescriptorLength) { NTSTATUS Status; LONG rc; @@ -1159,10 +1159,10 @@ RegInitializeRegistry( /* Create the registry key */ ConnectRegistry(NULL, + RegistryHives[i].HiveRegistryPath, RegistryHives[i].CmHive, RegistryHives[i].SecurityDescriptor, - RegistryHives[i].SecurityDescriptorLength, - RegistryHives[i].HiveRegistryPath); + RegistryHives[i].SecurityDescriptorLength); /* If we happen to deal with the special setup registry hive, stop there */ // if (strcmp(RegistryHives[i].HiveName, "SETUPREG") == 0)

1 0

01/01: [NOTEPAD] ReactOS Notepad Hindi Translation (#938)
by Arnav Bhatt 20 Oct '18

20 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9deba9a56b19d927cab1… commit b9deba9a56b19d927cab1172a458ac86c43067b3 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Sat Oct 20 23:11:32 2018 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 20 19:41:32 2018 +0200 [NOTEPAD] ReactOS Notepad Hindi Translation (#938) --- base/applications/notepad/lang/hi-IN.rc | 193 ++++++++++++++++++++++++++++++++ base/applications/notepad/rsrc.rc | 3 + 2 files changed, 196 insertions(+) diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc new file mode 100644 index 0000000000..f6040bb1ea --- /dev/null +++ b/base/applications/notepad/lang/hi-IN.rc @@ -0,0 +1,193 @@ +/* + * PROJECT: Notepad Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi Translation Of Notepad + * COPYRIGHT: Copyright 2018 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&फ़ाइल" + BEGIN + MENUITEM "&नया\tCtrl+N", CMD_NEW + MENUITEM "&खोलो...\tCtrl+O", CMD_OPEN + MENUITEM "&सेव\tCtrl+S", CMD_SAVE + MENUITEM "सेव &इज़...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "पेज &सेटअप...", CMD_PAGE_SETUP + MENUITEM "&प्रिन्ट...\tCtrl+P", CMD_PRINT + MENUITEM SEPARATOR + MENUITEM "&इग्ज़िट", CMD_EXIT + END + POPUP "&संपादित करें" + BEGIN + MENUITEM "&पूर्ववत करें\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&कट\tCtrl+X", CMD_CUT + MENUITEM "&कॉपी\tCtrl+C", CMD_COPY + MENUITEM "&पेस्ट\tCtrl+V", CMD_PASTE + MENUITEM "&डिलीट\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&ढूंढो...\tCtrl+F", CMD_SEARCH + MENUITEM "&अगला ढूंढो\tF3", CMD_SEARCH_NEXT + MENUITEM "&बदलले...\tCtrl+H", CMD_REPLACE + MENUITEM "&के लिए जाओ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "&सभी का चयन करे\tCtrl+A", CMD_SELECT_ALL + MENUITEM "समय/&तारीख\tF5", CMD_TIME_DATE + END + POPUP "&स्वरूप" + BEGIN + MENUITEM "&वर्ड रैप", CMD_WRAP + MENUITEM "&फ़ॉन्ट...", CMD_FONT + END + POPUP "&देखें" + BEGIN + MENUITEM "&स्टेटस बार", CMD_STATUSBAR + END + POPUP "&मदद" + BEGIN + MENUITEM "&मदद देखें", CMD_HELP_CONTENTS + MENUITEM SEPARATOR + MENUITEM "&नोटपैड के बारे में", CMD_ABOUT + MENUITEM "&जानकारी", CMD_HELP_ABOUT_NOTEPAD + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +FONT 8, "MS Shell Dlg" +CAPTION " पेज सेटअप" +BEGIN + GROUPBOX "प्रीव्यू", 0, 240, 6, 120, 153, BS_GROUPBOX + CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 + GROUPBOX "कागज़", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "&साइज़:", stc2, 16, 22, 36, 8 + COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + LTEXT "&ट्रे:", stc3, 16, 42, 36, 8 + COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL + GROUPBOX "अभिविन्यास", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&पॉर्ट्रट", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&लैन्ड्स्केप", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "बॉर्डरो", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&बाएं:", stc15, 88, 82, 30, 8 + EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&दाईं:", stc16, 159, 82, 30, 8 + EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&ऊपर:", stc17, 88, 102, 30, 8 + EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&तल:", stc18, 159, 102, 30, 8 + EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER + LTEXT "&हैडर:", 0x140, 8, 132, 40, 15 + EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&फ़ुटर:", 0x142, 8, 149, 40, 15 + EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + PUSHBUTTON "सहायता", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "ओके", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "&प्रिंटर...", psh3, 310, 170, 50, 14 +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "एन्कोडिंग" +BEGIN + COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "एन्कोडिंग:", 0x155, 5, 2, 41, 12 + COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "लाइन का अंत:", 0x156, 5, 20, 41, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "गोटो लाइन" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "लाइन संख्या:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "ओके", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस नोटपैड के बारे में" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "रिऐक्ट ओएस नोटपैड v1.0\r\nकॉपीराइट 1997,98 Marcel Baur\r\nकॉपीराइट 2000 Mike McCormack\r\nकॉपीराइट 2002 Sylvain Petreolle\r\nकॉपीराइट 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 + DEFPUSHBUTTON "बंद करे", IDOK, 114, 149, 44, 15, WS_GROUP + ICON IDI_NPICON, -1, 12, 9, 20, 30 + EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_NOTEPAD "नोटपैड" + STRING_ERROR "त्रुटि" + STRING_WARNING "वॉर्निंग" + STRING_INFO "सूचना" + STRING_UNTITLED "शीर्षकहीन" + STRING_ALL_FILES "सभी फाइलें (*.*)" + STRING_TEXT_FILES_TXT "पाठ फाइलें (*.txt)" + STRING_TOOLARGE "नोटपैड के लिए फ़ाइल '% s' बहुत बड़ी है।\n \ +कृपया एक अलग इडिटर का प्रयोग करें।" + STRING_NOTEXT "आपने कोई टेक्स्ट दर्ज नहीं किया है।\ +\nकृपया कुछ टाइप करें और पुनः प्रयास करें" + STRING_DOESNOTEXIST "फ़ाइल' %s'\nमौजूद नहीं है\n\n \ +क्या आप एक नई फाइल बनाना चाहते हैं?" + STRING_NOTSAVED "फ़ाइल '%s'\nको संशोधित किया गया है\n\n \ +क्या आप बदलावों को सहेजना चाहते हैं?" + STRING_NOTFOUND "'%s' नहीं मिला।" + STRING_OUT_OF_MEMORY "इस कार्य को पूरा करने के लिए पर्याप्त स्मृति नहीं \ +है। \nमुफ्त मेमोरी की मात्रा बढ़ाने के लिए एक या अधिक एप्लिकेशन\nबंद करें।" + STRING_CANNOTFIND "'%s' नहीं मिला" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Mac (CR)" + STRING_LINE_COLUMN "लाइन%d, स्तंभ%d" + STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" + + STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" +END diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc index 8af6d8fa62..3ae6931ad6 100644 --- a/base/applications/notepad/rsrc.rc +++ b/base/applications/notepad/rsrc.rc @@ -71,6 +71,9 @@ IDI_NPICON ICON "res/notepad.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

1 0

01/01: [NTVDM] Allow opening files with write access on CDROM
by Pierre Schweitzer 20 Oct '18

20 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=827ed4b146b17ae6a808e… commit 827ed4b146b17ae6a808e8943bf06888b924cb69 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 20 12:53:52 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 20 17:27:53 2018 +0200 [NTVDM] Allow opening files with write access on CDROM Some applications, run on a CDROM, may attempt to open a file with write access. CDFS driver will deny such request in ReactOS (but also in Windows NT). Then, to restore that behavior from old Windows (9X), our ntvdm, as Microsoft ntvdm will attempt to reopen the file only with read access, if opening failed because of denied access and if the file is on a CDROM. CORE-15211 --- subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c index d5b01ce7fb..641ab62ed9 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c @@ -161,6 +161,21 @@ static BOOLEAN DosChangeDirectory(LPSTR Directory) return TRUE; } +static BOOLEAN DosIsFileOnCdRom(VOID) +{ + UINT DriveType; + CHAR RootPathName[4]; + + /* Construct a simple <letter>:\ string to get drive type */ + RootPathName[0] = Sda->CurrentDrive + 'A'; + RootPathName[1] = ':'; + RootPathName[2] = '\\'; + RootPathName[3] = ANSI_NULL; + + DriveType = GetDriveTypeA(RootPathName); + return (DriveType == DRIVE_CDROM); +} + /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN DosControlBreak(VOID) @@ -950,8 +965,19 @@ VOID WINAPI DosInt21h(LPWORD Stack) case 0x3D: { WORD FileHandle; + BYTE AccessShareModes = getAL(); LPCSTR FileName = (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()); - WORD ErrorCode = DosOpenFile(&FileHandle, FileName, getAL()); + WORD ErrorCode = DosOpenFile(&FileHandle, FileName, AccessShareModes); + + /* + * Check if we failed because we attempted to open a file for write + * on a CDROM drive. In that situation, attempt to reopen for read + */ + if (ErrorCode == ERROR_ACCESS_DENIED && + (AccessShareModes & 0x03) != 0 && DosIsFileOnCdRom()) + { + ErrorCode = DosOpenFile(&FileHandle, FileName, 0); + } if (ErrorCode == ERROR_SUCCESS) {

1 0

01/01: [NTVDM] Implement INT21, AX=4408, Determine if a block device is removable.
by Mark Jansen 19 Oct '18

19 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44898a4ea4b445d57063f… commit 44898a4ea4b445d57063fe281b1785164887b754 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Oct 8 23:12:19 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 20 00:14:44 2018 +0200 [NTVDM] Implement INT21, AX=4408, Determine if a block device is removable. --- subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c | 70 +++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c index fea885a71b..b636e225db 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c @@ -1125,11 +1125,79 @@ BOOLEAN DosUnlockFile(WORD DosHandle, DWORD Offset, DWORD Size) return TRUE; } +BOOLEAN DosDeviceIoControlDrive(WORD DriveNumber, BYTE ControlCode, DWORD Buffer, PWORD Result) +{ + CHAR RootPath[] = "?:\\"; + + if (DriveNumber == 0x00) + RootPath[0] = 'A' + Sda->CurrentDrive; + else + RootPath[0] = 'A' + DriveNumber - 1; + + switch (ControlCode) + { + case 0x04: + DPRINT1("UNIMPLEMENTED INT 21h, 4404h, Read from block device %s\n", RootPath); + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + break; + case 0x05: + DPRINT1("UNIMPLEMENTED INT 21h, 4405h, Write block device control string %s\n", RootPath); + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + break; + case 0x08: + { + DWORD DriveType = GetDriveTypeA(RootPath); + + switch (DriveType) + { + case DRIVE_UNKNOWN: + case DRIVE_NO_ROOT_DIR: + default: + DPRINT1("INT 21h, 4408h, %s -> DriveType = 0x%x\n", RootPath, DriveType); + *Result = 0x000f; + return TRUE; + case DRIVE_REMOVABLE: + case DRIVE_CDROM: + *Result = 0x0000; + return TRUE; + case DRIVE_FIXED: + *Result = 0x0001; + return TRUE; + case DRIVE_REMOTE: + case DRIVE_RAMDISK: // ?? + break; + } + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + } + case 0x09: + DPRINT1("UNIMPLEMENTED INT 21h, 4409h, Determine if a logical device is local or remote %s\n", RootPath); + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + default: + assert(0); + break; + } + + return FALSE; +} + BOOLEAN DosDeviceIoControl(WORD FileHandle, BYTE ControlCode, DWORD Buffer, PWORD Length) { - PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(FileHandle); + PDOS_FILE_DESCRIPTOR Descriptor; PDOS_DEVICE_NODE Node = NULL; + switch (ControlCode) + { + case 0x04: + case 0x05: + case 0x08: + case 0x09: + return DosDeviceIoControlDrive(FileHandle, ControlCode, Buffer, Length); + } + + Descriptor = DosGetHandleFileDescriptor(FileHandle); + if (!Descriptor) { Sda->LastErrorCode = ERROR_INVALID_HANDLE;

1 0

03/03: [GFLAGS] Implement imagefile options
by Mark Jansen 19 Oct '18

19 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8543622a720978599e435… commit 8543622a720978599e4353810ec9c94a0ded36bd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 13 17:11:51 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 19 23:13:51 2018 +0200 [GFLAGS] Implement imagefile options --- .../applications/cmdutils/gflags/CMakeLists.txt | 1 + .../rosapps/applications/cmdutils/gflags/gflags.c | 28 ++- .../rosapps/applications/cmdutils/gflags/gflags.h | 7 + .../applications/cmdutils/gflags/imagefile.c | 263 +++++++++++++++++++++ 4 files changed, 295 insertions(+), 4 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt b/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt index fd935e76e8..e12052743f 100644 --- a/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt +++ b/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE gflags.c + imagefile.c pageheap.c gflags.h) diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.c b/modules/rosapps/applications/cmdutils/gflags/gflags.c index ac2af7a8e9..f97f1f5f09 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.c +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.c @@ -9,6 +9,7 @@ #include "gflags.h" static BOOL UsePageHeap = FALSE; +static BOOL UseImageFile = FALSE; const WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; @@ -77,6 +78,11 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[]) UsePageHeap = TRUE; return PageHeap_ParseCmdline(i + 1, argc, argv); } + if (argv[i][1] == L'i' && argv[i][2] == UNICODE_NULL) + { + UseImageFile = TRUE; + return ImageFile_ParseCmdline(i + 1, argc, argv); + } } else { @@ -85,9 +91,9 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[]) } } - if (!UsePageHeap) + if (!UsePageHeap && !UseImageFile) { - wprintf(L"Only page heap flags are supported\n"); + wprintf(L"Only page heap / image file flags are supported\n"); return FALSE; } @@ -99,11 +105,21 @@ int wmain(int argc, LPWSTR argv[]) { if (!ParseCmdline(argc, argv)) { - wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" + wprintf(L"Usage: gflags [/p [image.exe] [/enable|/disable [/full]]]\n" + L" [/i <image.exe> [<Flags>]]\n" L" image.exe: Image you want to deal with\n" L" /enable: enable page heap for the image\n" L" /disable: disable page heap for the image\n" - L" /full: activate full debug page heap\n"); + L" /full: activate full debug page heap\n" + L" <Flags>: A 32 bit hex number (0x00000001) that specifies\n" + L" one or more global flags to set.\n" + L" Without any flags, the current settings are shown.\n" + L" Specify FFFFFFFF to delete the GlobalFlags entry.\n" + L" Additionally, instead of a single hex number,\n" + L" specify a list of abbreviations prefixed with\n" + L" a '+' to add, and '-' to remove a bit.\n" + L" Valid abbreviations:\n"); + PrintFlags(~0, DEST_IMAGE); return 1; } @@ -111,5 +127,9 @@ int wmain(int argc, LPWSTR argv[]) { return PageHeap_Execute(); } + else if (UseImageFile) + { + return ImageFile_Execute(); + } return 2; } diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.h b/modules/rosapps/applications/cmdutils/gflags/gflags.h index 37674b67c7..d9c86a23f0 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.h +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.h @@ -20,11 +20,18 @@ const WCHAR ImageExecOptionsString[]; /* Option specific commandline parsing */ BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); +BOOL ImageFile_ParseCmdline(INT i, int argc, LPWSTR argv[]); /* Execute parsed options */ INT PageHeap_Execute(); +INT ImageFile_Execute(); /* Common functions */ DWORD ReadSZFlagsFromRegistry(HKEY SubKey, PWSTR Value); BOOL OpenImageFileExecOptions(IN REGSAM SamDesired, IN OPTIONAL PCWSTR ImageName, OUT HKEY* Key); +#define DEST_REGISTRY 1 +#define DEST_KERNEL 2 +#define DEST_IMAGE 4 + +void PrintFlags(IN DWORD GlobalFlags, IN OPTIONAL WORD Dest); diff --git a/modules/rosapps/applications/cmdutils/gflags/imagefile.c b/modules/rosapps/applications/cmdutils/gflags/imagefile.c new file mode 100644 index 0000000000..ba51c501d6 --- /dev/null +++ b/modules/rosapps/applications/cmdutils/gflags/imagefile.c @@ -0,0 +1,263 @@ +/* + * PROJECT: Global Flags utility + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Global Flags utility image file options + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "gflags.h" + +static PWSTR ImageFile = NULL; +static DWORD OptionsAdd = 0; +static DWORD OptionsRemove = 0; +static BOOL OptionsSet = FALSE; + +typedef struct FlagInfo +{ + DWORD dwFlag; + const wchar_t* szAbbr; + WORD wDest; + const wchar_t* szDesc; +} FlagInfo; + +#define FLG_DISABLE_DBGPRINT 0x8000000 +#define FLG_CRITSEC_EVENT_CREATION 0x10000000 +#define FLG_STOP_ON_UNHANDLED_EXCEPTION 0x20000000 +#define FLG_ENABLE_HANDLE_EXCEPTIONS 0x40000000 +#define FLG_DISABLE_PROTDLLS 0x80000000 + + +static const FlagInfo g_Flags[] = +{ + {FLG_STOP_ON_EXCEPTION, L"soe", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Stop on exception"}, + {FLG_SHOW_LDR_SNAPS, L"sls", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Show loader snaps"}, + {FLG_DEBUG_INITIAL_COMMAND, L"dic", (DEST_REGISTRY), L"Debug initial command"}, + {FLG_STOP_ON_HUNG_GUI, L"shg", (DEST_KERNEL), L"Stop on hung GUI"}, + {FLG_HEAP_ENABLE_TAIL_CHECK, L"htc", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap tail checking"}, + {FLG_HEAP_ENABLE_FREE_CHECK, L"hfc", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap free checking"}, + {FLG_HEAP_VALIDATE_PARAMETERS, L"hpc", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap parameter checking"}, + {FLG_HEAP_VALIDATE_ALL, L"hvc", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap validation on call"}, + {FLG_APPLICATION_VERIFIER, L"vrf", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable application verifier"}, + // FLG_MONITOR_SILENT_PROCESS_EXIT + {FLG_POOL_ENABLE_TAGGING, L"ptg", (DEST_REGISTRY), L"Enable pool tagging"}, + {FLG_HEAP_ENABLE_TAGGING, L"htg", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap tagging"}, + {FLG_USER_STACK_TRACE_DB, L"ust", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Create user mode stack trace database"}, + {FLG_KERNEL_STACK_TRACE_DB, L"kst", (DEST_REGISTRY), L"Create kernel mode stack trace database"}, + {FLG_MAINTAIN_OBJECT_TYPELIST, L"otl", (DEST_REGISTRY), L"Maintain a list of objects for each type"}, + {FLG_HEAP_ENABLE_TAG_BY_DLL, L"htd", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable heap tagging by DLL"}, + {FLG_DISABLE_STACK_EXTENSION, L"dse", (DEST_IMAGE), L"Disable stack extension"}, + + {FLG_ENABLE_CSRDEBUG, L"d32", (DEST_REGISTRY), L"Enable debugging of Win32 subsystem"}, + {FLG_ENABLE_KDEBUG_SYMBOL_LOAD, L"ksl", (DEST_REGISTRY | DEST_KERNEL), L"Enable loading of kernel debugger symbols"}, + {FLG_DISABLE_PAGE_KERNEL_STACKS, L"dps", (DEST_REGISTRY), L"Disable paging of kernel stacks"}, + {FLG_ENABLE_SYSTEM_CRIT_BREAKS, L"scb", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable system critical breaks"}, + {FLG_HEAP_DISABLE_COALESCING, L"dhc", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Disable heap coalesce on free"}, + {FLG_ENABLE_CLOSE_EXCEPTIONS, L"ece", (DEST_REGISTRY | DEST_KERNEL), L"Enable close exception"}, + {FLG_ENABLE_EXCEPTION_LOGGING, L"eel", (DEST_REGISTRY | DEST_KERNEL), L"Enable exception logging"}, + {FLG_ENABLE_HANDLE_TYPE_TAGGING, L"eot", (DEST_REGISTRY | DEST_KERNEL), L"Enable object handle type tagging"}, + {FLG_HEAP_PAGE_ALLOCS, L"hpa", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Enable page heap"}, + {FLG_DEBUG_INITIAL_COMMAND_EX, L"dwl", (DEST_REGISTRY), L"Debug WinLogon"}, + {FLG_DISABLE_DBGPRINT, L"ddp", (DEST_REGISTRY | DEST_KERNEL), L"Buffer DbgPrint Output"}, + {FLG_CRITSEC_EVENT_CREATION, L"cse", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Early critical section event creation"}, + {FLG_STOP_ON_UNHANDLED_EXCEPTION, L"sue", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Stop on unhandled user-mode exception"}, + {FLG_ENABLE_HANDLE_EXCEPTIONS, L"bhd", (DEST_REGISTRY | DEST_KERNEL), L"Enable bad handles detection"}, + {FLG_DISABLE_PROTDLLS, L"dpd", (DEST_REGISTRY | DEST_KERNEL | DEST_IMAGE), L"Disable protected DLL verification"}, +}; + +void PrintFlags(IN DWORD GlobalFlags, IN OPTIONAL WORD Dest) +{ + DWORD n; + + for (n = 0; n < ARRAYSIZE(g_Flags); ++n) + { + if (!Dest || (g_Flags[n].wDest & Dest)) + { + if (g_Flags[n].dwFlag & GlobalFlags) + { + wprintf(L" %s - %s\n", g_Flags[n].szAbbr, g_Flags[n].szDesc); + } + } + } +} + +static void ShowStatus(DWORD GlobalFlags, DWORD Ignored) +{ + if (GlobalFlags) + { + wprintf(L"Current Registry Settings for %s executable are: %08x\n", ImageFile, GlobalFlags); + PrintFlags(GlobalFlags, 0); + } + else + { + wprintf(L"No Registry Settings for %s executable\n", ImageFile); + } + if (Ignored) + { + wprintf(L"The following settings were ignored: %08x\n", Ignored); + PrintFlags(Ignored, 0); + } +} + +static DWORD ValidateFlags(DWORD GlobalFlags, WORD Dest) +{ + DWORD n; + DWORD Valid = 0; + + for (n = 0; n < ARRAYSIZE(g_Flags); ++n) + { + if (g_Flags[n].wDest & Dest) + { + Valid |= g_Flags[n].dwFlag; + } + } + + return GlobalFlags & Valid; +} + +static DWORD FindFlag(PCWSTR Name, WORD Dest) +{ + DWORD n; + + for (n = 0; n < ARRAYSIZE(g_Flags); ++n) + { + if (g_Flags[n].wDest & Dest) + { + if (!wcsicmp(Name, g_Flags[n].szAbbr)) + { + return g_Flags[n].dwFlag; + } + } + } + + return 0; +} + +static VOID ModifyStatus(VOID) +{ + LONG Ret; + DWORD GlobalFlags, Requested, Ignored; + HKEY IFEOKey; + WCHAR Buffer[11]; + + if (!OpenImageFileExecOptions(KEY_WRITE | KEY_READ, ImageFile, &IFEOKey)) + { + return; + } + + if (OptionsSet) + { + Requested = OptionsAdd; + } + else + { + Requested = ReadSZFlagsFromRegistry(IFEOKey, L"GlobalFlag"); + Requested &= ~OptionsRemove; + Requested |= OptionsAdd; + } + + GlobalFlags = ValidateFlags(Requested, DEST_IMAGE); + Ignored = GlobalFlags ^ Requested; + + if (GlobalFlags) + { + wsprintf(Buffer, L"0x%08x", GlobalFlags); + Ret = RegSetValueExW(IFEOKey, L"GlobalFlag", 0, REG_SZ, (BYTE*)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); + } + else + { + ShowStatus(GlobalFlags, Ignored); + } + } + else + { + Ret = RegDeleteValueW(IFEOKey, L"GlobalFlag"); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); + } + else + { + ShowStatus(GlobalFlags, Ignored); + } + } + CloseHandle(IFEOKey); +} + + +static VOID DisplayStatus(VOID) +{ + HKEY IFEOKey; + DWORD GlobalFlags; + + if (!OpenImageFileExecOptions(KEY_READ, ImageFile, &IFEOKey)) + { + return; + } + + GlobalFlags = ReadSZFlagsFromRegistry(IFEOKey, L"GlobalFlag"); + ShowStatus(GlobalFlags, 0); + + CloseHandle(IFEOKey); +} + + +BOOL ImageFile_ParseCmdline(INT i, int argc, LPWSTR argv[]) +{ + for (; i < argc; i++) + { + if (ImageFile == NULL) + { + ImageFile = argv[i]; + } + else if (argv[i][0] == '+') + { + if (OptionsSet) + { + wprintf(L"Unexpected argument - '%s'\n", argv[i]); + return FALSE; + } + OptionsAdd |= FindFlag(argv[i] + 1, DEST_IMAGE); + } + else if (argv[i][0] == '-') + { + if (OptionsSet) + { + wprintf(L"Unexpected argument - '%s'\n", argv[i]); + return FALSE; + } + OptionsRemove |= FindFlag(argv[i] + 1, DEST_IMAGE); + } + else + { + OptionsSet = TRUE; + OptionsAdd = wcstoul(argv[i], NULL, 16); + if (OptionsAdd == ~0) + OptionsAdd = 0; + } + } + + if (ImageFile == NULL) + { + wprintf(L"No Image specified\n"); + return FALSE; + } + + return TRUE; +} + +INT ImageFile_Execute() +{ + if (!OptionsAdd && !OptionsRemove && !OptionsSet) + { + DisplayStatus(); + } + else + { + ModifyStatus(); + } + + return 0; +}

1 0

02/03: [GFLAGS] Move common code to a shared location.
by Mark Jansen 19 Oct '18

19 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec621270a17aef6c97827… commit ec621270a17aef6c97827b28fefa11e987a06335 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 13 17:10:09 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 19 23:13:51 2018 +0200 [GFLAGS] Move common code to a shared location. --- .../rosapps/applications/cmdutils/gflags/gflags.c | 47 +++++++-- .../rosapps/applications/cmdutils/gflags/gflags.h | 6 +- .../applications/cmdutils/gflags/pageheap.c | 111 ++++++--------------- 3 files changed, 77 insertions(+), 87 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.c b/modules/rosapps/applications/cmdutils/gflags/gflags.c index b0751a091f..ac2af7a8e9 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.c +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.c @@ -10,14 +10,47 @@ static BOOL UsePageHeap = FALSE; +const WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; -DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) +BOOL OpenImageFileExecOptions(IN REGSAM SamDesired, IN OPTIONAL PCWSTR ImageName, OUT HKEY* Key) { + LONG Ret; + HKEY HandleKey, HandleSubKey; + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); + if (Ret != ERROR_SUCCESS) + { + wprintf(L"OpenIFEO: RegOpenKeyEx failed (%d)\n", Ret); + return FALSE; + } + + if (ImageName == NULL) + { + *Key = HandleKey; + return TRUE; + } + + Ret = RegCreateKeyExW(HandleKey, ImageName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); + CloseHandle(HandleKey); + + if (Ret != ERROR_SUCCESS) + { + wprintf(L"OpenIFEO: RegCreateKeyEx failed (%d)\n", Ret); + return FALSE; + } + *Key = HandleSubKey; + return TRUE; +} + + +DWORD ReadSZFlagsFromRegistry(HKEY SubKey, PWSTR Value) +{ + WCHAR Buffer[20] = { 0 }; DWORD Len, Flags, Type; - Len = MaxLen; + Len = sizeof(Buffer) - sizeof(WCHAR); Flags = 0; - if (RegQueryValueEx(SubKey, Value, NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) + if (RegQueryValueExW(SubKey, Value, NULL, &Type, (BYTE*)Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) { Flags = wcstoul(Buffer, NULL, 16); } @@ -67,10 +100,10 @@ int wmain(int argc, LPWSTR argv[]) if (!ParseCmdline(argc, argv)) { wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" - L"\timage.exe:\tImage you want to deal with\n" - L"\t/enable:\tenable page heap for the image\n" - L"\t/disable:\tdisable page heap for the image\n" - L"\t/full:\t\tactivate full debug page heap\n"); + L" image.exe: Image you want to deal with\n" + L" /enable: enable page heap for the image\n" + L" /disable: disable page heap for the image\n" + L" /full: activate full debug page heap\n"); return 1; } diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.h b/modules/rosapps/applications/cmdutils/gflags/gflags.h index 740f6a77c7..37674b67c7 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.h +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.h @@ -13,7 +13,10 @@ #include <winreg.h> #include <stdio.h> #include <stdlib.h> +#include <pstypes.h> +extern +const WCHAR ImageExecOptionsString[]; /* Option specific commandline parsing */ BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); @@ -22,5 +25,6 @@ BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); INT PageHeap_Execute(); /* Common functions */ -DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen); +DWORD ReadSZFlagsFromRegistry(HKEY SubKey, PWSTR Value); +BOOL OpenImageFileExecOptions(IN REGSAM SamDesired, IN OPTIONAL PCWSTR ImageName, OUT HKEY* Key); diff --git a/modules/rosapps/applications/cmdutils/gflags/pageheap.c b/modules/rosapps/applications/cmdutils/gflags/pageheap.c index 33d11b1c27..e5289176c6 100644 --- a/modules/rosapps/applications/cmdutils/gflags/pageheap.c +++ b/modules/rosapps/applications/cmdutils/gflags/pageheap.c @@ -11,63 +11,34 @@ static BOOL Set = FALSE; static BOOL Unset = FALSE; static BOOL Full = FALSE; static PWSTR Image = NULL; -static WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; static VOID ModifyStatus(VOID) { LONG Ret; - DWORD MaxLen, GlobalFlags; - PVOID Buffer; - HKEY HandleKey, HandleSubKey; + DWORD GlobalFlags; + HKEY IFEOKey; + WCHAR Buffer[11]; - Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) + if (!OpenImageFileExecOptions(KEY_WRITE | KEY_READ, Image, &IFEOKey)) { - wprintf(L"MS: RegOpenKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegCreateKeyEx(HandleKey, Image, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegCreateKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); - return; - } - - MaxLen = max(MaxLen, 11 * sizeof(WCHAR)); - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"MS: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); return; } - GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); + GlobalFlags = ReadSZFlagsFromRegistry(IFEOKey, L"GlobalFlag"); if (Set) { - GlobalFlags |= 0x02000000; + GlobalFlags |= FLG_HEAP_PAGE_ALLOCS; } else { - GlobalFlags &= ~0x02000000; + GlobalFlags &= ~FLG_HEAP_PAGE_ALLOCS; } if (GlobalFlags != 0) { wsprintf(Buffer, L"0x%08x", GlobalFlags); - Ret = RegSetValueEx(HandleSubKey, L"GlobalFlag", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + Ret = RegSetValueExW(IFEOKey, L"GlobalFlag", 0, REG_SZ, (BYTE*)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -75,7 +46,7 @@ static VOID ModifyStatus(VOID) } else { - Ret = RegDeleteValue(HandleSubKey, L"GlobalFlag"); + Ret = RegDeleteValueW(IFEOKey, L"GlobalFlag"); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); @@ -84,7 +55,7 @@ static VOID ModifyStatus(VOID) if (Unset) { - Ret = RegDeleteValue(HandleSubKey, L"PageHeapFlags"); + Ret = RegDeleteValueW(IFEOKey, L"PageHeapFlags"); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); @@ -94,7 +65,7 @@ static VOID ModifyStatus(VOID) { DWORD PageHeapFlags; - PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + PageHeapFlags = ReadSZFlagsFromRegistry(IFEOKey, L"PageHeapFlags"); PageHeapFlags &= ~3; if (Full) @@ -104,7 +75,7 @@ static VOID ModifyStatus(VOID) PageHeapFlags |= 2; wsprintf(Buffer, L"0x%x", PageHeapFlags); - Ret = RegSetValueEx(HandleSubKey, L"PageHeapFlags", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); + Ret = RegSetValueExW(IFEOKey, L"PageHeapFlags", 0, REG_SZ, (BYTE*)Buffer, (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -116,24 +87,27 @@ static VOID ModifyStatus(VOID) DWORD Type, VerifierFlags, Len; VerifierFlags = 0; - Len = MaxLen; - if (RegQueryValueEx(HandleSubKey, L"VerifierFlags", NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && + Len = VerifierFlags; + if (RegQueryValueExW(IFEOKey, L"VerifierFlags", NULL, &Type, (BYTE *)&VerifierFlags, &Len) == ERROR_SUCCESS && Type == REG_DWORD && Len == sizeof(DWORD)) { - VerifierFlags = ((DWORD *)Buffer)[0]; - VerifierFlags &= ~0x8001; + VerifierFlags &= ~0x8001; /* RTL_VRF_FLG_FAST_FILL_HEAP | RTL_VRF_FLG_FULL_PAGE_HEAP */ + } + else + { + VerifierFlags = 0; } if (Full) { - VerifierFlags |= 1; + VerifierFlags |= 1; /* RTL_VRF_FLG_FULL_PAGE_HEAP */ } else { - VerifierFlags |= 0x8000; + VerifierFlags |= 0x8000; /* RTL_VRF_FLG_FAST_FILL_HEAP */ } - Ret = RegSetValueEx(HandleSubKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); + Ret = RegSetValueExW(IFEOKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); if (Ret != ERROR_SUCCESS) { wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); @@ -144,44 +118,26 @@ static VOID ModifyStatus(VOID) wprintf(L"\t%s: page heap %s\n", Image, (Set ? L"enabled" : L"disabled")); HeapFree(GetProcessHeap(), 0, Buffer); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); + RegCloseKey(IFEOKey); } static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) { LONG Ret; BOOL Handled; - DWORD MaxLen, GlobalFlags; + DWORD GlobalFlags; HKEY HandleSubKey; - PVOID Buffer; - Ret = RegOpenKeyEx(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); + Ret = RegOpenKeyExW(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); if (Ret != ERROR_SUCCESS) { wprintf(L"DII: RegOpenKeyEx failed (%d)\n", Ret); return FALSE; } - Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DII: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - return FALSE; - } - - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"DII: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - return FALSE; - } - Handled = FALSE; - GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); - if (GlobalFlags & 0x02000000) + GlobalFlags = ReadSZFlagsFromRegistry(HandleSubKey, L"GlobalFlag"); + if (GlobalFlags & FLG_HEAP_PAGE_ALLOCS) { DWORD PageHeapFlags; @@ -199,7 +155,7 @@ static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) wprintf(L"Page heap is enabled for %s with flags (", SubKey); } - PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); + PageHeapFlags = ReadSZFlagsFromRegistry(HandleSubKey, L"PageHeapFlags"); if (PageHeapFlags & 0x1) { wprintf(L"full "); @@ -215,7 +171,6 @@ static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) Handled = TRUE; } - HeapFree(GetProcessHeap(), 0, Buffer); RegCloseKey(HandleSubKey); return Handled; @@ -229,14 +184,12 @@ static VOID DisplayStatus(VOID) TCHAR * SubKey; BOOL Header; - Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) + if (!OpenImageFileExecOptions(KEY_READ, NULL, &HandleKey)) { - wprintf(L"DS: RegOpenKeyEx failed (%d)\n", Ret); return; } - Ret = RegQueryInfoKey(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); + Ret = RegQueryInfoKeyW(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); if (Ret != ERROR_SUCCESS) { wprintf(L"DS: RegQueryInfoKey failed (%d)\n", Ret); @@ -245,7 +198,7 @@ static VOID DisplayStatus(VOID) } ++MaxLen; // NULL-char - SubKey = HeapAlloc(GetProcessHeap(), 0, MaxLen * sizeof(TCHAR)); + SubKey = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MaxLen * sizeof(WCHAR)); if (SubKey == NULL) { wprintf(L"DS: HeapAlloc failed\n"); @@ -258,7 +211,7 @@ static VOID DisplayStatus(VOID) Header = FALSE; do { - Ret = RegEnumKey(HandleKey, Index, SubKey, MaxLen); + Ret = RegEnumKeyW(HandleKey, Index, SubKey, MaxLen); if (Ret != ERROR_NO_MORE_ITEMS) { if (Image == NULL || wcscmp(SubKey, Image) == 0)

1 0

01/03: [GFLAGS] Move code around to handle multiple options
by Mark Jansen 19 Oct '18

19 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc3b356ae6effeb57229e… commit bc3b356ae6effeb57229e0339b63b484ce5f107a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 13 01:14:15 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 19 23:13:38 2018 +0200 [GFLAGS] Move code around to handle multiple options --- .../applications/cmdutils/gflags/CMakeLists.txt | 9 +- .../rosapps/applications/cmdutils/gflags/gflags.c | 382 ++------------------- .../rosapps/applications/cmdutils/gflags/gflags.h | 26 ++ .../cmdutils/gflags/{gflags.c => pageheap.c} | 97 +----- 4 files changed, 68 insertions(+), 446 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt b/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt index a6936de6ee..fd935e76e8 100644 --- a/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt +++ b/modules/rosapps/applications/cmdutils/gflags/CMakeLists.txt @@ -1,7 +1,14 @@ -add_executable(gflags gflags.c gflags.rc) + +list(APPEND SOURCE + gflags.c + pageheap.c + gflags.h) + +add_executable(gflags ${SOURCE} gflags.rc) set_module_type(gflags win32cui UNICODE) add_importlibs(gflags advapi32 user32 msvcrt kernel32) +add_pch(gflags gflags.h SOURCE) if(MSVC) add_importlibs(gflags ntdll) diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.c b/modules/rosapps/applications/cmdutils/gflags/gflags.c index 260c6d5794..b0751a091f 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.c +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.c @@ -1,27 +1,17 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS ping utility - * FILE: applications/cmdutils/gflags/gflags.c - * PURPOSE: Global Flags utility - * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + * PROJECT: Global Flags utility + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Global Flags utility entrypoint + * COPYRIGHT: Copyright 2017 Pierre Schweitzer (pierre(a)reactos.org) + * Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) */ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <stdio.h> -#include <stdlib.h> +#include "gflags.h" -static BOOL Set = FALSE; -static BOOL Unset = FALSE; -static BOOL Full = FALSE; -static PWSTR Image = NULL; -static WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; +static BOOL UsePageHeap = FALSE; -static DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) + +DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) { DWORD Len, Flags, Type; @@ -35,299 +25,13 @@ static DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD return Flags; } -static VOID ModifyStatus(VOID) -{ - LONG Ret; - DWORD MaxLen, GlobalFlags; - PVOID Buffer; - HKEY HandleKey, HandleSubKey; - - Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_WRITE | KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegOpenKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegCreateKeyEx(HandleKey, Image, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &HandleSubKey, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegCreateKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); - return; - } - - MaxLen = max(MaxLen, 11 * sizeof(WCHAR)); - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"MS: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); - return; - } - - GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); - if (Set) - { - GlobalFlags |= 0x02000000; - } - else - { - GlobalFlags &= ~0x02000000; - } - - if (GlobalFlags != 0) - { - wsprintf(Buffer, L"0x%08x", GlobalFlags); - Ret = RegSetValueEx(HandleSubKey, L"GlobalFlag", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); - } - } - else - { - Ret = RegDeleteValue(HandleSubKey, L"GlobalFlag"); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); - } - } - - if (Unset) - { - Ret = RegDeleteValue(HandleSubKey, L"PageHeapFlags"); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegDeleteValue failed (%d)\n", Ret); - } - } - else - { - DWORD PageHeapFlags; - - PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); - PageHeapFlags &= ~3; - - if (Full) - { - PageHeapFlags |= 1; - } - PageHeapFlags |= 2; - - wsprintf(Buffer, L"0x%x", PageHeapFlags); - Ret = RegSetValueEx(HandleSubKey, L"PageHeapFlags", 0, REG_SZ, Buffer, 11 * sizeof(WCHAR)); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); - } - } - - if (Set) - { - DWORD Type, VerifierFlags, Len; - - VerifierFlags = 0; - Len = MaxLen; - if (RegQueryValueEx(HandleSubKey, L"VerifierFlags", NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && - Type == REG_DWORD && Len == sizeof(DWORD)) - { - VerifierFlags = ((DWORD *)Buffer)[0]; - VerifierFlags &= ~0x8001; - } - - if (Full) - { - VerifierFlags |= 1; - } - else - { - VerifierFlags |= 0x8000; - } - - Ret = RegSetValueEx(HandleSubKey, L"VerifierFlags", 0, REG_DWORD, (const BYTE *)&VerifierFlags, sizeof(DWORD)); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"MS: RegSetValueEx failed (%d)\n", Ret); - } - } - - wprintf(L"path: %s\n", ImageExecOptionsString); - wprintf(L"\t%s: page heap %s\n", Image, (Set ? L"enabled" : L"disabled")); - - HeapFree(GetProcessHeap(), 0, Buffer); - RegCloseKey(HandleSubKey); - RegCloseKey(HandleKey); -} - -static BOOL DisplayImageInfo(HKEY HandleKey, PWSTR SubKey, PBOOL Header) -{ - LONG Ret; - BOOL Handled; - DWORD MaxLen, GlobalFlags; - HKEY HandleSubKey; - PVOID Buffer; - - Ret = RegOpenKeyEx(HandleKey, SubKey, 0, KEY_READ, &HandleSubKey); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DII: RegOpenKeyEx failed (%d)\n", Ret); - return FALSE; - } - - Ret = RegQueryInfoKey(HandleSubKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DII: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleSubKey); - return FALSE; - } - - Buffer = HeapAlloc(GetProcessHeap(), 0, MaxLen); - if (Buffer == NULL) - { - wprintf(L"DII: HeapAlloc failed\n"); - RegCloseKey(HandleSubKey); - return FALSE; - } - - Handled = FALSE; - GlobalFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"GlobalFlag", MaxLen); - if (GlobalFlags & 0x02000000) - { - DWORD PageHeapFlags; - - if (Image == NULL) - { - if (!*Header) - { - wprintf(L"path: %s\n", ImageExecOptionsString); - *Header = TRUE; - } - wprintf(L"\t%s: page heap enabled with flags (", SubKey); - } - else - { - wprintf(L"Page heap is enabled for %s with flags (", SubKey); - } - - PageHeapFlags = ReagFlagsFromRegistry(HandleSubKey, Buffer, L"PageHeapFlags", MaxLen); - if (PageHeapFlags & 0x1) - { - wprintf(L"full "); - } - - if (PageHeapFlags & 0x2) - { - wprintf(L"traces"); - } - - wprintf(L")\n"); - - Handled = TRUE; - } - - HeapFree(GetProcessHeap(), 0, Buffer); - RegCloseKey(HandleSubKey); - - return Handled; -} - -static VOID DisplayStatus(VOID) -{ - LONG Ret; - HKEY HandleKey; - DWORD Index, MaxLen, Handled; - TCHAR * SubKey; - BOOL Header; - - Ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, ImageExecOptionsString, 0, KEY_READ, &HandleKey); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DS: RegOpenKeyEx failed (%d)\n", Ret); - return; - } - - Ret = RegQueryInfoKey(HandleKey, NULL, NULL, NULL, NULL, &MaxLen, NULL, NULL, NULL, NULL, NULL, NULL); - if (Ret != ERROR_SUCCESS) - { - wprintf(L"DS: RegQueryInfoKey failed (%d)\n", Ret); - RegCloseKey(HandleKey); - return; - } - - ++MaxLen; // NULL-char - SubKey = HeapAlloc(GetProcessHeap(), 0, MaxLen * sizeof(TCHAR)); - if (SubKey == NULL) - { - wprintf(L"DS: HeapAlloc failed\n"); - RegCloseKey(HandleKey); - return; - } - - Index = 0; - Handled = 0; - Header = FALSE; - do - { - Ret = RegEnumKey(HandleKey, Index, SubKey, MaxLen); - if (Ret != ERROR_NO_MORE_ITEMS) - { - if (Image == NULL || wcscmp(SubKey, Image) == 0) - { - if (DisplayImageInfo(HandleKey, SubKey, &Header)) - { - ++Handled; - } - } - - ++Index; - } - } while (Ret != ERROR_NO_MORE_ITEMS); - - if (Handled == 0) - { - if (Image == NULL) - { - wprintf(L"No application has page heap enabled.\n"); - } - else - { - wprintf(L"Page heap is not enabled for %s\n", Image); - } - } - - HeapFree(GetProcessHeap(), 0, SubKey); - RegCloseKey(HandleKey); -} - -static VOID Usage(VOID) -{ - wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" - L"\timage.exe:\tImage you want to deal with\n" - L"\t/enable:\tenable page heap for the image\n" - L"\t/disable:\tdisable page heap for the image\n" - L"\t/full:\t\tactivate full debug page heap\n"); -} - static BOOL ParseCmdline(int argc, LPWSTR argv[]) { INT i; - BOOL UsePageHeap = FALSE; if (argc < 2) { - wprintf(L"Not enough args!\n", argc); - Usage(); + wprintf(L"Not enough args!\n"); return FALSE; } @@ -338,37 +42,12 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[]) if (argv[i][1] == L'p' && argv[i][2] == UNICODE_NULL) { UsePageHeap = TRUE; - } - else if (argv[i][1] == L'p' && argv[i][2] != UNICODE_NULL) - { - wprintf(L"Invalid option: %s\n", argv[i]); - Usage(); - return FALSE; - } - else - { - if (wcscmp(argv[i], L"/enable") == 0) - { - Set = TRUE; - } - else if (wcscmp(argv[i], L"/disable") == 0) - { - Unset = TRUE; - } - else if (wcscmp(argv[i], L"/full") == 0) - { - Full = TRUE; - } + return PageHeap_ParseCmdline(i + 1, argc, argv); } } - else if (Image == NULL) - { - Image = argv[i]; - } else { wprintf(L"Invalid option: %s\n", argv[i]); - Usage(); return FALSE; } } @@ -376,49 +55,28 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[]) if (!UsePageHeap) { wprintf(L"Only page heap flags are supported\n"); - Usage(); - return FALSE; - } - - if (Set && Unset) - { - wprintf(L"ENABLE and DISABLED cannot be set together\n"); - Usage(); - return FALSE; - } - - if (Image == NULL && (Set || Unset || Full)) - { - wprintf(L"Can't ENABLE or DISABLE with no image\n"); - Usage(); - return FALSE; - } - - if (!Set && !Unset && Full) - { - wprintf(L"Cannot deal with full traces with no other indication\n"); - Usage(); return FALSE; } return TRUE; } + int wmain(int argc, LPWSTR argv[]) { if (!ParseCmdline(argc, argv)) { + wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" + L"\timage.exe:\tImage you want to deal with\n" + L"\t/enable:\tenable page heap for the image\n" + L"\t/disable:\tdisable page heap for the image\n" + L"\t/full:\t\tactivate full debug page heap\n"); return 1; } - if (!Set && !Unset) - { - DisplayStatus(); - } - else + if (UsePageHeap) { - ModifyStatus(); + return PageHeap_Execute(); } - - return 0; + return 2; } diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.h b/modules/rosapps/applications/cmdutils/gflags/gflags.h new file mode 100644 index 0000000000..740f6a77c7 --- /dev/null +++ b/modules/rosapps/applications/cmdutils/gflags/gflags.h @@ -0,0 +1,26 @@ +/* +* PROJECT: Global Flags utility +* LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) +* PURPOSE: Global Flags utility page heap options +* COPYRIGHT: Copyright 2017 Pierre Schweitzer (pierre(a)reactos.org) +*/ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <stdio.h> +#include <stdlib.h> + + +/* Option specific commandline parsing */ +BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]); + +/* Execute parsed options */ +INT PageHeap_Execute(); + +/* Common functions */ +DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen); + diff --git a/modules/rosapps/applications/cmdutils/gflags/gflags.c b/modules/rosapps/applications/cmdutils/gflags/pageheap.c similarity index 78% copy from modules/rosapps/applications/cmdutils/gflags/gflags.c copy to modules/rosapps/applications/cmdutils/gflags/pageheap.c index 260c6d5794..33d11b1c27 100644 --- a/modules/rosapps/applications/cmdutils/gflags/gflags.c +++ b/modules/rosapps/applications/cmdutils/gflags/pageheap.c @@ -1,19 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS ping utility - * FILE: applications/cmdutils/gflags/gflags.c - * PURPOSE: Global Flags utility - * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + * PROJECT: Global Flags utility + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: Global Flags utility page heap options + * COPYRIGHT: Copyright 2017 Pierre Schweitzer (pierre(a)reactos.org) */ -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <stdio.h> -#include <stdlib.h> +#include "gflags.h" static BOOL Set = FALSE; static BOOL Unset = FALSE; @@ -21,19 +13,6 @@ static BOOL Full = FALSE; static PWSTR Image = NULL; static WCHAR ImageExecOptionsString[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Image File Execution Options"; -static DWORD ReagFlagsFromRegistry(HKEY SubKey, PVOID Buffer, PWSTR Value, DWORD MaxLen) -{ - DWORD Len, Flags, Type; - - Len = MaxLen; - Flags = 0; - if (RegQueryValueEx(SubKey, Value, NULL, &Type, Buffer, &Len) == ERROR_SUCCESS && Type == REG_SZ) - { - Flags = wcstoul(Buffer, NULL, 16); - } - - return Flags; -} static VOID ModifyStatus(VOID) { @@ -310,55 +289,23 @@ static VOID DisplayStatus(VOID) RegCloseKey(HandleKey); } -static VOID Usage(VOID) -{ - wprintf(L"Usage: gflags /p [image.exe] [/enable|/disable [/full]]\n" - L"\timage.exe:\tImage you want to deal with\n" - L"\t/enable:\tenable page heap for the image\n" - L"\t/disable:\tdisable page heap for the image\n" - L"\t/full:\t\tactivate full debug page heap\n"); -} - -static BOOL ParseCmdline(int argc, LPWSTR argv[]) +BOOL PageHeap_ParseCmdline(INT i, int argc, LPWSTR argv[]) { - INT i; - BOOL UsePageHeap = FALSE; - - if (argc < 2) - { - wprintf(L"Not enough args!\n", argc); - Usage(); - return FALSE; - } - - for (i = 1; i < argc; i++) + for (; i < argc; i++) { if (argv[i][0] == L'/') { - if (argv[i][1] == L'p' && argv[i][2] == UNICODE_NULL) + if (wcscmp(argv[i], L"/enable") == 0) { - UsePageHeap = TRUE; + Set = TRUE; } - else if (argv[i][1] == L'p' && argv[i][2] != UNICODE_NULL) + else if (wcscmp(argv[i], L"/disable") == 0) { - wprintf(L"Invalid option: %s\n", argv[i]); - Usage(); - return FALSE; + Unset = TRUE; } - else + else if (wcscmp(argv[i], L"/full") == 0) { - if (wcscmp(argv[i], L"/enable") == 0) - { - Set = TRUE; - } - else if (wcscmp(argv[i], L"/disable") == 0) - { - Unset = TRUE; - } - else if (wcscmp(argv[i], L"/full") == 0) - { - Full = TRUE; - } + Full = TRUE; } } else if (Image == NULL) @@ -368,49 +315,33 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[]) else { wprintf(L"Invalid option: %s\n", argv[i]); - Usage(); return FALSE; } } - if (!UsePageHeap) - { - wprintf(L"Only page heap flags are supported\n"); - Usage(); - return FALSE; - } - if (Set && Unset) { wprintf(L"ENABLE and DISABLED cannot be set together\n"); - Usage(); return FALSE; } if (Image == NULL && (Set || Unset || Full)) { wprintf(L"Can't ENABLE or DISABLE with no image\n"); - Usage(); return FALSE; } if (!Set && !Unset && Full) { wprintf(L"Cannot deal with full traces with no other indication\n"); - Usage(); return FALSE; } return TRUE; } -int wmain(int argc, LPWSTR argv[]) +INT PageHeap_Execute() { - if (!ParseCmdline(argc, argv)) - { - return 1; - } - if (!Set && !Unset) { DisplayStatus();

1 0

01/01: [USETUP][EXPLORER] ReactOS explorer translation and hindi font substitution. (#954)
by Arnav Bhatt 19 Oct '18

19 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05c2e3e89e8a99c342bc1… commit 05c2e3e89e8a99c342bc1e22d8e7aa6a34e99c0e Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Fri Oct 19 20:33:17 2018 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 19 17:03:17 2018 +0200 [USETUP][EXPLORER] ReactOS explorer translation and hindi font substitution. (#954) --- base/setup/usetup/muifonts.h | 27 +++++ base/setup/usetup/muilanguages.h | 2 +- base/shell/explorer/explorer.rc | 3 + base/shell/explorer/lang/hi-IN.rc | 201 ++++++++++++++++++++++++++++++++++++++ boot/bootdata/txtsetup.sif | 2 +- 5 files changed, 233 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/muifonts.h b/base/setup/usetup/muifonts.h index 2ec8aad7f8..81b0962d73 100644 --- a/base/setup/usetup/muifonts.h +++ b/base/setup/usetup/muifonts.h @@ -298,3 +298,30 @@ MUI_SUBFONT UnicodeFonts[] = { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; + +MUI_SUBFONT HindiFonts[] = +{ + /*Font Substitute */ + { L"Arial", L"Liberation Sans" }, + { L"Courier", L"FreeMono" }, + { L"Courier New", L"FreeMono" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, + { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Sans Serif", L"FreeSans" }, + { L"MS Shell Dlg", L"FreeSans" }, + { L"MS Shell Dlg 2", L"FreeSans" }, + { L"Tahoma", L"FreeSans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times", L"Liberation Serif" }, + { L"Times New Roman", L"Liberation Serif" }, + { L"Tms Rmn", L"Liberation Serif" }, + { L"Trebuchet MS", L"Open Sans" }, + { L"System", L"FreeSans" }, + { L"Comic Sans MS", L"Ubuntu" }, + { L"Georgia", L"FreeSerif" }, + { L"Palatino Linotype", L"FreeSans" }, + { NULL, NULL } +}; diff --git a/base/setup/usetup/muilanguages.h b/base/setup/usetup/muilanguages.h index dcb00a2cc4..c5c4519838 100644 --- a/base/setup/usetup/muilanguages.h +++ b/base/setup/usetup/muilanguages.h @@ -634,7 +634,7 @@ const MUI_LANGUAGE MUILanguageList[] = {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"117", heILPages, heILErrorEntries, heILStrings, HebrewFonts, heILLayouts }, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, + {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"113", enUSPages, enUSErrorEntries, enUSStrings, HindiFonts, hiINLayouts }, #endif #ifdef LANGUAGE_HU_HU {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"109", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, diff --git a/base/shell/explorer/explorer.rc b/base/shell/explorer/explorer.rc index fb036f994f..c787e1673c 100644 --- a/base/shell/explorer/explorer.rc +++ b/base/shell/explorer/explorer.rc @@ -115,6 +115,9 @@ END #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc new file mode 100644 index 0000000000..49fede8881 --- /dev/null +++ b/base/shell/explorer/lang/hi-IN.rc @@ -0,0 +1,201 @@ +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDM_TRAYWND MENU +BEGIN + POPUP "" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&तारीख/समय समायोजित करें", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&सूचनाएं कस्टमाइज़ करें...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM SEPARATOR + MENUITEM "&केस्केड विंडो", ID_SHELL_CMD_CASCADE_WND + MENUITEM "टाइल विंडो &हॉरिज़ॉन्टली", ID_SHELL_CMD_TILE_WND_H + MENUITEM "टाइल विंडो &वर्टिकली", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&डेस्कटॉप दिखाओ", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&पूर्ववत करें", ID_SHELL_CMD_UNDO_ACTION + MENUITEM SEPARATOR + MENUITEM "&कार्य प्रबंधक", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&टास्कबार को लॉक करें", ID_LOCKTASKBAR + MENUITEM "&गुण", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&प्रोग्रामो", IDM_PROGRAMS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&पसंदीदा", IDM_FAVORITES + BEGIN + MENUITEM "(खाली)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&डॉक्यूमॅन्ट", IDM_DOCUMENTS + BEGIN + MENUITEM "(खाली)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&सेटिंग्स", IDM_SETTINGS + BEGIN + MENUITEM "&कंट्रोल पैनल", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&सुरक्षा...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&नेटवर्क कनेक्शन", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&प्रिंटर और फैक्स", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&टास्कबार और प्रारंभ मेन्यू", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "&ढूंढे", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "&सहायता और समर्थन", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&रन...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "&सिंक्रनाइज़", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&लॉग ऑफ %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&डिस्कनेक्ट...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "कंप्यूटर अनडॉक करें", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "&बंद करें...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "टास्कबार" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "टास्कबार उपस्थिति", IDC_STATIC, 6, 6, 240, 104 + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 + AUTOCHECKBOX "&टास्कबार को लॉक करें", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "टास्कबार को ऑटो-हाइड कर दो", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "टास्कबार को अन्य विंडो के शीर्ष पर रखें", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&समान टास्कबार बटन का समूह करे", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "&त्वरित लॉन्च दिखाएं", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + GROUPBOX "अधिसूचना क्षेत्र", IDC_STATIC, 6, 114, 240, 98 + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 + AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 + AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + LTEXT "आप उन आइकनों को छुपाकर अधिसूचना क्षेत्र को सुव्यवस्थित कर सकते हैं जिन्हें आपने हाल ही में क्लिक नहीं किया है।", IDC_STATIC, 13, 169, 223, 16 + AUTOCHECKBOX "&निष्क्रिय आइकनों छुपाएं", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "प्रारंभ मेनू" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 + AUTORADIOBUTTON "&प्रारंभ मेनू", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED + LTEXT "यह मेनू शैली आपको अपने फ़ोल्डर्स, पसंदीदा प्रोग्राम और ढूंढ ने में आसान पहुंच प्रदान करती है।", IDC_STATIC, 20, 145, 150, 24, WS_DISABLED + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14, WS_DISABLED + AUTORADIOBUTTON "क्लासिक स्टार्ट &मेनू", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 + LTEXT "यह मेनू शैली आपको क्लासिक लुक और कार्यक्षमता देता है", IDC_STATIC, 20, 185, 150, 24 + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 +END + +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 "सूचनाएं कस्टमाइज़ करें" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "रिऐक्ट ओएस सक्रिय और अत्यावश्यक सूचनाएं के लिए आइकन प्रदर्शित करता है, और निष्क्रिय वाले को छुपाता है। आप नीचे दी गई सूची में आइटम के लिए इस व्यवहार को बदल सकते हैं।", 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 "&डिफॉल्टर्स को रिस्टोर करे", IDC_TASKBARPROP_NOTIREST, 164, 188, 62, 14 + DEFPUSHBUTTON "ओके", IDOK, 122, 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 "क्लासिक स्टार्ट मेनू को कस्टमाइज़ करें" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX " स्टार्ट मेनू ", IDC_STATIC, 8, 7, 218, 114 + ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 + LTEXT "आप वस्तुओं को जोड़कर या हटाकर अपने स्टार्ट मेनू को कस्टमाइज़ कर सकते हैं।", IDC_STATIC, 48, 17, 108, 39 + PUSHBUTTON "&जोड़ें...", IDC_CLASSICSTART_ADD, 162, 18, 53, 14 + PUSHBUTTON "&हटाएं...", IDC_CLASSICSTART_REMOVE, 162, 33, 53, 14 + PUSHBUTTON "उन्नत", IDC_CLASSICSTART_ADVANCED, 162, 49, 53, 14 + PUSHBUTTON "&तरह", IDC_CLASSICSTART_SORT, 162, 65, 53, 14 + ICON IDI_RECYCLEBIN, IDC_STATIC, 20, 85, 20, 20 + LTEXT "हाल ही में एक्सेस किए गए डॉक्यमिन्ट, प्रोग्राम्स और वेबसाइटों के रिकॉर्ड को हटाने के लिए, साफ़ करें पर क्लिक करें।", IDC_STATIC, 49, 85, 108, 33 + PUSHBUTTON "&साफ़ करें ", IDC_CLASSICSTART_CLEAR, 162, 94, 53, 14 + LTEXT "उन्नत स्टार्ट मेनू विकल्प:", IDC_STATIC, 8, 129, 150, 8 + CONTROL "StartMenuSe&ttings", IDC_CLASSICSTART_SETTINGS, "SysTreeView32", WS_BORDER | 0x00000001, 8, 139, 218, 72, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "ओके", IDOK, 122, 220, 50, 14 + PUSHBUTTON "रद्द करें", IDCANCEL, 176, 220, 50, 14 +END + +IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME +CAPTION "फ़ाइल नाम चेतावनी" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&उपेक्षा करे", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&नाम बदलें", IDC_FILE_RENAME, 159, 60, 50, 14 + LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP + AUTOCHECKBOX "&स्टार्टअप पर यह चेक न करें", IDC_NOTCHECK, 7, 62, 139, 10 + ICON 32515, IDC_STATIC, 7, 7, 21, 20 + LTEXT "आपके कंप्यूटर पर एक फ़ाइल या फ़ोल्डर है जिसे %s कहा जाता है जो कुछ अनुप्रयोगों को सही ढंग से कार्य नहीं कर सकता है। इसे %s में नामित करने से इस समस्या का समाधान होगा। क्या आप इसे अभी बदलना चाहेंगे?", IDC_STATIC, 34, 7, 224, 37 +END + +IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 +STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED +CAPTION "उन्नत" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX " स्टार्ट मेनू सेटिंग्स ", IDC_STATIC, 7, 7, 238, 42 + AUTOCHECKBOX "&सबमेनू खोलें जब मैं अपने माउस के साथ उन पर विराम करता हूं", IDC_AUTOOPEN, 14, 21, 224, 10 + AUTOCHECKBOX "नए इंस्टॉल्ड प्रोग्राम्स को हाइलाइट करें", IDC_HIGHLIGHT, 14, 35, 224, 10 + LTEXT "स्टार्ट मेनू के वस्तु:", IDC_STATIC, 7, 53, 238, 8 + CONTROL "StartMenuSe&ttings", IDC_ITEMS, "SysTreeView32", WS_BORDER | 0x00000001, 7, 63, 238, 67, WS_EX_CLIENTEDGE + GROUPBOX "हाल के डॉक्यमिन्ट ", IDC_STATIC, 7, 133, 238, 56 + LTEXT "हाल ही में खोले गए डॉक्यमिन्ट तक त्वरित पहुंच प्रदान करने के लिए इस विकल्प का चयन करें। इस सूची को साफ़ करने से डॉक्यमिन्ट को हटाया नहीं जाता है।", IDC_STATIC, 14, 144, 224, 21 + AUTOCHECKBOX "मेरे सबसे &हाल ही में खोले दस्तावेज़ों की सूची", IDC_RECENTLY, 14, 168, 147, 10 + PUSHBUTTON "सूची &साफ़ करें", IDC_CLEAR, 182, 168, 55, 14 +END + +IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME +CAPTION "सामान्य" +FONT 8, "MS Shell Dlg" +BEGIN + 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 "&बड़े आइकन", IDC_CHOOSELARGE, 43, 25, 53, 10 + AUTORADIOBUTTON "&छोटे आइकन", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP + GROUPBOX "प्रोग्राम्स ", IDC_STATIC, 7, 49, 238, 70 + LTEXT "स्टार्ट मेनू में आपके द्वारा सबसे अधिक बार उपयोग किए जाने वाले प्रोग्रामों के शॉर्टकट होते हैं। शॉर्टकट की सूची साफ़ करना प्रोग्राम को हटा नहीं देता है।", IDC_STATIC, 14, 63, 224, 20 + LTEXT "&स्टार्ट मेनू पर प्रोग्राम की संख्या:", 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 "सूची &साफ़ करें", IDC_CLEARLIST, 182, 98, 57, 14 + GROUPBOX "स्टार्ट मेनू पर दिखाएं ", IDC_STATIC, 7, 126, 238, 63 + AUTOCHECKBOX "&इंटरनेट:", IDC_SHOWINTERNET, 14, 140, 42, 10 + COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL + AUTOCHECKBOX "&ईमेल:", IDC_SHOWEMAIL, 14, 157, 37, 10 + COMBOBOX IDC_EMAILDEFAULTAPP, 98, 155, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_START "स्टार्ट" + IDS_PROPERTIES "&गुण" + IDS_OPEN_ALL_USERS "&सभी उपयोगकर्ताओं को खोलें" + IDS_EXPLORE_ALL_USERS "सभी उपयोगकर्ताओं को समन्वेषण करे" + IDS_STARTUP_ERROR "सिस्टम एक्सप्लोरर शुरू नहीं कर सकता क्योंकि रजिस्ट्री अनुपयोगी या अनुपलब्ध है।" +END + +STRINGTABLE +BEGIN + IDS_TASKBAR_STARTMENU_PROP_CAPTION "टास्कबार और स्टार्ट मेनू" + IDS_RESTORE_ALL "खुले हुऐ विंडोज &दिखाएं" +END diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 73eda6f7fa..ba2db1012e 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -283,7 +283,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00000408 = "Greek" ;00000447 = "Gujarati (India)" 0000040D = "Hebrew" -;00000439 = "Hindi" +00000439 = "Hindi" 0000040E = "Hungarian" 0000040F = "Icelandic" 00000421 = "Indonesian"

1 0

01/01: [MKHIVE] Fix some compilation warnings.
by Hermès Bélusca-Maïto 18 Oct '18

18 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da019b0fc57ac4c6b9a16… commit da019b0fc57ac4c6b9a161332a576693c6e8ccd9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 19 00:25:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 19 00:25:19 2018 +0200 [MKHIVE] Fix some compilation warnings. --- sdk/tools/mkhive/mkhive.c | 2 +- sdk/tools/mkhive/registry.c | 1 - sdk/tools/mkhive/rtl.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c index ab4342c9d9..b7e370117f 100644 --- a/sdk/tools/mkhive/mkhive.c +++ b/sdk/tools/mkhive/mkhive.c @@ -94,7 +94,7 @@ void convert_path(char *dst, char *src) int main(int argc, char *argv[]) { INT ret; - UINT i; + INT i; PSTR ptr; BOOL UpperCaseFileName = FALSE; PCSTR HiveList = NULL; diff --git a/sdk/tools/mkhive/registry.c b/sdk/tools/mkhive/registry.c index ad0aafc59c..8ee8d36ec8 100644 --- a/sdk/tools/mkhive/registry.c +++ b/sdk/tools/mkhive/registry.c @@ -403,7 +403,6 @@ RegpCreateOrOpenKey( HCELL_INDEX ParentCellOffset; PCM_KEY_NODE ParentKeyCell; PLIST_ENTRY Ptr; - PCM_KEY_NODE SubKeyCell; HCELL_INDEX BlockOffset; DPRINT("RegpCreateOrOpenKey('%S')\n", KeyName); diff --git a/sdk/tools/mkhive/rtl.c b/sdk/tools/mkhive/rtl.c index d8649d22c8..c7979afc6a 100644 --- a/sdk/tools/mkhive/rtl.c +++ b/sdk/tools/mkhive/rtl.c @@ -165,7 +165,6 @@ KeBugCheckEx( IN ULONG_PTR BugCheckParameter3, IN ULONG_PTR BugCheckParameter4) { - char Buffer[70]; printf("*** STOP: 0x%08X (0x%p,0x%p,0x%p,0x%p)", BugCheckCode, (PVOID)BugCheckParameter1,

1 0

02/02: [USETUP] Add a couple of missing TrimTrailingPathSeparators_UStr() calls.
by Hermès Bélusca-Maïto 18 Oct '18

18 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd9fa3d701bc11a5a59d0… commit bd9fa3d701bc11a5a59d07c7be4f879565209312 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 18 22:58:48 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 18 23:11:58 2018 +0200 [USETUP] Add a couple of missing TrimTrailingPathSeparators_UStr() calls. Fixes in particular a regression brought by 57402ee (thanks George Bisoc for having noticed this), where the BTRFS bootsector code could not be installed anymore. CORE-15192 --- base/setup/usetup/bootsup.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index 7969e8bae9..7fd723c33a 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -811,8 +811,9 @@ InstallMbrBootCodeToDisk( /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); - /* Write new bootsector to RootPath */ + /* Open the root partition - Remove any trailing backslash if needed */ RtlInitUnicodeString(&Name, RootPath); + TrimTrailingPathSeparators_UStr(&Name); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -833,6 +834,7 @@ InstallMbrBootCodeToDisk( return Status; } + /* Write new bootsector to RootPath */ FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, @@ -970,8 +972,9 @@ InstallFat12BootCodeToFloppy( /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); - /* Write new bootsector to RootPath */ + /* Open the root partition - Remove any trailing backslash if needed */ RtlInitUnicodeString(&Name, RootPath); + TrimTrailingPathSeparators_UStr(&Name); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -992,6 +995,7 @@ InstallFat12BootCodeToFloppy( return Status; } + /* Write new bootsector to RootPath */ FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, @@ -1529,8 +1533,8 @@ InstallFat32BootCodeToDisk( static NTSTATUS InstallBtrfsBootCodeToDisk( - PWSTR SrcPath, - PWSTR RootPath) + IN PCWSTR SrcPath, + IN PCWSTR RootPath) { NTSTATUS Status; UNICODE_STRING Name; @@ -1651,8 +1655,9 @@ InstallBtrfsBootCodeToDisk( // RtlFreeHeap(ProcessHeap, 0, OrigBootSector); #endif - /* Write new bootsector to RootPath */ + /* Open the root partition - Remove any trailing backslash if needed */ RtlInitUnicodeString(&Name, RootPath); + TrimTrailingPathSeparators_UStr(&Name); InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -1684,7 +1689,6 @@ InstallBtrfsBootCodeToDisk( 0, &PartInfo, sizeof(PartInfo)); - if (!NT_SUCCESS(Status)) { DPRINT1("IOCTL_DISK_GET_PARTITION_INFO_EX failed (Status %lx)\n", Status); @@ -1693,6 +1697,8 @@ InstallBtrfsBootCodeToDisk( return Status; } + /* Write new bootsector to RootPath */ + NewBootSector->PartitionStartLBA = PartInfo.StartingOffset.QuadPart / SECTORSIZE; /* Write sector 0 */

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018