Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 31173: - move some hardcoded strings to header en-US.h - move PAGE_NUMBER to usetup.h - start multiple language input support for usetup
by janderwald＠svn.reactos.org 12 Dec '07

12 Dec '07

Author: janderwald Date: Wed Dec 12 03:05:00 2007 New Revision: 31173 URL: http://svn.reactos.org/svn/reactos?rev=31173&view=rev Log: - move some hardcoded strings to header en-US.h - move PAGE_NUMBER to usetup.h - start multiple language input support for usetup Added: trunk/reactos/base/setup/usetup/lang/ trunk/reactos/base/setup/usetup/lang/en-US.h (with props) trunk/reactos/base/setup/usetup/mui.c (with props) trunk/reactos/base/setup/usetup/mui.h (with props) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/base/setup/usetup/usetup.rbuild Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Dec 12 03:05:00 2007 @@ -31,45 +31,6 @@ #define NDEBUG #include <debug.h> -typedef enum _PAGE_NUMBER -{ - START_PAGE, - INTRO_PAGE, - LICENSE_PAGE, - INSTALL_INTRO_PAGE, - -// SCSI_CONTROLLER_PAGE, - - DEVICE_SETTINGS_PAGE, - COMPUTER_SETTINGS_PAGE, - DISPLAY_SETTINGS_PAGE, - KEYBOARD_SETTINGS_PAGE, - LAYOUT_SETTINGS_PAGE, - - SELECT_PARTITION_PAGE, - CREATE_PARTITION_PAGE, - DELETE_PARTITION_PAGE, - - SELECT_FILE_SYSTEM_PAGE, - FORMAT_PARTITION_PAGE, - CHECK_FILE_SYSTEM_PAGE, - - PREPARE_COPY_PAGE, - INSTALL_DIRECTORY_PAGE, - FILE_COPY_PAGE, - REGISTRY_PAGE, - BOOT_LOADER_PAGE, - BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_PAGE, - - REPAIR_INTRO_PAGE, - - SUCCESS_PAGE, - QUIT_PAGE, - FLUSH_PAGE, - REBOOT_PAGE, /* virtual page */ -} PAGE_NUMBER, *PPAGE_NUMBER; - /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; @@ -137,10 +98,6 @@ } -#define POPUP_WAIT_NONE 0 -#define POPUP_WAIT_ANY_KEY 1 -#define POPUP_WAIT_ENTER 2 - static VOID DrawBox( IN SHORT xLeft, @@ -240,7 +197,7 @@ &Written); } -static VOID +VOID PopupError(PCHAR Text, PCHAR Status, PINPUT_RECORD Ir, @@ -722,20 +679,7 @@ static PAGE_NUMBER IntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetHighlightedTextXY(6, 8, "Welcome to ReactOS Setup"); - - CONSOLE_SetTextXY(6, 11, "This part of the setup copies the ReactOS Operating System to your"); - CONSOLE_SetTextXY(6, 12, "computer and prepares the second part of the setup."); - - CONSOLE_SetTextXY(8, 15, "\x07 Press ENTER to install ReactOS."); - CONSOLE_SetTextXY(8, 17, "\x07 Press R to repair ReactOS."); - CONSOLE_SetTextXY(8, 19, "\x07 Press L to view the ReactOS Licensing Terms and Conditions"); - CONSOLE_SetTextXY(8, 21, "\x07 Press F3 to quit without installing ReactOS."); - - CONSOLE_SetTextXY(6, 23, "For more information on ReactOS, please visit:"); - CONSOLE_SetHighlightedTextXY(6, 24, "http://www.reactos.org"); - - CONSOLE_SetStatusText(" ENTER = Continue R = Repair F3 = Quit"); + MUIDisplayPage(INTRO_PAGE); if (IsUnattendedSetup) { @@ -787,32 +731,9 @@ static PAGE_NUMBER LicensePage(PINPUT_RECORD Ir) { - CONSOLE_SetHighlightedTextXY(6, 6, "Licensing:"); - - CONSOLE_SetTextXY(8, 8, "The ReactOS System is licensed under the terms of the"); - CONSOLE_SetTextXY(8, 9, "GNU GPL with parts containing code from other compatible"); - CONSOLE_SetTextXY(8, 10, "licenses such as the X11 or BSD and GNU LGPL licenses."); - CONSOLE_SetTextXY(8, 11, "All software that is part of the ReactOS system is"); - CONSOLE_SetTextXY(8, 12, "therefore released under the GNU GPL as well as maintaining"); - CONSOLE_SetTextXY(8, 13, "the original license."); - - CONSOLE_SetTextXY(8, 15, "This software comes with NO WARRANTY or restrictions on usage"); - CONSOLE_SetTextXY(8, 16, "save applicable local and international law. The licensing of"); - CONSOLE_SetTextXY(8, 17, "ReactOS only covers distribution to third parties."); - - CONSOLE_SetTextXY(8, 18, "If for some reason you did not receive a copy of the"); - CONSOLE_SetTextXY(8, 19, "GNU General Public License with ReactOS please visit"); - CONSOLE_SetHighlightedTextXY(8, 20, "http://www.gnu.org/licenses/licenses.html"); - - CONSOLE_SetHighlightedTextXY(6, 22, "Warranty:"); - - CONSOLE_SetTextXY(8, 24, "This is free software; see the source for copying conditions."); - CONSOLE_SetTextXY(8, 25, "There is NO warranty; not even for MERCHANTABILITY or"); - CONSOLE_SetTextXY(8, 26, "FITNESS FOR A PARTICULAR PURPOSE"); - - CONSOLE_SetStatusText(" ENTER = Return"); - - while (TRUE) + MUIDisplayPage(LICENSE_PAGE); + + while (TRUE) { CONSOLE_ConInKey(Ir); @@ -829,20 +750,7 @@ static PAGE_NUMBER RepairIntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); - CONSOLE_SetTextXY(6, 9, "support all the functions of a fully usable setup application."); - - CONSOLE_SetTextXY(6, 12, "The repair functions are not implemented yet."); - - CONSOLE_SetTextXY(8, 15, "\x07 Press U for Updating OS."); - - CONSOLE_SetTextXY(8, 17, "\x07 Press R for the Recovery Console."); - - CONSOLE_SetTextXY(8, 19, "\x07 Press ESC to return to the main page."); - - CONSOLE_SetTextXY(8, 21, "\x07 Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" ESC = Main page ENTER = Reboot"); + MUIDisplayPage(REPAIR_INTRO_PAGE); while(TRUE) { @@ -875,27 +783,7 @@ static PAGE_NUMBER InstallIntroPage(PINPUT_RECORD Ir) { - CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - - CONSOLE_SetTextXY(6, 8, "ReactOS Setup is in an early development phase. It does not yet"); - CONSOLE_SetTextXY(6, 9, "support all the functions of a fully usable setup application."); - - CONSOLE_SetTextXY(6, 12, "The following limitations apply:"); - CONSOLE_SetTextXY(8, 13, "- Setup can not handle more than one primary partition per disk."); - CONSOLE_SetTextXY(8, 14, "- Setup can not delete a primary partition from a disk"); - CONSOLE_SetTextXY(8, 15, " as long as extended partitions exist on this disk."); - CONSOLE_SetTextXY(8, 16, "- Setup can not delete the first extended partition from a disk"); - CONSOLE_SetTextXY(8, 17, " as long as other extended partitions exist on this disk."); - CONSOLE_SetTextXY(8, 18, "- Setup supports FAT file systems only."); - CONSOLE_SetTextXY(8, 19, "- File system checks are not implemented yet."); - - - CONSOLE_SetTextXY(8, 23, "\x07 Press ENTER to install ReactOS."); - - CONSOLE_SetTextXY(8, 25, "\x07 Press F3 to quit without installing ReactOS."); - - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(INTRO_PAGE); if (RepairUpdateFlag) { @@ -970,6 +858,7 @@ DeviceSettingsPage(PINPUT_RECORD Ir) { static ULONG Line = 16; + MUIDisplayPage(DEVICE_SETTINGS_PAGE); /* Initialize the computer settings list */ if (ComputerList == NULL) @@ -1024,34 +913,17 @@ } } - CONSOLE_SetTextXY(6, 8, "The list below shows the current device settings."); - - CONSOLE_SetTextXY(8, 11, " Computer:"); - CONSOLE_SetTextXY(8, 12, " Display:"); - CONSOLE_SetTextXY(8, 13, " Keyboard:"); - CONSOLE_SetTextXY(8, 14, "Keyboard layout:"); - - CONSOLE_SetTextXY(8, 16, " Accept:"); + MUIDisplayPage(DEVICE_SETTINGS_PAGE); + CONSOLE_SetTextXY(25, 11, GetGenericListEntry(ComputerList)->Text); CONSOLE_SetTextXY(25, 12, GetGenericListEntry(DisplayList)->Text); CONSOLE_SetTextXY(25, 13, GetGenericListEntry(KeyboardList)->Text); CONSOLE_SetTextXY(25, 14, GetGenericListEntry(LayoutList)->Text); - CONSOLE_SetTextXY(25, 16, "Accept these device settings"); CONSOLE_InvertTextXY (24, Line, 48, 1); - - CONSOLE_SetTextXY(6, 19, "You can change the hardware settings by pressing the UP or DOWN keys"); - CONSOLE_SetTextXY(6, 20, "to select an entry. Then press the ENTER key to select alternative"); - CONSOLE_SetTextXY(6, 21, "settings."); - - CONSOLE_SetTextXY(6, 23, "When all settings are correct, select \"Accept these device settings\""); - CONSOLE_SetTextXY(6, 24, "and press ENTER."); - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); - - if (RepairUpdateFlag) + if (RepairUpdateFlag) { return SELECT_PARTITION_PAGE; } @@ -1113,13 +985,7 @@ static PAGE_NUMBER ComputerSettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the type of computer to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired computer type."); - CONSOLE_SetTextXY(8, 11, " Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the computer type."); + MUIDisplayPage(COMPUTER_SETTINGS_PAGE); DrawGenericList(ComputerList, 2, @@ -1127,8 +993,6 @@ xScreen - 3, yScreen - 3); - CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); - SaveGenericListState(ComputerList); while(TRUE) @@ -1171,21 +1035,13 @@ static PAGE_NUMBER DisplaySettingsPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(6, 8, "You want to change the type of display to be installed."); - - CONSOLE_SetTextXY(8, 10, "\x07 Press the UP or DOWN key to select the desired display type."); - CONSOLE_SetTextXY(8, 11, " Then press ENTER."); - - CONSOLE_SetTextXY(8, 13, "\x07 Press the ESC key to return to the previous page without changing"); - CONSOLE_SetTextXY(8, 14, " the display type."); + MUIDisplayPage(DISPLAY_SETTINGS_PAGE); DrawGenericList(DisplayList, 2, 18, xScreen - 3, yScreen - 3); - - CONSOLE_SetStatusText(" ENTER = Continue ESC = Cancel F3 = Quit"); SaveGenericListState(DisplayList); @@ -3441,14 +3297,8 @@ { NTSTATUS Status; - CONSOLE_SetTextXY(6, 8, "Setup cannot install the bootloader on your computers"); - CONSOLE_SetTextXY(6, 9, "harddisk"); - - CONSOLE_SetTextXY(6, 13, "Please insert a formatted floppy disk in drive A: and"); - CONSOLE_SetTextXY(6, 14, "press ENTER."); - - - CONSOLE_SetStatusText(" ENTER = Continue F3 = Quit"); + MUIDisplayPage(BOOT_LOADER_FLOPPY_PAGE); + // SetStatusText(" Please wait..."); while(TRUE) @@ -3531,14 +3381,7 @@ static PAGE_NUMBER QuitPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "ReactOS is not completely installed"); - - CONSOLE_SetTextXY(10, 8, "Remove floppy disk from Drive A: and"); - CONSOLE_SetTextXY(10, 9, "all CD-ROMs from CD-Drives."); - - CONSOLE_SetTextXY(10, 11, "Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" Please wait ..."); + MUIDisplayPage(QUIT_PAGE); /* Destroy partition list */ if (PartitionList != NULL) @@ -3599,14 +3442,7 @@ static PAGE_NUMBER SuccessPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "The basic components of ReactOS have been installed successfully."); - - CONSOLE_SetTextXY(10, 8, "Remove floppy disk from Drive A: and"); - CONSOLE_SetTextXY(10, 9, "all CD-ROMs from CD-Drive."); - - CONSOLE_SetTextXY(10, 11, "Press ENTER to reboot your computer."); - - CONSOLE_SetStatusText(" ENTER = Reboot computer"); + MUIDisplayPage(SUCCESS_PAGE); if (IsUnattendedSetup) { @@ -3628,13 +3464,7 @@ static PAGE_NUMBER FlushPage(PINPUT_RECORD Ir) { - CONSOLE_SetTextXY(10, 6, "The system is now making sure all data is stored on your disk"); - - CONSOLE_SetTextXY(10, 8, "This may take a minute"); - CONSOLE_SetTextXY(10, 9, "When finished, your computer will reboot automatically"); - - CONSOLE_SetStatusText(" Flushing cache"); - + MUIDisplayPage(FLUSH_PAGE); return REBOOT_PAGE; } Added: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (added) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Dec 12 03:05:00 2007 @@ -1,0 +1,728 @@ +#ifndef LANG_EN_US_H__ +#define LANG_EN_US_H__ + +static MUI_ENTRY WelcomePageEntries[] = +{ + { + 6, + 8, + "Welcome to ReactOS Setup", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Continue R = Repair F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY IntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY LicensePageEntries[] = +{ + { + 6, + 6, + "Licensing:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Return", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY DevicePageEntries[] = +{ + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_NORMAL + }, + { + 8, + 11, + " Computer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Display:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Keyboard:", + TEXT_NORMAL + }, + { + 8, + 14, + "Keyboard layout:", + TEXT_NORMAL + }, + { + 8, + 16, + " Accept:", + TEXT_NORMAL + }, + { + 25, + 16, "Accept these device settings", + TEXT_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY RepairPageEntries[] = +{ + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Main page ENTER = Reboot", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY ComputerPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY FlushPageEntries[] = +{ + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY QuitPageEntries[] = +{ + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY DisplayPageEntries[] = +{ + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue ESC = Cancel F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY SuccessPageEntries[] = +{ + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reboot computer", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY BootPageEntries[] = +{ + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_PAGE enUSPages[] = +{ + { + START_PAGE, + WelcomePageEntries + }, + { + INTRO_PAGE, + IntroPageEntries + }, + { + LICENSE_PAGE, + LicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + DevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + RepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + ComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + DisplayPageEntries + }, + { + FLUSH_PAGE, + FlushPageEntries + }, + { + QUIT_PAGE, + QuitPageEntries + }, + { + SUCCESS_PAGE, + SuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + BootPageEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/en-US.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (added) +++ trunk/reactos/base/setup/usetup/mui.c Wed Dec 12 03:05:00 2007 @@ -1,0 +1,83 @@ +#include "usetup.h" +#include "mui.h" + +#include "lang/en-US.h" + +static MUI_LANGUAGE lang[] = +{ + { + "English (USA)", + enUSPages + }, + { + NULL, + NULL + } +}; + +static unsigned sel_lang = 0; + +extern +VOID +PopupError(PCHAR Text, + PCHAR Status, + PINPUT_RECORD Ir, + ULONG WaitEvent); + + +static +MUI_ENTRY * +findMUIEntriesOfPage(int pg, MUI_PAGE * pages) +{ + int index = 0; + do + { + if (pages[index].Number == pg) + { + return pages[index].MuiEntry; + } + index++; + }while(pages[index].MuiEntry != NULL); + return NULL; +} + +void MUIDisplayPage(int pg) +{ + MUI_ENTRY * entry; + int index; + int flags; + + entry = findMUIEntriesOfPage(pg, lang[sel_lang].MuiPages); + if (!entry) + { + PopupError("Error: Failed to find translated page", + NULL, + NULL, + POPUP_WAIT_NONE); + return; + } + + index = 0; + do + { + flags = entry[index].Flags; + switch(flags) + { + case TEXT_NORMAL: + CONSOLE_SetTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_HIGHLIGHT: + CONSOLE_SetHighlightedTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_UNDERLINE: + CONSOLE_SetUnderlinedTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); + break; + case TEXT_STATUS: + CONSOLE_SetStatusText(entry[index].Buffer); + break; + default: + break; + } + index++; + }while(entry[index].Buffer != NULL); +} Propchange: trunk/reactos/base/setup/usetup/mui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (added) +++ trunk/reactos/base/setup/usetup/mui.h Wed Dec 12 03:05:00 2007 @@ -1,0 +1,34 @@ +#ifndef MUI_H__ +#define MUI_H__ + +typedef struct +{ + BYTE X; + BYTE Y; + CHAR * Buffer; + BYTE Flags; +}MUI_ENTRY, *PMUI_ENTRY; + +typedef struct +{ + long Number; + MUI_ENTRY * MuiEntry; +}MUI_PAGE; + +typedef struct +{ + CHAR * LanguageDescriptor; + MUI_PAGE * MuiPages; +}MUI_LANGUAGE; + + +#define TEXT_NORMAL 0 +#define TEXT_HIGHLIGHT 1 +#define TEXT_UNDERLINE 2 +#define TEXT_STATUS 4 + + +void MUIDisplayPage(int pg); + + +#endif Propchange: trunk/reactos/base/setup/usetup/mui.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Wed Dec 12 03:05:00 2007 @@ -71,6 +71,8 @@ #include "genlist.h" #include "settings.h" #include "host.h" +#include "mui.h" + extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; @@ -78,6 +80,50 @@ extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; +typedef enum _PAGE_NUMBER +{ + START_PAGE = 0, + INTRO_PAGE, + LICENSE_PAGE, + INSTALL_INTRO_PAGE, + +// SCSI_CONTROLLER_PAGE, + + DEVICE_SETTINGS_PAGE, + COMPUTER_SETTINGS_PAGE, + DISPLAY_SETTINGS_PAGE, + KEYBOARD_SETTINGS_PAGE, + LAYOUT_SETTINGS_PAGE, + + SELECT_PARTITION_PAGE, + CREATE_PARTITION_PAGE, + DELETE_PARTITION_PAGE, + + SELECT_FILE_SYSTEM_PAGE, + FORMAT_PARTITION_PAGE, + CHECK_FILE_SYSTEM_PAGE, + + PREPARE_COPY_PAGE, + INSTALL_DIRECTORY_PAGE, + FILE_COPY_PAGE, + REGISTRY_PAGE, + BOOT_LOADER_PAGE, + BOOT_LOADER_FLOPPY_PAGE, + BOOT_LOADER_HARDDISK_PAGE, + + REPAIR_INTRO_PAGE, + + SUCCESS_PAGE, + QUIT_PAGE, + FLUSH_PAGE, + REBOOT_PAGE, /* virtual page */ +} PAGE_NUMBER, *PPAGE_NUMBER; + +#define POPUP_WAIT_NONE 0 +#define POPUP_WAIT_ANY_KEY 1 +#define POPUP_WAIT_ENTER 2 + + #endif /* __USETUP_H__*/ /* EOF */ Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Wed Dec 12 03:05:00 2007 @@ -43,4 +43,5 @@ <file>registry.c</file> <file>settings.c</file> <file>usetup.rc</file> + <file>mui.c</file> </module>

