Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65565: Only layout was set different. Fix build.
by hbelusca＠svn.reactos.org 05 Dec '14

05 Dec '14

Author: hbelusca Date: Fri Dec 5 00:23:11 2014 New Revision: 65565 URL: http://svn.reactos.org/svn/reactos?rev=65565&view=rev Log: Only layout was set different. Fix build. Modified: trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Fri Dec 5 00:23:11 2014 @@ -487,7 +487,7 @@ {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"1", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"1", bnINPages, bnINErrorEntries, bnINStrings, UnicodeFonts, bnINLayouts }, + {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"1", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnINLayouts }, #endif #ifdef LANGUAGE_BG_BG {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts },

1 0

[hbelusca] 65564: [LOCALIZATION]: Add Bengali to other files.
by hbelusca＠svn.reactos.org 05 Dec '14

05 Dec '14

Author: hbelusca Date: Fri Dec 5 00:21:36 2014 New Revision: 65564 URL: http://svn.reactos.org/svn/reactos?rev=65564&view=rev Log: [LOCALIZATION]: Add Bengali to other files. Added: trunk/reactos/base/setup/usetup/lang/bn-BD.h (with props) trunk/reactos/base/setup/usetup/lang/bn-IN.h (with props) Modified: trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/intl.inf Added: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h (added) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -0,0 +1,1739 @@ +#pragma once + +MUI_LAYOUTS bnBDLayouts[] = +{ + { L"0845", L"00000845" }, + { NULL, NULL } +}; + +static MUI_ENTRY bnBDLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Language Selection", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Welcome to ReactOS Setup", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press ENTER to install ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair or update ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = Continue R = Repair L = License F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Licensing:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Return", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Computer:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Display:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Keyboard:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Keyboard layout:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Accept:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Accept these device settings", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Main page U = Update R = Recovery ENTER = Reboot", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY bnBDComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Flushing cache", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Please wait ...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Reboot computer", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY bnBDSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Press P to create a primary partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Press D to delete an existing partition.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Please wait...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Format partition", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY bnBDInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "installation folder.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "This may take several minutes to complete.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Please wait... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR and VBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Skip install bootloader.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Please select a layout to be installed by default.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY bnBDPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Building the file copy list...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY bnBDSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + "ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Delete Partition ESC = Cancel F3 = Quit", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY bnBDRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Creating registry hives...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR bnBDErrorEntries[] = +{ + { + // NOT_AN_ERROR + "Success\n" + }, + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3 = Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup.\n" + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + NULL, + NULL + } +}; + +MUI_PAGE bnBDPages[] = +{ + { + LANGUAGE_PAGE, + bnBDLanguagePageEntries + }, + { + START_PAGE, + bnBDWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + bnBDIntroPageEntries + }, + { + LICENSE_PAGE, + bnBDLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + bnBDDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + bnBDRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + bnBDComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + bnBDDisplayPageEntries + }, + { + FLUSH_PAGE, + bnBDFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + bnBDSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + bnBDSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + bnBDFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + bnBDDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + bnBDInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + bnBDPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + bnBDFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + bnBDKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + bnBDBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + bnBDLayoutSettingsEntries + }, + { + QUIT_PAGE, + bnBDQuitPageEntries + }, + { + SUCCESS_PAGE, + bnBDSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + bnBDBootPageEntries + }, + { + REGISTRY_PAGE, + bnBDRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING bnBDStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a primary partition on"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, + {STRING_CHOOSE_NEW_LOGICAL_PARTITION, + "You have chosen to create a logical partition on"}, + {STRING_HDDSIZE, + "Please enter the size of the new partition in megabytes."}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_PARTFORMAT, + "This Partition will be formatted next."}, + {STRING_NONFORMATTEDPART, + "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_INSTALLONPART, + "Setup installs ReactOS onto Partition"}, + {STRING_CHECKINGPART, + "Setup is now checking the selected partition."}, + {STRING_QUITCONTINUE, + "F3= Quit ENTER = Continue"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Reboot computer"}, + {STRING_TXTSETUPFAILED, + "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_REGHIVEUPDATE, + " Updating registry hives..."}, + {STRING_IMPORTFILE, + " Importing %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Updating display registry settings..."}, + {STRING_LOCALESETTINGSUPDATE, + " Updating locale settings..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Updating keyboard layout settings..."}, + {STRING_CODEPAGEINFOUPDATE, + " Adding codepage information to registry..."}, + {STRING_DONE, + " Done..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Reboot computer"}, + {STRING_CONSOLEFAIL1, + "Unable to open the console\r\n\r\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\r\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\r\n"}, + {STRING_FORMATTINGDISK, + "Setup is formatting your disk"}, + {STRING_CHECKINGDISK, + "Setup is checking your disk"}, + {STRING_FORMATDISK1, + " Format partition as %S file system (quick format) "}, + {STRING_FORMATDISK2, + " Format partition as %S file system "}, + {STRING_KEEPFORMAT, + " Keep current file system (no changes) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFOUNK3, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c %sType %-3u%s %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " %sUnpartitioned space%s %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "Adding keyboard layouts"}, + {0, 0} +}; Propchange: trunk/reactos/base/setup/usetup/lang/bn-BD.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/lang/bn-IN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-IN.h (added) +++ trunk/reactos/base/setup/usetup/lang/bn-IN.h [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -0,0 +1,7 @@ +#pragma once + +MUI_LAYOUTS bnINLayouts[] = +{ + { L"0445", L"00000445" }, + { NULL, NULL } +}; Propchange: trunk/reactos/base/setup/usetup/lang/bn-IN.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -62,6 +62,12 @@ #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.h" #endif +#ifdef LANGUAGE_BN_BD + #include "lang/bn-BD.h" +#endif +#ifdef LANGUAGE_BN_IN + #include "lang/bn-IN.h" +#endif #ifdef LANGUAGE_CA_ES #include "lang/ca-ES.h" #endif @@ -477,6 +483,12 @@ #ifdef LANGUAGE_BE_BY {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, #endif +#ifdef LANGUAGE_BN_BD + {L"00000845", L"0", L"1", L"2", L"Bengali (Bangladesh)", L"1", bnBDPages, bnBDErrorEntries, bnBDStrings, UnicodeFonts, bnBDLayouts }, +#endif +#ifdef LANGUAGE_BN_IN + {L"00000445", L"0", L"1", L"2", L"Bengali (India)", L"1", bnINPages, bnINErrorEntries, bnINStrings, UnicodeFonts, bnINLayouts }, +#endif #ifdef LANGUAGE_BG_BG {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, #endif Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -360,7 +360,8 @@ HKCR,"MIME\Database\Rfc1766","042B",0x00000000,"hy;Armenian" HKCR,"MIME\Database\Rfc1766","042D",0x00000000,"eu;Basque" HKCR,"MIME\Database\Rfc1766","0423",0x00000000,"be;Belarusian" -HKCR,"MIME\Database\Rfc1766","0445",0x00000000,"bn;Bengali" +HKCR,"MIME\Database\Rfc1766","0845",0x00000000,"bn-bd;Bengali (Bangladesh)" +HKCR,"MIME\Database\Rfc1766","0445",0x00000000,"bn-in;Bengali (India)" HKCR,"MIME\Database\Rfc1766","0402",0x00000000,"bg;Bulgarian" HKCR,"MIME\Database\Rfc1766","0403",0x00000000,"ca;Catalan" HKCR,"MIME\Database\Rfc1766","0004",0x00000000,"zh;Chinese" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -671,6 +671,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout File",0x00000000,"kbdinben.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Text",0x00000000,"Bengali" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000445","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" + +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout File",0x00000000,"kbdinben.dll" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Text",0x00000000,"Bengali" +; HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000845","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout File",0x00000000,"kbdinguj.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000447","Layout Text",0x00000000,"Gujarati" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Dec 5 00:21:36 2014 @@ -222,7 +222,8 @@ 0000042C = "Azeri (Latin)" 0000042D = "Basque" 00000423 = "Belarusian" -;00000445 = "Bengali" +00000845 = "Bengali (Bangladesh)" +00000445 = "Bengali (India)" 00000402 = "Bulgarian" ;00000455 = "Burmese" 00000403 = "Catalan" Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=655… ============================================================================== Binary files - no diff available.