1 0

[fireball] 31172: - Fix default buffer size for user-mode RtlQueryRegistryValues queries, this removes warnings on debug log about buffer being too small (it was!). - Remove ARC tree dump since this code has now been proven to work. - Sync PointerFree with WINE, removing the unhandled data type=warning.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Wed Dec 12 00:52:12 2007 New Revision: 31172 URL: http://svn.reactos.org/svn/reactos?rev=31172&view=rev Log: - Fix default buffer size for user-mode RtlQueryRegistryValues queries, this removes warnings on debug log about buffer being too small (it was!). - Remove ARC tree dump since this code has now been proven to work. - Sync PointerFree with WINE, removing the unhandled data type=warning. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/lib/rtl/registry.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c Wed Dec 12 00:52:12 2007 @@ -12,6 +12,8 @@ #include <ntdll.h> #define NDEBUG #include <debug.h> + +SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Wed Dec 12 00:52:12 2007 @@ -904,36 +904,24 @@ pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; + + if (!Pointer) return; + if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); - } - - if (!Pointer) return; - + Pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", Pointer); + } + m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); - /* hmm... is this sensible? - * perhaps we should check if the memory comes from NdrAllocate, + /* we should check if the memory comes from NdrAllocate, * and deallocate only if so - checking if the pointer is between - * BufferStart and BufferEnd is probably no good since the buffer + * BufferStart and BufferEnd will not always work since the buffer * may be reallocated when the server wants to marshal the reply */ - switch (*desc) { - case RPC_FC_BOGUS_STRUCT: - case RPC_FC_BOGUS_ARRAY: - case RPC_FC_USER_MARSHAL: - break; - default: - FIXME("unhandled data type=%02x\n", *desc); - case RPC_FC_CARRAY: - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - if (pStubMsg->ReuseBuffer) goto notfree; - break; - case RPC_FC_IP: - goto notfree; - } + if (Pointer >= (unsigned char *)pStubMsg->RpcMsg->Buffer || + Pointer <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + goto notfree; if (attr & RPC_FC_P_ONSTACK) { TRACE("not freeing stack ptr %p\n", Pointer); Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=311… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Wed Dec 12 00:52:12 2007 @@ -14,6 +14,8 @@ #include <debug.h> #define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') + +extern SIZE_T RtlpAllocDeallocQueryBufferSize; /* DATA **********************************************************************/ @@ -970,7 +972,7 @@ NTSTATUS Status; PKEY_VALUE_FULL_INFORMATION KeyValueInfo = NULL; HANDLE KeyHandle, CurrentKey; - SIZE_T BufferSize = 128, InfoSize; + SIZE_T BufferSize, InfoSize; UNICODE_STRING KeyPath, KeyValueName; OBJECT_ATTRIBUTES ObjectAttributes; ULONG i, Value; @@ -985,6 +987,7 @@ (RelativeTo & RTL_REGISTRY_HANDLE) ? NULL : Path); /* Allocate a query buffer */ + BufferSize = RtlpAllocDeallocQueryBufferSize; KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, NULL, 0, &Status); if (!KeyValueInfo) { Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Wed Dec 12 00:52:12 2007 @@ -207,37 +207,10 @@ ULONG Interface = InterfaceType, Bus = BusNumber, i; NTSTATUS Status; HANDLE NewHandle; - static ULONG t, tabLevel; - PCHAR InterfaceStrings[MaximumInterfaceType + 1] = - { - "Internal", - "Isa", - "Eisa", - "MicroChannel", - "TurboChannel", - "PCIBus", - "VMEBus", - "NuBus", - "PCMCIABus", - "CBus", - "MPIBus", - "MPSABus", - "ProcessorInternal", - "InternalPowerBus", - "PNPISABus", - "PNPBus", - "Unknown" - }; /* Loop each entry */ while (CurrentEntry) { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Dumping node @ 0x%p\n", CurrentEntry); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Parent @ 0x%p Sibling @ 0x%p Child @ 0x%p\n", - CurrentEntry->Parent, CurrentEntry->Sibling, CurrentEntry->Child); - /* Check if this is an adapter */ Component = &CurrentEntry->ComponentEntry; if ((Component->Class == AdapterClass) && @@ -303,35 +276,7 @@ } /* Dump information on the component */ - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Component Type: %wZ\n", &CmTypeName[Component->Type]); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Class: %wZ\n", &CmClassName[Component->Class]); - if (Component->Class != SystemClass) - { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Device Index: %lx\n", DeviceIndexTable[Component->Type]); - } - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Component Information:\n"); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tFlags: %lx\n", Component->Flags); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tVersion: %lx\n", Component->Version); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("\tAffinity: %lx\n", Component->AffinityMask); - if (Component->IdentifierLength) - { - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Identifier: %S\n", Component->Identifier); - } - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Configuration Data: %p\n", CurrentEntry->ConfigurationData); - for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Interface Type: %s Bus Number: %d\n\n", - InterfaceStrings[Interface], - Bus); - + /* Setup the hardware node */ Status = CmpInitializeRegistryNode(CurrentEntry, ParentHandle, @@ -345,12 +290,10 @@ if (CurrentEntry->Child) { /* Recurse child */ - tabLevel++; Status = CmpSetupConfigurationTree(CurrentEntry->Child, NewHandle, Interface, Bus); - tabLevel--; if (!NT_SUCCESS(Status)) { /* Fail */ @@ -433,8 +376,6 @@ if (LoaderBlock->ConfigurationRoot) { /* Setup the configuration tree */ - DPRINT1("ARC Hardware Tree Received @ 0x%p. Dumping HW Info:\n\n", - LoaderBlock->ConfigurationRoot); Status = CmpSetupConfigurationTree(LoaderBlock->ConfigurationRoot, KeyHandle, -1, @@ -455,3 +396,4 @@ + Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Wed Dec 12 00:52:12 2007 @@ -22,6 +22,7 @@ } RTL_RANGE_ENTRY, *PRTL_RANGE_ENTRY; PAGED_LOOKASIDE_LIST RtlpRangeListEntryLookasideList; +SIZE_T RtlpAllocDeallocQueryBufferSize = 128; /* FUNCTIONS *****************************************************************/

1 0

[fireball] 31171: - Two more leftovers.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Wed Dec 12 00:34:04 2007 New Revision: 31171 URL: http://svn.reactos.org/svn/reactos?rev=31171&view=rev Log: - Two more leftovers. Modified: trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Wed Dec 12 00:34:04 2007 @@ -15,7 +15,7 @@ #include <include/class2.h> #include <stdio.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define IO_WRITE_CACHE_ENABLED ((NTSTATUS)0x80040020L) Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=31… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Wed Dec 12 00:34:04 2007 @@ -111,7 +111,6 @@ } /* Insert it into our temporary list */ - DPRINT1("Adding a timer!\n"); InsertTailList(&TempList, &Timer->TimerListEntry); } } @@ -152,7 +151,6 @@ } /* Insert it into our temporary list */ - DPRINT1("Adding a timer 2!\n"); InsertTailList(&TempList2, &Timer->TimerListEntry); }

1 0

[fireball] 31170: - Reshuflle baseaddresses so no relocations occur during booting. - Give beepmidi.dll a baseaddress. - Silence non-critical trace-style messages in umpnpmgr and in the kernel.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Wed Dec 12 00:25:10 2007 New Revision: 31170 URL: http://svn.reactos.org/svn/reactos?rev=31170&view=rev Log: - Reshuflle baseaddresses so no relocations occur during booting. - Give beepmidi.dll a baseaddress. - Silence non-critical trace-style messages in umpnpmgr and in the kernel. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Wed Dec 12 00:25:10 2007 @@ -201,7 +201,7 @@ UNREFERENCED_PARAMETER(BindingHandle); - DPRINT1("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); + DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); /* Get the users token */ hProcess = OpenProcess(PROCESS_ALL_ACCESS, Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=311… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Wed Dec 12 00:25:10 2007 @@ -30,7 +30,7 @@ <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> <property name="BASEADDRESS_MAIN" value="0x64f40000" /> <property name="BASEADDRESS_INTL" value="0x64fb0000" /> - <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <property name="BASEADDRESS_CONSOLE" value="0x6e4d0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> <property name="BASEADDRESS_MLANG" value="0x65140000" /> @@ -43,7 +43,7 @@ <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <property name="BASEADDRESS_BROWSEUI" value="0x69cd0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> @@ -102,7 +102,6 @@ <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> @@ -125,9 +124,10 @@ <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <property name="BASEADDRESS_RASAPI32" value="0x76ee0000h" /> + <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> + <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <property name="BASEADDRESS_MSVFW32" value="0x76f60000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> @@ -143,7 +143,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e30000" /> <property name="BASEADDRESS_GDI32" value="0x77f70000" /> @@ -153,5 +153,6 @@ <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Wed Dec 12 00:25:10 2007 @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild Wed Dec 12 00:25:10 2007 @@ -1,4 +1,4 @@ -<module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll"> +<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> <define name="UNICODE" /> Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c Wed Dec 12 00:25:10 2007 @@ -129,7 +129,7 @@ PLSAR_POLICY_HANDLE Policy = NULL; NTSTATUS Status; - DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); + DPRINT("LsarClose(0x%p) called!\n", ObjectHandle); Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle, 0,