1 0

[hbelusca] 65563: [LOCALIZATION] Add Bengali to the list of available lang #defines (see http://www.microsoft.com/resources/msdn/goglobal/default.mspx for the list).
by hbelusca＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: hbelusca Date: Thu Dec 4 23:50:08 2014 New Revision: 65563 URL: http://svn.reactos.org/svn/reactos?rev=65563&view=rev Log: [LOCALIZATION] Add Bengali to the list of available lang #defines (see http://www.microsoft.com/resources/msdn/goglobal/default.mspx for the list). Modified: trunk/reactos/cmake/localization.cmake Modified: trunk/reactos/cmake/localization.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/localization.cmake?r… ============================================================================== --- trunk/reactos/cmake/localization.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/localization.cmake [iso-8859-1] Thu Dec 4 23:50:08 2014 @@ -44,6 +44,10 @@ set(I18N_DEFS -DLANGUAGE_BE_BY PARENT_SCOPE) elseif(I18N_LANG STREQUAL "bg-BG") set(I18N_DEFS -DLANGUAGE_BG_BG PARENT_SCOPE) + elseif(I18N_LANG STREQUAL "bn-BD") + set(I18N_DEFS -DLANGUAGE_BN_BD PARENT_SCOPE) + elseif(I18N_LANG STREQUAL "bn-IN") + set(I18N_DEFS -DLANGUAGE_BN_IN PARENT_SCOPE) elseif(I18N_LANG STREQUAL "ca-ES") set(I18N_DEFS -DLANGUAGE_CA_ES PARENT_SCOPE) elseif(I18N_LANG STREQUAL "cs-CZ") @@ -273,7 +277,7 @@ elseif(I18N_LANG STREQUAL "zh-TW") set(I18N_DEFS -DLANGUAGE_ZH_TW PARENT_SCOPE) elseif(I18N_LANG STREQUAL "all") - set(I18N_DEFS "-DLANGUAGE_AF_ZA -DLANGUAGE_AR_AE -DLANGUAGE_AR_BH -DLANGUAGE_AR_DZ -DLANGUAGE_AR_EG -DLANGUAGE_AR_IQ -DLANGUAGE_AR_JO -DLANGUAGE_AR_KW -DLANGUAGE_AR_LB -DLANGUAGE_AR_LY -DLANGUAGE_AR_MA -DLANGUAGE_AR_OM -DLANGUAGE_AR_QA -DLANGUAGE_AR_SA -DLANGUAGE_AR_SY -DLANGUAGE_AR_TN -DLANGUAGE_AR_YE -DLANGUAGE_AZ_AZ -DLANGUAGE_BE_BY -DLANGUAGE_BG_BG -DLANGUAGE_CA_ES -DLANGUAGE_CS_CZ -DLANGUAGE_DA_DK -DLANGUAGE_DE_AT -DLANGUAGE_DE_CH -DLANGUAGE_DE_DE -DLANGUAGE_DE_LI -DLANGUAGE_DE_LU -DLANGUAGE_DV_MV -DLANGUAGE_EL_GR -DLANGUAGE_EN_AU -DLANGUAGE_EN_BZ -DLANGUAGE_EN_CA -DLANGUAGE_EN_CB -DLANGUAGE_EN_GB -DLANGUAGE_EN_IE -DLANGUAGE_EN_JM -DLANGUAGE_EN_NZ -DLANGUAGE_EN_PH -DLANGUAGE_EN_TT -DLANGUAGE_EN_US -DLANGUAGE_EN_ZA -DLANGUAGE_EN_ZW -DLANGUAGE_EO_AA -DLANGUAGE_ES_AR -DLANGUAGE_ES_BO -DLANGUAGE_ES_CL -DLANGUAGE_ES_CO -DLANGUAGE_ES_CR -DLANGUAGE_ES_DO -DLANGUAGE_ES_EC -DLANGUAGE_ES_ES -DLANGUAGE_ES_GT -DLANGUAGE_ES_HN -DLANGUAGE_ES_MX -DLANGUAGE_ES_NI -DLANGUAGE_ES_PA -DLANGUAGE_ES_PE -DLANGUAGE_ES_PR -DLANGUAGE_ES_PY -DLANGUAGE_ES_SV -DLANGUAGE_ES_UY -DLANGUAGE_ES_VE -DLANGUAGE_ET_EE -DLANGUAGE_EU_ES -DLANGUAGE_FA_IR -DLANGUAGE_FI_FI -DLANGUAGE_FO_FO -DLANGUAGE_FR_BE -DLANGUAGE_FR_CA -DLANGUAGE_FR_CH -DLANGUAGE_FR_FR -DLANGUAGE_FR_LU -DLANGUAGE_FR_MC -DLANGUAGE_GL_ES -DLANGUAGE_GU_IN -DLANGUAGE_HE_IL -DLANGUAGE_HI_IN -DLANGUAGE_HR_HR -DLANGUAGE_HU_HU -DLANGUAGE_HY_AM -DLANGUAGE_ID_ID -DLANGUAGE_IS_IS -DLANGUAGE_IT_CH -DLANGUAGE_IT_IT -DLANGUAGE_JA_JP -DLANGUAGE_KA_GE -DLANGUAGE_KK_KZ -DLANGUAGE_KN_IN -DLANGUAGE_KOK_IN -DLANGUAGE_KO_KR -DLANGUAGE_KY_KG -DLANGUAGE_LT_LT -DLANGUAGE_LV_LV -DLANGUAGE_MK_MK -DLANGUAGE_MN_MN -DLANGUAGE_MR_IN -DLANGUAGE_MS_BN -DLANGUAGE_MS_MY -DLANGUAGE_MY_MM -DLANGUAGE_NL_BE -DLANGUAGE_NL_NL -DLANGUAGE_NN_NO -DLANGUAGE_PA_IN -DLANGUAGE_PL_PL -DLANGUAGE_PT_BR -DLANGUAGE_PT_PT -DLANGUAGE_RM_CH -DLANGUAGE_RO_RO -DLANGUAGE_RU_RU -DLANGUAGE_SA_IN -DLANGUAGE_SK_SK -DLANGUAGE_SL_SI -DLANGUAGE_SQ_AL -DLANGUAGE_SR_SP -DLANGUAGE_SV_FI -DLANGUAGE_SV_SE -DLANGUAGE_SW_KE -DLANGUAGE_SYR_SY -DLANGUAGE_TA_IN -DLANGUAGE_TE_IN -DLANGUAGE_TH_TH -DLANGUAGE_TR_TR -DLANGUAGE_TT_TA -DLANGUAGE_UK_UA -DLANGUAGE_UR_PK -DLANGUAGE_UZ_UZ -DLANGUAGE_VI_VN -DLANGUAGE_WA_BE -DLANGUAGE_ZH_CN -DLANGUAGE_ZH_HK -DLANGUAGE_ZH_MO -DLANGUAGE_ZH_SG -DLANGUAGE_ZH_TW" PARENT_SCOPE) + set(I18N_DEFS "-DLANGUAGE_AF_ZA -DLANGUAGE_AR_AE -DLANGUAGE_AR_BH -DLANGUAGE_AR_DZ -DLANGUAGE_AR_EG -DLANGUAGE_AR_IQ -DLANGUAGE_AR_JO -DLANGUAGE_AR_KW -DLANGUAGE_AR_LB -DLANGUAGE_AR_LY -DLANGUAGE_AR_MA -DLANGUAGE_AR_OM -DLANGUAGE_AR_QA -DLANGUAGE_AR_SA -DLANGUAGE_AR_SY -DLANGUAGE_AR_TN -DLANGUAGE_AR_YE -DLANGUAGE_AZ_AZ -DLANGUAGE_BE_BY -DLANGUAGE_BG_BG -DLANGUAGE_BN_BD -DLANGUAGE_BN_IN -DLANGUAGE_CA_ES -DLANGUAGE_CS_CZ -DLANGUAGE_DA_DK -DLANGUAGE_DE_AT -DLANGUAGE_DE_CH -DLANGUAGE_DE_DE -DLANGUAGE_DE_LI -DLANGUAGE_DE_LU -DLANGUAGE_DV_MV -DLANGUAGE_EL_GR -DLANGUAGE_EN_AU -DLANGUAGE_EN_BZ -DLANGUAGE_EN_CA -DLANGUAGE_EN_CB -DLANGUAGE_EN_GB -DLANGUAGE_EN_IE -DLANGUAGE_EN_JM -DLANGUAGE_EN_NZ -DLANGUAGE_EN_PH -DLANGUAGE_EN_TT -DLANGUAGE_EN_US -DLANGUAGE_EN_ZA -DLANGUAGE_EN_ZW -DLANGUAGE_EO_AA -DLANGUAGE_ES_AR -DLANGUAGE_ES_BO -DLANGUAGE_ES_CL -DLANGUAGE_ES_CO -DLANGUAGE_ES_CR -DLANGUAGE_ES_DO -DLANGUAGE_ES_EC -DLANGUAGE_ES_ES -DLANGUAGE_ES_GT -DLANGUAGE_ES_HN -DLANGUAGE_ES_MX -DLANGUAGE_ES_NI -DLANGUAGE_ES_PA -DLANGUAGE_ES_PE -DLANGUAGE_ES_PR -DLANGUAGE_ES_PY -DLANGUAGE_ES_SV -DLANGUAGE_ES_UY -DLANGUAGE_ES_VE -DLANGUAGE_ET_EE -DLANGUAGE_EU_ES -DLANGUAGE_FA_IR -DLANGUAGE_FI_FI -DLANGUAGE_FO_FO -DLANGUAGE_FR_BE -DLANGUAGE_FR_CA -DLANGUAGE_FR_CH -DLANGUAGE_FR_FR -DLANGUAGE_FR_LU -DLANGUAGE_FR_MC -DLANGUAGE_GL_ES -DLANGUAGE_GU_IN -DLANGUAGE_HE_IL -DLANGUAGE_HI_IN -DLANGUAGE_HR_HR -DLANGUAGE_HU_HU -DLANGUAGE_HY_AM -DLANGUAGE_ID_ID -DLANGUAGE_IS_IS -DLANGUAGE_IT_CH -DLANGUAGE_IT_IT -DLANGUAGE_JA_JP -DLANGUAGE_KA_GE -DLANGUAGE_KK_KZ -DLANGUAGE_KN_IN -DLANGUAGE_KOK_IN -DLANGUAGE_KO_KR -DLANGUAGE_KY_KG -DLANGUAGE_LT_LT -DLANGUAGE_LV_LV -DLANGUAGE_MK_MK -DLANGUAGE_MN_MN -DLANGUAGE_MR_IN -DLANGUAGE_MS_BN -DLANGUAGE_MS_MY -DLANGUAGE_MY_MM -DLANGUAGE_NL_BE -DLANGUAGE_NL_NL -DLANGUAGE_NN_NO -DLANGUAGE_PA_IN -DLANGUAGE_PL_PL -DLANGUAGE_PT_BR -DLANGUAGE_PT_PT -DLANGUAGE_RM_CH -DLANGUAGE_RO_RO -DLANGUAGE_RU_RU -DLANGUAGE_SA_IN -DLANGUAGE_SK_SK -DLANGUAGE_SL_SI -DLANGUAGE_SQ_AL -DLANGUAGE_SR_SP -DLANGUAGE_SV_FI -DLANGUAGE_SV_SE -DLANGUAGE_SW_KE -DLANGUAGE_SYR_SY -DLANGUAGE_TA_IN -DLANGUAGE_TE_IN -DLANGUAGE_TH_TH -DLANGUAGE_TR_TR -DLANGUAGE_TT_TA -DLANGUAGE_UK_UA -DLANGUAGE_UR_PK -DLANGUAGE_UZ_UZ -DLANGUAGE_VI_VN -DLANGUAGE_WA_BE -DLANGUAGE_ZH_CN -DLANGUAGE_ZH_HK -DLANGUAGE_ZH_MO -DLANGUAGE_ZH_SG -DLANGUAGE_ZH_TW" PARENT_SCOPE) else() message(SEND_ERROR "${I18N_LANG} doesn't exist in our list. Please select a correct localization.") endif()