1 0

[gbrunmar] 31169: Added an older still valid version of the D3D9 SDK
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Wed Dec 12 00:02:03 2007 New Revision: 31169 URL: http://svn.reactos.org/svn/reactos?rev=31169&view=rev Log: Added an older still valid version of the D3D9 SDK Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=31… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Wed Dec 12 00:02:03 2007 @@ -58,9 +58,11 @@ * #defines and error codes */ #ifdef D3D_DEBUG_INFO -#define D3D_SDK_VERSION (32 | 0x80000000) +#define D3D_SDK_VERSION (32 | 0x80000000L) +#define D3D9b_SDK_VERSION (31 | 0x80000000L) #else #define D3D_SDK_VERSION 32 +#define D3D9b_SDK_VERSION 31 #endif #define D3DADAPTER_DEFAULT 0

1 0

[gbrunmar] 31168: * Fixed d3d9.dll stubs * Added first draft of IDirect3D9 implementation based on greatlrd's work
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Tue Dec 11 23:53:17 2007 New Revision: 31168 URL: http://svn.reactos.org/svn/reactos?rev=31168&view=rev Log: * Fixed d3d9.dll stubs * Added first draft of IDirect3D9 implementation based on greatlrd's work Added: trunk/reactos/dll/directx/d3d9/d3d9_private.h - copied, changed from r31064, trunk/reactos/dll/directx/d3d9/d3d9.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… Copied: trunk/reactos/dll/directx/d3d9/d3d9_private.h (from r31064, trunk/reactos/dll/directx/d3d9/d3d9.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv…