1 0

[hbelusca] 65562: Fix some DPRINTs.
by hbelusca＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: hbelusca Date: Thu Dec 4 23:15:18 2014 New Revision: 65562 URL: http://svn.reactos.org/svn/reactos?rev=65562&view=rev Log: Fix some DPRINTs. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Thu Dec 4 23:15:18 2014 @@ -162,7 +162,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to create a shared section, Status = 0x%08lx\n", Status); NtClose(NewBuffer->ClientMutex); NtClose(NewBuffer->Mutex); ConsoleFreeHeap(NewBuffer->BitMapInfo); @@ -187,7 +187,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to map the shared section, Status = 0x%08lx\n", Status); NtClose(NewBuffer->hSection); NtClose(NewBuffer->ClientMutex); NtClose(NewBuffer->Mutex); @@ -214,7 +214,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to map the shared section, Status = 0x%08lx\n", Status); NtUnmapViewOfSection(NtCurrentProcess(), NewBuffer->BitMap); NtClose(NewBuffer->hSection); NtClose(NewBuffer->ClientMutex); Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Thu Dec 4 23:15:18 2014 @@ -990,7 +990,7 @@ Length, &Length); if (!NT_SUCCESS(Status)) { - DPRINT1("SrvAttachConsole - Cannot retrieve basic process info, Status = %lu\n", Status); + DPRINT1("SrvAttachConsole - Cannot retrieve basic process info, Status = 0x%08lx\n", Status); return Status; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Thu Dec 4 23:15:18 2014 @@ -254,7 +254,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to create a shared section, Status = 0x%08lx\n", Status); goto Quit; } @@ -270,7 +270,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to map the shared section, Status = 0x%08lx\n", Status); goto Quit; } @@ -365,7 +365,7 @@ 0, 0, DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to duplicate section handle for client ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to duplicate section handle for client, Status = 0x%08lx\n", Status); goto Quit; } @@ -401,7 +401,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - DPRINT1("GuiConsoleShowConsoleProperties - Caught an exception, Status = %08X\n", Status); + DPRINT1("GuiConsoleShowConsoleProperties - Caught an exception, Status = 0x%08lx\n", Status); } _SEH2_END; } @@ -442,7 +442,7 @@ 0, 0, DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Error when mapping client handle, Status = %lu\n", Status); + DPRINT1("Error when mapping client handle, Status = 0x%08lx\n", Status); goto Quit; } @@ -459,7 +459,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error when mapping view of file, Status = %lu\n", Status); + DPRINT1("Error when mapping view of file, Status = 0x%08lx\n", Status); goto Quit; } @@ -536,7 +536,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - DPRINT1("GuiApplyUserSettings - Caught an exception, Status = %08X\n", Status); + DPRINT1("GuiApplyUserSettings - Caught an exception, Status = 0x%08lx\n", Status); } _SEH2_END; @@ -588,7 +588,7 @@ 0, 0, DUPLICATE_SAME_ACCESS); if (!NT_SUCCESS(Status)) { - DPRINT1("Error when mapping client handle, Status = %lu\n", Status); + DPRINT1("Error when mapping client handle, Status = 0x%08lx\n", Status); goto Quit; } @@ -605,7 +605,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error when mapping view of file, Status = %lu\n", Status); + DPRINT1("Error when mapping view of file, Status = 0x%08lx\n", Status); goto Quit; } @@ -720,7 +720,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - DPRINT1("GuiApplyUserSettings - Caught an exception, Status = %08X\n", Status); + DPRINT1("GuiApplyUserSettings - Caught an exception, Status = 0x%08lx\n", Status); } _SEH2_END; Modified: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Thu Dec 4 23:15:18 2014 @@ -67,7 +67,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to create a shared section, Status = 0x%08lx\n", Status); goto Quit; } @@ -88,7 +88,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to map the shared section, Status = 0x%08lx\n", Status); NtClose(Console->VDMBufferSection); goto Quit; } @@ -111,7 +111,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + DPRINT1("Error: Impossible to map the shared section, Status = 0x%08lx\n", Status); NtUnmapViewOfSection(NtCurrentProcess(), Console->VDMBuffer); NtClose(Console->VDMBufferSection); goto Quit;