1 0

[gbrunmar] 31167: Added debug version of IDirect3D9 interface
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Tue Dec 11 23:37:55 2007 New Revision: 31167 URL: http://svn.reactos.org/svn/reactos?rev=31167&view=rev Log: Added debug version of IDirect3D9 interface Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=31… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Tue Dec 11 23:37:55 2007 @@ -57,7 +57,12 @@ /***************************************************************************** * #defines and error codes */ +#ifdef D3D_DEBUG_INFO +#define D3D_SDK_VERSION (32 | 0x80000000) +#else #define D3D_SDK_VERSION 32 +#endif + #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L @@ -176,6 +181,11 @@ STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) PURE; STDMETHOD_(HMONITOR, GetAdapterMonitor)(THIS_ UINT Adapter) PURE; STDMETHOD(CreateDevice)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, struct IDirect3DDevice9** ppReturnedDeviceInterface) PURE; + +#ifdef D3D_DEBUG_INFO + LPCWSTR Version; +#endif + }; #undef INTERFACE

1 0

[dchapyshev] 31166: - Update English and Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 23:07:27 2007 New Revision: 31166 URL: http://svn.reactos.org/svn/reactos?rev=31166&view=rev Log: - Update English and Russian translation Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Tue Dec 11 23:07:27 2007 @@ -75,16 +75,16 @@ "If you are on a network, your computer name must be unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Setup will create a user account on your computer called Administrator. "\ "You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -98,14 +98,14 @@ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -114,12 +114,12 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Date and Time:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Dec 11 23:07:27 2007 @@ -42,9 +42,9 @@ LTEXT "Ââåäèòå âàøå ïîëíîå èìÿ è íàçâàíèå îðãàíèçàöèè.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Èìÿ:", IDC_STATIC, 54, 37, 44, 8 - EDITTEXT IDC_OWNERNAME, 132, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Îðãàíèçàöèÿ:", IDC_STATIC, 54, 57, 47, 8 - EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -57,16 +57,16 @@ "Åñëè âàø êîìïüþòåð ïîäêëþ÷åí ê ñåòè, òî åãî èìÿ äîëæíî áûòü óíèêàëüíî.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Èìÿ êîìïüþòåðà:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 140, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Ïðè óñòàíîâêå áóäåò ñîçäàí ïðîôèëü ïîëüçîâàòåëÿ ñ èìåíåì Administrator "\ "Âû ìîæåòå èñïîëüçîâàòü ýòîò ïðîôèëü, åñëè âàì íóæíî ïîëó÷èòü ïðàâà àäìèíèñòðàòîðà.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Ââåäèòå ïàðîëü àäìèíèñòðàòîðà (íå áîëåå 14 ñèìâîëîâ).", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 110, 8 - EDITTEXT IDC_ADMINPASSWORD1, 142, 101, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 96, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "Ï&îâòîðèòå ïàðîëü:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 142, 120, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -97,9 +97,9 @@ BEGIN LTEXT "Äàòà è âðåìÿ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 11 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 11 + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "×àñîâîé ïîÿñ:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL

1 0

[hpoussin] 31165: Don't create a key name with a final \0
by hpoussin＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: hpoussin Date: Tue Dec 11 23:07:04 2007 New Revision: 31165 URL: http://svn.reactos.org/svn/reactos?rev=31165&view=rev Log: Don't create a key name with a final \0 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Dec 11 23:07:04 2007 @@ -2704,6 +2704,7 @@ const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); static ULONG DeviceIndexMouse = 0; + UNICODE_STRING HardwareIdKey; PUNICODE_STRING pHardwareId; ULONG DeviceIndex = 0; @@ -2980,8 +2981,12 @@ goto nextdevice; } + /* Prepare hardware id key (hardware id value without final \0) */ + HardwareIdKey = *pHardwareId; + HardwareIdKey.Length -= sizeof(UNICODE_NULL); + /* Add the detected device to Root key */ - InitializeObjectAttributes(&ObjectAttributes, pHardwareId, OBJ_KERNEL_HANDLE, hRootKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &HardwareIdKey, OBJ_KERNEL_HANDLE, hRootKey, NULL); Status = ZwCreateKey( &hLevel1Key, KEY_CREATE_SUB_KEY, @@ -3012,7 +3017,7 @@ DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); goto nextdevice; } - DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, pHardwareId); + DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, &HardwareIdKey); Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength); if (!NT_SUCCESS(Status)) {