1 0

[hbelusca] 65561: [CONSRV] - Give the process handle which creates the screenbuffer, to ConDrvCreateScreenBuffer. - Few code refactoring.
by hbelusca＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: hbelusca Date: Thu Dec 4 22:47:13 2014 New Revision: 65561 URL: http://svn.reactos.org/svn/reactos?rev=65561&view=rev Log: [CONSRV] - Give the process handle which creates the screenbuffer, to ConDrvCreateScreenBuffer. - Few code refactoring. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -18,11 +18,13 @@ NTSTATUS TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, + IN HANDLE ProcessHandle, IN PTEXTMODE_BUFFER_INFO TextModeInfo); NTSTATUS GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, + IN HANDLE ProcessHandle, IN PGRAPHICS_BUFFER_INFO GraphicsInfo); VOID @@ -33,7 +35,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size) { @@ -77,7 +79,8 @@ // ConDrvCreateConsoleScreenBuffer NTSTATUS ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, + IN HANDLE ProcessHandle OPTIONAL, IN ULONG BufferType, IN PVOID ScreenBufferInfo) { @@ -89,14 +92,18 @@ return STATUS_INVALID_PARAMETER; } + /* Use the current process if ProcessHandle is NULL */ + if (ProcessHandle == NULL) + ProcessHandle = NtCurrentProcess(); + if (BufferType == CONSOLE_TEXTMODE_BUFFER) { - Status = TEXTMODE_BUFFER_Initialize(Buffer, Console, + Status = TEXTMODE_BUFFER_Initialize(Buffer, Console, ProcessHandle, (PTEXTMODE_BUFFER_INFO)ScreenBufferInfo); } else if (BufferType == CONSOLE_GRAPHICS_BUFFER) { - Status = GRAPHICS_BUFFER_Initialize(Buffer, Console, + Status = GRAPHICS_BUFFER_Initialize(Buffer, Console, ProcessHandle, (PGRAPHICS_BUFFER_INFO)ScreenBufferInfo); } else Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -79,22 +79,24 @@ VOID NTAPI ConDrvPause(PCONSOLE Console) { - if (!Console->UnpauseEvent) - { - NtCreateEvent(&Console->UnpauseEvent, EVENT_ALL_ACCESS, - NULL, NotificationEvent, FALSE); - } + /* In case we already have a pause event, just exit... */ + if (Console->UnpauseEvent) return; + + /* ... otherwise create it */ + NtCreateEvent(&Console->UnpauseEvent, EVENT_ALL_ACCESS, + NULL, NotificationEvent, FALSE); } VOID NTAPI ConDrvUnpause(PCONSOLE Console) { - if (Console->UnpauseEvent) - { - NtSetEvent(Console->UnpauseEvent, NULL); - NtClose(Console->UnpauseEvent); - Console->UnpauseEvent = NULL; - } + /* In case we already freed the event, just exit... */ + if (!Console->UnpauseEvent) return; + + /* ... otherwise set and free it */ + NtSetEvent(Console->UnpauseEvent, NULL); + NtClose(Console->UnpauseEvent); + Console->UnpauseEvent = NULL; } @@ -152,8 +154,6 @@ /* Initialize the console list and its lock */ InitializeListHead(&ConsoleList); RtlInitializeResource(&ListLock); - - /* Should call LoadKeyboardLayout */ } /* For resetting the terminal - defined in dummyterm.c */ @@ -229,6 +229,7 @@ InitializeListHead(&Console->BufferList); Status = ConDrvCreateScreenBuffer(&NewBuffer, Console, + NULL, CONSOLE_TEXTMODE_BUFFER, &ScreenBufferInfo); if (!NT_SUCCESS(Status)) @@ -291,14 +292,12 @@ /* We failed, detach the terminal from the console */ Terminal->Console = NULL; // For the caller ResetTerminal(Console); - return Status; } /* Copy buffer contents to screen */ // Terminal.Draw(); // ConioDrawConsole(Console); - DPRINT("Console drawn\n"); DPRINT("Terminal initialization done\n"); return STATUS_SUCCESS; @@ -364,8 +363,6 @@ */ LeaveCriticalSection(&Console->Lock); ConDrvUnlockConsoleList(); - - /* FIXME: Send a terminate message to all the processes owning this console */ /* Deregister the terminal */ DPRINT("Deregister terminal\n"); Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -33,7 +33,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size); VOID @@ -42,7 +42,8 @@ NTSTATUS GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, + IN HANDLE ProcessHandle, IN PGRAPHICS_BUFFER_INFO GraphicsInfo) { NTSTATUS Status = STATUS_SUCCESS; @@ -50,7 +51,6 @@ LARGE_INTEGER SectionSize; ULONG ViewSize = 0; - HANDLE ProcessHandle; if (Buffer == NULL || Console == NULL || GraphicsInfo == NULL) return STATUS_INVALID_PARAMETER; @@ -69,7 +69,6 @@ * correctly the allocated resources when the client releases the * screen buffer. */ - ProcessHandle = CsrGetClientThread()->Process->ProcessHandle; NewBuffer->ClientProcess = ProcessHandle; /* Get infos from the graphics buffer information structure */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -51,7 +51,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size); VOID @@ -60,11 +60,14 @@ NTSTATUS TEXTMODE_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, + IN PCONSOLE Console, + IN HANDLE ProcessHandle, IN PTEXTMODE_BUFFER_INFO TextModeInfo) { NTSTATUS Status = STATUS_SUCCESS; PTEXTMODE_SCREEN_BUFFER NewBuffer = NULL; + + UNREFERENCED_PARAMETER(ProcessHandle); if (Console == NULL || Buffer == NULL || TextModeInfo == NULL) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -169,7 +169,8 @@ { NTSTATUS Status = STATUS_INVALID_PARAMETER; PCONSOLE_CREATESCREENBUFFER CreateScreenBufferRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CreateScreenBufferRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCSR_PROCESS Process = CsrGetClientThread()->Process; + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(Process); PCONSRV_CONSOLE Console; PCONSOLE_SCREEN_BUFFER Buff; @@ -253,6 +254,7 @@ Status = ConDrvCreateScreenBuffer(&Buff, (PCONSOLE)Console, + Process->ProcessHandle, CreateScreenBufferRequest->ScreenBufferType, ScreenBufferInfo); if (!NT_SUCCESS(Status)) goto Quit; Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] Thu Dec 4 22:47:13 2014 @@ -34,9 +34,10 @@ ConSrvReleaseObject(&(Buff)->Header, (IsConsoleLocked)) NTSTATUS ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer, - IN OUT PCONSOLE Console, - IN ULONG BufferType, - IN PVOID ScreenBufferInfo); + IN PCONSOLE Console, + IN HANDLE ProcessHandle OPTIONAL, + IN ULONG BufferType, + IN PVOID ScreenBufferInfo); VOID NTAPI ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); // VOID ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);

1 0

[dquintana] 65560: [EXPLORER] * Reorganize a bit the CTrayWindowCtxMenu::QueryContextMenu method and do not error if AddContextMenus fails. Fixes the taskbar context menu not opening on right-click...
by dquintana＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: dquintana Date: Thu Dec 4 19:53:02 2014 New Revision: 65560 URL: http://svn.reactos.org/svn/reactos?rev=65560&view=rev Log: [EXPLORER] * Reorganize a bit the CTrayWindowCtxMenu::QueryContextMenu method and do not error if AddContextMenus fails. Fixes the taskbar context menu not opening on right-click. (No need to call it explorer-new now that it's the primary one!) CORE-8838 Modified: trunk/reactos/base/shell/explorer/tbsite.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Thu Dec 4 19:53:02 2014 @@ -288,11 +288,11 @@ IN UINT uFlags, OUT IContextMenu **ppcm) { - IShellService *pSs; - HRESULT hRet; - if (ContextMenu == NULL) { + HRESULT hRet; + CComPtr<IShellService> pSs; + /* Cache the context menu so we don't need to CoCreateInstance all the time... */ hRet = CoCreateInstance(CLSID_BandSiteMenu, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellService, &pSs)); TRACE("CoCreateInstance(CLSID_BandSiteMenu) for IShellService returned: 0x%x\n", hRet); @@ -302,13 +302,10 @@ hRet = pSs->SetOwner((IBandSite*)this); if (!SUCCEEDED(hRet)) { - pSs->Release(); return hRet; } hRet = pSs->QueryInterface(IID_PPV_ARG(IContextMenu, &ContextMenu)); - - pSs->Release(); if (!SUCCEEDED(hRet)) return hRet; @@ -321,12 +318,7 @@ } /* Add the menu items */ - return ContextMenu->QueryContextMenu( - hmenu, - indexMenu, - idCmdFirst, - idCmdLast, - uFlags); + return ContextMenu->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); } virtual HRESULT STDMETHODCALLTYPE Lock( Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Dec 4 19:53:02 2014 @@ -3029,59 +3029,59 @@ { HMENU menubase = LoadPopupMenu(hExplorerInstance, MAKEINTRESOURCE(IDM_TRAYWND)); - if (menubase) - { - int count = ::GetMenuItemCount(menubase); - - for (int i = 0; i < count; i++) - { - WCHAR label[128]; - - MENUITEMINFOW mii = { 0 }; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS - | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; - mii.dwTypeData = label; - mii.cch = _countof(label); - ::GetMenuItemInfoW(menubase, i, TRUE, &mii); - - TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); - - mii.fType |= MFT_RADIOCHECK; - - ::InsertMenuItemW(hPopup, i + 1, TRUE, &mii); - } - - ::DestroyMenu(menubase); - - if (SHRestricted(REST_CLASSICSHELL) != 0) - { - DeleteMenu(hPopup, - ID_LOCKTASKBAR, - MF_BYCOMMAND); - } - - CheckMenuItem(hPopup, - ID_LOCKTASKBAR, - MF_BYCOMMAND | (TrayWnd->Locked ? MF_CHECKED : MF_UNCHECKED)); - - if (TrayWnd->TrayBandSite != NULL) - { - if (SUCCEEDED(TrayWnd->TrayBandSite->AddContextMenus( - hPopup, - 0, - ID_SHELL_CMD_FIRST, - ID_SHELL_CMD_LAST, - CMF_NORMAL, - &pcm))) - { - return S_OK; - } - } - - } - - return E_FAIL; + if (!menubase) + return HRESULT_FROM_WIN32(GetLastError()); + + int count = ::GetMenuItemCount(menubase); + + for (int i = 0; i < count; i++) + { + WCHAR label[128]; + + MENUITEMINFOW mii = { 0 }; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS + | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; + mii.dwTypeData = label; + mii.cch = _countof(label); + ::GetMenuItemInfoW(menubase, i, TRUE, &mii); + + TRACE("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + + mii.fType |= MFT_RADIOCHECK; + + ::InsertMenuItemW(hPopup, i + 1, TRUE, &mii); + } + + ::DestroyMenu(menubase); + + if (SHRestricted(REST_CLASSICSHELL) != 0) + { + DeleteMenu(hPopup, + ID_LOCKTASKBAR, + MF_BYCOMMAND); + } + + CheckMenuItem(hPopup, + ID_LOCKTASKBAR, + MF_BYCOMMAND | (TrayWnd->Locked ? MF_CHECKED : MF_UNCHECKED)); + + if (TrayWnd->TrayBandSite != NULL) + { + if (FAILED(TrayWnd->TrayBandSite->AddContextMenus( + hPopup, + 0, + ID_SHELL_CMD_FIRST, + ID_SHELL_CMD_LAST, + CMF_NORMAL, + &pcm))) + { + WARN("AddContextMenus failed.\n"); + pcm = NULL; + } + } + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE

1 0

[gadamopoulos] 65559: [INCLUDES] * Move some shared definitions in a common header
by gadamopoulos＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: gadamopoulos Date: Thu Dec 4 18:20:51 2014 New Revision: 65559 URL: http://svn.reactos.org/svn/reactos?rev=65559&view=rev Log: [INCLUDES] * Move some shared definitions in a common header Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Dec 4 18:20:51 2014 @@ -157,7 +157,6 @@ */ #define TWM_OPENSTARTMENU (WM_USER + 260) -#define TWM_DOEXITWINDOWS (WM_USER + 342) extern const GUID IID_IShellDesktopTray; Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Thu Dec 4 18:20:51 2014 @@ -388,9 +388,6 @@ return TRUE; } -#define TWM_DOEXITWINDOWS (WM_USER + 342) -#define TWM_CYCLEFOCUS (WM_USER + 348) - LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hwndTray; Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Thu Dec 4 18:20:51 2014 @@ -22,6 +22,14 @@ #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ + +/**************************************************************************** + * Taskbar WM_COMMAND identifiers + */ + +#define TWM_DOEXITWINDOWS (WM_USER + 342) +#define TWM_CYCLEFOCUS (WM_USER + 348) + /**************************************************************************** * IDList Functions

1 0

[gadamopoulos] 65558: Try to fix build
by gadamopoulos＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: gadamopoulos Date: Thu Dec 4 17:40:29 2014 New Revision: 65558 URL: http://svn.reactos.org/svn/reactos?rev=65558&view=rev Log: Try to fix build Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Thu Dec 4 17:40:29 2014 @@ -46,7 +46,7 @@ LPITEMIDLIST pidlDesktopDirectory; LPITEMIDLIST pidlDesktop; - LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam); + LRESULT _NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam); public: CDesktopBrowser(); @@ -421,6 +421,8 @@ case FCIDM_DESKBROWSER_REFRESH: break; } + + return 0; } LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam)

1 0