1 0

[dchapyshev] 31164: - Update English and Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 22:31:44 2007 New Revision: 31164 URL: http://svn.reactos.org/svn/reactos?rev=31164&view=rev Log: - Update English and Russian translation Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc Tue Dec 11 22:31:44 2007 @@ -136,11 +136,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOG 12,0,175,90 CAPTION "About GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Tue Dec 11 22:31:44 2007 @@ -4,8 +4,8 @@ { IDS_APPNAME, "Êàëüêóëÿòîð" - IDS_COPYRIGHT1, "Êàëüêóëÿòîð 5.0. Ðàñïðîñòðàíÿåòñÿ ïîä LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT1, "Êàëüêóëÿòîð 5.0. Ðàñïðîñòðàíÿåòñÿ ïî LGPL 2" + IDS_COPYRIGHT2 "Àâòîðñêèå ïðàâà (ñ) 2003, Äæåìåñ Áðèãñ" IDS_COPYRIGHT3 "Ñàí-Õîñå, Êàëèôîðíèÿ, ÑØÀ" IDS_COPYRIGHT4 "james(a)ActionMessage.com" IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" @@ -112,11 +112,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,80 +DLG_ABOUT DIALOG 12,0,175,82 CAPTION "Î ïðîãðàììå GNU WineCalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 5, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 62, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE

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