[gadamopoulos] 65557: [SHELL32] - Implement handling accelerators for CDesktopBrowser. The only noticeable difference is that pressing alt+f4 in the desktop doesn't close it. See issue #8864 for mo...
by gadamopoulos＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: gadamopoulos Date: Thu Dec 4 17:30:44 2014 New Revision: 65557 URL: http://svn.reactos.org/svn/reactos?rev=65557&view=rev Log: [SHELL32] - Implement handling accelerators for CDesktopBrowser. The only noticeable difference is that pressing alt+f4 in the desktop doesn't close it. See issue #8864 for more details. Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Thu Dec 4 17:30:44 2014 @@ -35,6 +35,7 @@ { public: DWORD Tag; + HACCEL m_hAccel; private: HWND hWnd; HWND hWndShellView; @@ -44,6 +45,9 @@ CComPtr<IShellBrowser> DefaultShellBrowser; LPITEMIDLIST pidlDesktopDirectory; LPITEMIDLIST pidlDesktop; + + LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam); + public: CDesktopBrowser(); ~CDesktopBrowser(); @@ -51,8 +55,9 @@ HWND FindDesktopListView (); BOOL CreateDeskWnd(); HWND DesktopGetWindowControl(IN UINT id); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam); - static BOOL MessageLoop(); + BOOL MessageLoop(); // *** IOleWindow methods *** virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); @@ -252,7 +257,9 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::TranslateAcceleratorSB(LPMSG lpmsg, WORD wID) { - return S_FALSE; + if (!::TranslateAcceleratorW(hWnd, m_hAccel, lpmsg)) + return S_FALSE; + return S_OK; } HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) @@ -370,12 +377,50 @@ { if (bRet != -1) { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); + if (DesktopView->TranslateAcceleratorW(&Msg) != S_OK) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } } } return TRUE; +} + +#define TWM_DOEXITWINDOWS (WM_USER + 342) +#define TWM_CYCLEFOCUS (WM_USER + 348) + +LRESULT CDesktopBrowser::_NotifyTray(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hwndTray; + HRESULT hres; + + hres = this->ShellDesk->GetTrayWindow(&hwndTray); + + if (SUCCEEDED(hres)) + PostMessageW(hwndTray, uMsg, wParam, lParam); + + return 0; +} + +LRESULT CDesktopBrowser::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case FCIDM_DESKBROWSER_CLOSE: + return _NotifyTray(TWM_DOEXITWINDOWS, 0, 0); + case FCIDM_DESKBROWSER_FOCUS: + if (GetKeyState(VK_SHIFT)) + return _NotifyTray(TWM_CYCLEFOCUS, 1, 0xFFFFFFFF); + else + return _NotifyTray(TWM_CYCLEFOCUS, 1, 1); + case FCIDM_DESKBROWSER_SEARCH: + SHFindFiles(NULL, NULL); + break; + case FCIDM_DESKBROWSER_REFRESH: + break; + } } LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) @@ -445,6 +490,9 @@ if (!pThis->CreateDeskWnd()) WARN("Could not create the desktop view control!\n"); + + pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(3)); + break; } @@ -476,6 +524,8 @@ SHOnCWMCommandLine((HANDLE)lParam); break; + case WM_COMMAND: + return pThis->OnCommand(uMsg, wParam, lParam); default: DefMsgHandler: Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] Thu Dec 4 17:30:44 2014 @@ -54,6 +54,17 @@ shv_accel ACCELERATORS BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY +END + +IDA_DESKBROWSER ACCELERATORS +BEGIN + //"s", 34172, ALT + VK_F4, FCIDM_DESKBROWSER_CLOSE, VIRTKEY, ALT + VK_F6, FCIDM_DESKBROWSER_FOCUS, VIRTKEY + VK_TAB, FCIDM_DESKBROWSER_FOCUS, VIRTKEY + VK_TAB, FCIDM_DESKBROWSER_FOCUS, VIRTKEY, SHIFT + VK_F3, FCIDM_DESKBROWSER_SEARCH, VIRTKEY + VK_F5, FCIDM_DESKBROWSER_REFRESH, VIRTKEY END /* Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Dec 4 17:30:44 2014 @@ -22,6 +22,7 @@ /* Accelerators */ #define IDA_SHELLVIEW 1 +#define IDA_DESKBROWSER 3 /* Bitmaps */ #define IDB_REACTOS 131 @@ -485,6 +486,12 @@ #define IDR_AVI_FILENUKE 163 #define IDR_AVI_FILEDELETE 164 +/* Desktop Browser commands */ +#define FCIDM_DESKBROWSER_CLOSE 0xA004 +#define FCIDM_DESKBROWSER_FOCUS 0xA030 +#define FCIDM_DESKBROWSER_SEARCH 0xA085 +#define FCIDM_DESKBROWSER_REFRESH 0xA220 + /* Shell view commands */ #define FCIDM_SHVIEW_ARRANGE 0x7001 #define FCIDM_SHVIEW_DELETE 0x7011

1 0

[gadamopoulos] 65556: [EXPLORER] - Implement registering all hotkeys that explorer registers in windows. Not all of them are implemented. The ones that are implemented work fine in windows but most...
by gadamopoulos＠svn.reactos.org 04 Dec '14

04 Dec '14

Author: gadamopoulos Date: Thu Dec 4 17:20:43 2014 New Revision: 65556 URL: http://svn.reactos.org/svn/reactos?rev=65556&view=rev Log: [EXPLORER] - Implement registering all hotkeys that explorer registers in windows. Not all of them are implemented. The ones that are implemented work fine in windows but most of them don't work on ros. Thankfully nothing regressed by doing things the same with windows . Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/resource.h trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Thu Dec 4 17:20:43 2014 @@ -182,9 +182,6 @@ if (Tray != NULL) { -#if !WIN7_COMPAT_MODE - RegisterHotKey(NULL, IDHK_RUN, MOD_WIN, 'R'); -#endif TrayMessageLoop(Tray); #if !WIN7_COMPAT_MODE HideMinimizedWindows(FALSE); Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Thu Dec 4 17:20:43 2014 @@ -24,6 +24,12 @@ IDB_TASKBARPROP_NOLOCK_GROUP_QL BITMAP "res/nolock_group_ql.bmp" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" + +STRINGTABLE +BEGIN + //IDS_HELP_COMMAND "helpctr.exe>-FromStartHelp" + IDS_HELP_COMMAND "https://www.reactos.org/" +END /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Dec 4 17:20:43 2014 @@ -108,8 +108,6 @@ * explorer.c */ -#define IDHK_RUN 1 /* Win+R */ - LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Thu Dec 4 17:20:43 2014 @@ -109,3 +109,4 @@ #define IDC_TASKBARPROP_DESKBANDLIST 2301 #define IDS_TASKBAR_STARTMENU_PROP_CAPTION 2200 +#define IDS_HELP_COMMAND 732 Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Dec 4 17:20:43 2014 @@ -39,6 +39,19 @@ #define AUTOHIDE_SHOWING 1 #define AUTOHIDE_SHOWN 2 #define AUTOHIDE_HIDING 3 + +#define IDHK_RUN 0x1f4 +#define IDHK_MINIMIZE_ALL 0x1f5 +#define IDHK_RESTORE_ALL 0x1f6 +#define IDHK_HELP 0x1f7 +#define IDHK_EXPLORE 0x1f8 +#define IDHK_FIND 0x1f9 +#define IDHK_FIND_COMPUTER 0x1fa +#define IDHK_NEXT_TASK 0x1fb +#define IDHK_PREV_TASK 0x1fc +#define IDHK_SYS_PROPERTIES 0x1fd +#define IDHK_DESKTOP 0x1fe +#define IDHK_PAGER 0x1ff static LONG TrayWndCount = 0; @@ -201,19 +214,6 @@ PostQuitMessage(0); } - BOOL LaunchCPanel(HWND hwnd, LPCTSTR applet) - { - WCHAR szParams[MAX_PATH]; - - StringCbCopy(szParams, sizeof(szParams), - TEXT("shell32.dll,Control_RunDLL ")); - if (FAILED_UNEXPECTEDLY(StringCbCat(szParams, sizeof(szParams), - applet))) - return FALSE; - - return (ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), szParams, NULL, SW_SHOWDEFAULT) > (HINSTANCE) 32); - } - /* * ITrayWindow */ @@ -1577,6 +1577,20 @@ AutoHideState = AUTOHIDE_HIDING; SetTimer(TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); } + + RegisterHotKey(m_hWnd, IDHK_RUN, MOD_WIN, 'R'); + RegisterHotKey(m_hWnd, IDHK_MINIMIZE_ALL, MOD_WIN, 'M'); + RegisterHotKey(m_hWnd, IDHK_RESTORE_ALL, MOD_WIN|MOD_SHIFT, 'M'); + RegisterHotKey(m_hWnd, IDHK_HELP, MOD_WIN, VK_F1); + RegisterHotKey(m_hWnd, IDHK_EXPLORE, MOD_WIN, 'E'); + RegisterHotKey(m_hWnd, IDHK_FIND, MOD_WIN, 'F'); + RegisterHotKey(m_hWnd, IDHK_FIND_COMPUTER, MOD_WIN|MOD_CONTROL, 'F'); + RegisterHotKey(m_hWnd, IDHK_NEXT_TASK, MOD_WIN, VK_TAB); + RegisterHotKey(m_hWnd, IDHK_PREV_TASK, MOD_WIN|MOD_SHIFT, VK_TAB); + RegisterHotKey(m_hWnd, IDHK_SYS_PROPERTIES, MOD_WIN, VK_PAUSE); + RegisterHotKey(m_hWnd, IDHK_DESKTOP, MOD_WIN, 'D'); + RegisterHotKey(m_hWnd, IDHK_PAGER, MOD_WIN, 'B'); + return TRUE; } @@ -1789,7 +1803,8 @@ break; case ID_SHELL_CMD_ADJUST_DAT: - LaunchCPanel(NULL, TEXT("timedate.cpl")); + //FIXME: Use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); break; default: @@ -2581,7 +2596,10 @@ ptClick.x = MAKEPOINTS(lParam).x; ptClick.y = MAKEPOINTS(lParam).y; if (PtInRect(&rcClock, ptClick)) - LaunchCPanel(NULL, TEXT("timedate.cpl")); + { + //FIXME: use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); + } } return TRUE; } @@ -2637,6 +2655,70 @@ return TRUE; } + HRESULT ExecResourceCmd(int id) + { + WCHAR szCommand[256]; + WCHAR *pszParameters; + + if (!LoadString(hExplorerInstance, + id, + szCommand, + sizeof(szCommand) / sizeof(szCommand[0]))) + { + return E_FAIL; + } + + pszParameters = wcschr(szCommand, L'>'); + if (!pszParameters) + return E_FAIL; + + *pszParameters = 0; + pszParameters++; + + ShellExecuteW(m_hWnd, NULL, szCommand, pszParameters, NULL, 0); + return S_OK; + } + + LRESULT OnHotkey(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + switch (wParam) + { + case IDHK_RUN: + DisplayRunFileDlg(); + break; + case IDHK_HELP: + ExecResourceCmd(IDS_HELP_COMMAND); + break; + case IDHK_EXPLORE: + ShellExecuteW(0, L"explore", NULL, NULL, NULL, 1); + break; + case IDHK_FIND: + SHFindFiles(NULL, NULL); + break; + case IDHK_FIND_COMPUTER: + SHFindComputer(NULL, NULL); + break; + case IDHK_SYS_PROPERTIES: + //FIXME: Use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"sysdm.cpl", NULL, NULL, SW_NORMAL); + break; + case IDHK_NEXT_TASK: + break; + case IDHK_PREV_TASK: + break; + case IDHK_MINIMIZE_ALL: + break; + case IDHK_RESTORE_ALL: + break; + case IDHK_DESKTOP: + break; + case IDHK_PAGER: + break; + } + + return 0; + } + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = FALSE; @@ -2653,44 +2735,20 @@ { /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU: - DisplayProperties(); break; case IDM_SEARCH: + SHFindFiles(NULL, NULL); break; case IDM_HELPANDSUPPORT: - { - /* TODO: Implement properly */ - - LPCWSTR strSite = L"https://www.reactos.org/"; - - /* TODO: Make localizable */ - LPCWSTR strCaption = L"Sorry"; - LPCWSTR strMessage = L"ReactOS could not browse to '%s' (error %d). Please make sure there is a web browser installed."; - WCHAR tmpMessage[512]; - - /* TODO: Read from the registry */ - LPCWSTR strVerb = NULL; /* default */ - LPCWSTR strPath = strSite; - LPCWSTR strParams = NULL; - - /* The return value is defined as HINSTANCE for backwards compatibility only, the cast is needed */ - int result = (int) ShellExecuteW(m_hWnd, strVerb, strPath, strParams, NULL, SW_SHOWNORMAL); - if (result <= 32) - { - StringCchPrintfW(tmpMessage, 512, strMessage, strSite, result); - MessageBoxExW(m_hWnd, tmpMessage, strCaption, MB_OK, 0); - } + ExecResourceCmd(IDS_HELP_COMMAND); break; - } case IDM_RUN: - { DisplayRunFileDlg(); break; - } /* FIXME: Handle these commands as well */ case IDM_SYNCHRONIZE: @@ -2700,10 +2758,8 @@ break; case IDM_SHUTDOWN: - { DoExitWindows(); break; - } } } return Ret; @@ -2835,6 +2891,7 @@ MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy) MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) + MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) ALT_MSG_MAP(1) END_MSG_MAP() @@ -2878,16 +2935,6 @@ if (!Ret || Ret == -1) break; - - if (Msg.message == WM_HOTKEY) - { - switch (Msg.wParam) - { - case IDHK_RUN: /* Win+R */ - DisplayRunFileDlg(); - break; - } - } if (StartMenuBand == NULL || StartMenuBand->IsMenuMessage(&Msg) != S_OK)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs