Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 31442: Remove hack, as we can use 'filter' command in kdbg instead
by hpoussin＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: hpoussin Date: Wed Dec 26 13:21:35 2007 New Revision: 31442 URL: http://svn.reactos.org/svn/reactos?rev=31442&view=rev Log: Remove hack, as we can use 'filter' command in kdbg instead Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Wed Dec 26 13:21:35 2007 @@ -523,13 +523,5 @@ if (IsFirstStageSetup()) return i8042AddLegacyKeyboard(DriverObject, RegistryPath); - /* ROS Hack: ideally, we shouldn't have to initialize debug level this way */ -#ifndef NDEBUG - DbgSetDebugFilterState( - DPFLTR_I8042PRT_ID, - (1 << DPFLTR_ERROR_LEVEL) | (1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL) | (1 << DPFLTR_INFO_LEVEL), - TRUE); -#endif - return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Wed Dec 26 13:21:35 2007 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <define name="NDEBUG" /> <library>ntoskrnl</library> <library>hal</library> <file>createclose.c</file>

1 0

[pschweitzer] 31441: Updated Slovak translation of Explorer by Mario Kacmar (kario@szm.sk) See issue #2551 for more details.
by pschweitzer＠svn.reactos.org 26 Dec '07

26 Dec '07

Author: pschweitzer Date: Wed Dec 26 11:41:30 2007 New Revision: 31441 URL: http://svn.reactos.org/svn/reactos?rev=31441&view=rev Log: Updated Slovak translation of Explorer by Mario Kacmar (kario(a)szm.sk) See issue #2551 for more details. Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Wed Dec 26 11:41:30 2007 @@ -92,8 +92,8 @@ BEGIN POPUP "" BEGIN - MENUITEM "Otvori ovládanie hlasitosti", ID_TRAY_VOLUME - MENUITEM "Upravi vlastnosti zvuku", ID_VOLUME_PROPERTIES + MENUITEM "O&tvori ovládanie hlasitosti", ID_TRAY_VOLUME + MENUITEM "&Upravi vlastnosti zvuku", ID_VOLUME_PROPERTIES END END @@ -174,7 +174,7 @@ CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 + PUSHBUTTON "&Vyh¾ada",IDC_CHECK_ENTRIES,143,7,50,14 END IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 @@ -182,7 +182,7 @@ CAPTION "Vlastnosti plochy" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Vyberte si prosím, vami uprednostòovaný spôsob zarovnania ikón:", + LTEXT "Vyberte si uprednostòovaný spôsob zarovnania ikón:", IDC_STATIC,7,7,166,8 CONTROL "z¾ava zhora dole",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 @@ -218,7 +218,7 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "Zobrazi &hodiny",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 + WS_TABSTOP,7,152,65,10 CONTROL "&Skry neaktívne ikony", ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 @@ -241,7 +241,7 @@ BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Text popisu:",IDC_LABEL1,7,44,40,8 + LTEXT "&Text popisu:",IDC_LABEL1,7,44,44,8 EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL LTEXT "&Názov okna:",IDC_LABEL2,7,63,44,8 EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL @@ -249,17 +249,17 @@ EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL GROUPBOX "&Zobrazenie",IDC_LABEL4,7,96,157,28 CONTROL "z&obrazi",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 + WS_TABSTOP,15,108,40,10 CONTROL "&skry",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, 108,29,10 - CONTROL "skry a&utomaticky",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 + CONTROL "a&utomaticky",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,105,108,55,10 ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Posledná zmena:",IDC_LABEL6,7,132,43,8 + LTEXT "&Posledná zmena:",IDC_LABEL6,7,128,40,18 EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | ES_READONLY CONTROL "zo&brazi skryté",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,64,10 DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP PUSHBUTTON "&Zrui",IDCANCEL,151,153,50,14 END @@ -270,17 +270,17 @@ CAPTION "Vybra spôsob zobrazovania okien" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Vyberte si prosím, vami uprednostòované pouívate¾ské rozhranie:", + LTEXT "Vyberte si uprednostòované pouívate¾ské rozhranie:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Mnoho dokumentové rozhranie)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,130,10 CONTROL "&SDI (Jedno dokumentové rozhranie)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,62,118,10 + BS_AUTORADIOBUTTON,7,62,130,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 CONTROL "Otvára prieèinky v samostatných &oknách", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 + WS_TABSTOP,7,90,138,10 LTEXT "Toto nastavenie sa v budúcnosti pouije ako predvolené pre vetké okná Priezkumníka.", IDC_STATIC,7,111,174,22 DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP @@ -409,3 +409,4 @@ #endif // not APSTUDIO_INVOKED +

1 0

[hpoussin] 31440: Try to fix INFO_, TRACE_, WARN_ ERROR_ macros
by hpoussin＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: hpoussin Date: Wed Dec 26 00:34:07 2007 New Revision: 31440 URL: http://svn.reactos.org/svn/reactos?rev=31440&view=rev Log: Try to fix INFO_, TRACE_, WARN_ ERROR_ macros Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Wed Dec 26 00:34:07 2007 @@ -527,7 +527,7 @@ #ifndef NDEBUG DbgSetDebugFilterState( DPFLTR_I8042PRT_ID, - DPFLTR_ERROR_LEVEL | DPFLTR_WARNING_LEVEL | DPFLTR_TRACE_LEVEL | DPFLTR_INFO_LEVEL, + (1 << DPFLTR_ERROR_LEVEL) | (1 << DPFLTR_WARNING_LEVEL) | (1 << DPFLTR_TRACE_LEVEL) | (1 << DPFLTR_INFO_LEVEL), TRUE); #endif

1 0

[mpiulachs] 31439: - fix typo
by mpiulachs＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: mpiulachs Date: Tue Dec 25 23:44:46 2007 New Revision: 31439 URL: http://svn.reactos.org/svn/reactos?rev=31439&view=rev Log: - fix typo Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Dec 25 23:44:46 2007 @@ -18,7 +18,7 @@ { 8, 11, - "Luego presione ENTER.", + " Luego presione ENTER.", TEXT_NORMAL }, {

1 0

[mpiulachs] 31438: update the spanish localization
by mpiulachs＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: mpiulachs Date: Tue Dec 25 23:41:39 2007 New Revision: 31438 URL: http://svn.reactos.org/svn/reactos?rev=31438&view=rev Log: update the spanish localization Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Dec 25 23:41:39 2007 @@ -12,25 +12,25 @@ { 8, 10, - "\x07 Please choose the language used for the installation process.", + "\x07 Por favor, seleccione el idioma a utilizar durante la instalación.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + "Luego presione ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 El idioma seleccionado será también el idioma por defacto del sistema.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuar R = Reparar F3 = Salir", TEXT_STATUS }, {

1 0

[mpiulachs] 31437: - Allow LANGUAGE_PAGE localization - Use DefaultLanguage setting to set the user interface language even for the language selection itself - Add missing language page entries to current localizations, translators get to work!
by mpiulachs＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: mpiulachs Date: Tue Dec 25 23:24:19 2007 New Revision: 31437 URL: http://svn.reactos.org/svn/reactos?rev=31437&view=rev Log: - Allow LANGUAGE_PAGE localization - Use DefaultLanguage setting to set the user interface language even for the language selection itself - Add missing language page entries to current localizations, translators get to work! Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/usetup.h 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 Tue Dec 25 23:24:19 2007 @@ -44,6 +44,7 @@ LONG UnattendFormatPartition = 0; LONG AutoPartition = 0; WCHAR UnattendInstallationDirectory[MAX_PATH]; +PWCHAR SelectedLanguageId; BOOLEAN RepairUpdateFlag = FALSE; HANDLE hPnpThread = INVALID_HANDLE_VALUE; @@ -571,11 +572,19 @@ if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { +#if 0 //Dinamically update user interface + SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + MUIDisplayPage(LANGUAGE_PAGE); +#endif ScrollDownGenericList (LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { +#if 0 + SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; + MUIDisplayPage(LANGUAGE_PAGE); +#endif ScrollUpGenericList (LanguageList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -586,7 +595,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - MUISelectLanguage((PWCHAR)LanguageList->CurrentEntry->UserData); + SelectedLanguageId = (PWCHAR)LanguageList->CurrentEntry->UserData; return INTRO_PAGE; } } Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_DE_DE_H__ #define LANG_DE_DE_H__ + +static MUI_ENTRY deDELanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY deDEWelcomePageEntries[] = { @@ -1267,6 +1307,10 @@ MUI_PAGE deDEPages[] = { { + LANGUAGE_PAGE, + deDELanguagePageEntries + }, + { START_PAGE, deDEWelcomePageEntries }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_EL_GR_H__ #define LANG_EL_GR_H__ + +static MUI_ENTRY elGRLanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY elGRWelcomePageEntries[] = { @@ -1268,7 +1308,7 @@ { { LANGUAGE_PAGE, - LanguagePageEntries + elGRLanguagePageEntries }, { START_PAGE, Modified: 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 (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Tue Dec 25 23:24:19 2007 @@ -1,13 +1,12 @@ #ifndef LANG_EN_US_H__ #define LANG_EN_US_H__ -// do not translate these -static MUI_ENTRY LanguagePageEntries[] = -{ - { - 6, - 8, - "Language Selection.", +static MUI_ENTRY enUSLanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection", TEXT_NORMAL }, { @@ -1308,7 +1307,7 @@ { { LANGUAGE_PAGE, - LanguagePageEntries + enUSLanguagePageEntries }, { START_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_ES_ES_H__ #define LANG_ES_ES_H__ + +static MUI_ENTRY esESLanguagePageEntries[] = +{ + { + 6, + 8, + "Selección de idioma", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY esESWelcomePageEntries[] = { @@ -1074,11 +1114,11 @@ { { LANGUAGE_PAGE, - LanguagePageEntries - }, - { - START_PAGE, - esESWelcomePageEntries + esESLanguagePageEntries + }, + { + START_PAGE, + esESWelcomePageEntries }, { INSTALL_INTRO_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_FR_FR_H__ #define LANG_FR_FR_H__ + +static MUI_ENTRY frFRLanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY frFRWelcomePageEntries[] = { @@ -1280,7 +1320,7 @@ { { LANGUAGE_PAGE, - LanguagePageEntries + frFRLanguagePageEntries }, { START_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_IT_IT_H__ #define LANG_IT_IT_H__ + +static MUI_ENTRY itITLanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY itITWelcomePageEntries[] = { @@ -1267,7 +1307,7 @@ { { LANGUAGE_PAGE, - LanguagePageEntries + itITLanguagePageEntries }, { START_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Dec 25 23:24:19 2007 @@ -6,7 +6,25 @@ { 6, 8, - "Select your language:", + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", TEXT_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_SV_SE_H__ #define LANG_SV_SE_H__ + +static MUI_ENTRY svSELanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY svSEWelcomePageEntries[] = { @@ -1075,7 +1115,7 @@ { { LANGUAGE_PAGE, - LanguagePageEntries + svSELanguagePageEntries }, { START_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Tue Dec 25 23:24:19 2007 @@ -1,5 +1,45 @@ #ifndef LANG_UK_UA_H__ #define LANG_UK_UA_H__ + +static MUI_ENTRY ukUALanguagePageEntries[] = +{ + { + 6, + 8, + "Language Selection.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continue F3 = Quit", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; static MUI_ENTRY ukUAWelcomePageEntries[] = { @@ -1074,6 +1114,10 @@ MUI_PAGE ukUAPages[] = { { + LANGUAGE_PAGE, + ukUALanguagePageEntries + }, + { START_PAGE, ukUAWelcomePageEntries }, Modified: 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 (original) +++ trunk/reactos/base/setup/usetup/mui.c Tue Dec 25 23:24:19 2007 @@ -38,9 +38,6 @@ #include "lang/sv-SE.h" #include "lang/uk-UA.h" -/* The current selected language , by default en-us for now */ -static PWCHAR SelectedLanguageId = L"00000409"; - static MUI_LANGUAGE LanguageList[] = { { @@ -111,16 +108,6 @@ PINPUT_RECORD Ir, ULONG WaitEvent); -BOOLEAN -MUISelectLanguage(PWCHAR LanguageID) -{ - if (LanguageID == NULL) - return FALSE; - - SelectedLanguageId = LanguageID; - return TRUE; -} - static MUI_ENTRY * FindMUIEntriesOfPage (ULONG PageNumber) @@ -188,8 +175,8 @@ CONSOLE_SetUnderlinedTextXY(entry[index].X, entry[index].Y, entry[index].Buffer); break; case TEXT_STATUS: - CONSOLE_SetStatusText(entry[index].Buffer); - break; + CONSOLE_SetStatusText(entry[index].Buffer); + break; default: break; } Modified: 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 (original) +++ trunk/reactos/base/setup/usetup/mui.h Tue Dec 25 23:24:19 2007 @@ -34,11 +34,6 @@ #define TEXT_ALIGN_CENTER 8 VOID -MUIDisplayPage(ULONG PageNumber); - -BOOLEAN -//MUISelectLanguage(ULONG LanguageIndex); -MUISelectLanguage(PWCHAR LanguageID); - +MUIDisplayPage (ULONG PageNumber); #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Tue Dec 25 23:24:19 2007 @@ -674,6 +674,8 @@ return NULL; wcscpy(DefaultLanguage, KeyValue); + + SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) 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 Tue Dec 25 23:24:19 2007 @@ -79,6 +79,7 @@ extern UNICODE_STRING SourceRootDir; extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; +extern PWCHAR SelectedLanguageId; typedef enum _PAGE_NUMBER {

1 0

[jimtabor] 31436: Move string object function to eng/string.c.
by jimtabor＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: jimtabor Date: Tue Dec 25 22:52:42 2007 New Revision: 31436 URL: http://svn.reactos.org/svn/reactos?rev=31436&view=rev Log: Move string object function to eng/string.c. Added: trunk/reactos/subsystems/win32/win32k/eng/string.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Added: trunk/reactos/subsystems/win32/win32k/eng/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/string.c (added) +++ trunk/reactos/subsystems/win32/win32k/eng/string.c Tue Dec 25 22:52:42 2007 @@ -1,0 +1,89 @@ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + +BOOL +APIENTRY +STROBJ_bEnum( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos + ) +{ + // www.osr.com/ddk/graphics/gdifncs_65uv.htm + UNIMPLEMENTED; + return FALSE; +} + +DWORD +APIENTRY +STROBJ_dwGetCodePage ( IN STROBJ *pstro ) +{ + // www.osr.com/ddk/graphics/gdifncs_9jmv.htm + PSTRGDI pStrGdi = (PSTRGDI) pstro; + return pStrGdi->dwCodePage; +} + +VOID +APIENTRY +STROBJ_vEnumStart ( IN STROBJ *pstro ) +{ + // www.osr.com/ddk/graphics/gdifncs_32uf.htm + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +STROBJ_bEnumPositionsOnly( + IN STROBJ *StringObj, + OUT ULONG *Count, + OUT PGLYPHPOS *Pos) +{ + UNIMPLEMENTED; + return (BOOL) DDI_ERROR; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +STROBJ_bGetAdvanceWidths( + IN STROBJ *StringObj, + IN ULONG First, + IN ULONG Count, + OUT POINTQF *Widths) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @implemented + */ +FIX APIENTRY +STROBJ_fxBreakExtra( + IN STROBJ *StringObj) +{ + PSTRGDI pStrGdi = (PSTRGDI) StringObj; + if (pStrGdi->StrObj.flAccel & SO_BREAK_EXTRA) return pStrGdi->fxBreakExtra; + return (FIX) 0; +} + +/* + * @implemented + */ +FIX APIENTRY +STROBJ_fxCharacterExtra( + IN STROBJ *StringObj) +{ + PSTRGDI pStrGdi = (PSTRGDI) StringObj; + if (pStrGdi->StrObj.flAccel & SO_CHARACTER_EXTRA) return pStrGdi->fxExtra; + return (FIX) 0; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/eng/string.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Tue Dec 25 22:52:42 2007 @@ -734,36 +734,6 @@ ) { // www.osr.com/ddk/graphics/gdifncs_8qp3.htm - UNIMPLEMENTED; -} - -BOOL -APIENTRY -STROBJ_bEnum( - IN STROBJ *pstro, - OUT ULONG *pc, - OUT PGLYPHPOS *ppgpos - ) -{ - // www.osr.com/ddk/graphics/gdifncs_65uv.htm - UNIMPLEMENTED; - return FALSE; -} - -DWORD -APIENTRY -STROBJ_dwGetCodePage ( IN STROBJ *pstro ) -{ - // www.osr.com/ddk/graphics/gdifncs_9jmv.htm - UNIMPLEMENTED; - return 0; -} - -VOID -APIENTRY -STROBJ_vEnumStart ( IN STROBJ *pstro ) -{ - // www.osr.com/ddk/graphics/gdifncs_32uf.htm UNIMPLEMENTED; } @@ -1087,55 +1057,6 @@ /* * @unimplemented */ -BOOL APIENTRY -STROBJ_bEnumPositionsOnly( - IN STROBJ *StringObj, - OUT ULONG *Count, - OUT PGLYPHPOS *Pos) -{ - UNIMPLEMENTED; - return (BOOL) DDI_ERROR; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -STROBJ_bGetAdvanceWidths( - IN STROBJ *StringObj, - IN ULONG First, - IN ULONG Count, - OUT POINTQF *Widths) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -FIX APIENTRY -STROBJ_fxBreakExtra( - IN STROBJ *StringObj) -{ - UNIMPLEMENTED; - return (FIX) 0; -} - -/* - * @unimplemented - */ -FIX APIENTRY -STROBJ_fxCharacterExtra( - IN STROBJ *StringObj) -{ - UNIMPLEMENTED; - return (FIX) 0; -} - -/* - * @unimplemented - */ HANDLE APIENTRY XLATEOBJ_hGetColorTransform( IN XLATEOBJ *XlateObj) Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Tue Dec 25 22:52:42 2007 @@ -64,6 +64,7 @@ <file>perfcnt.c</file> <file>semaphor.c</file> <file>sort.c</file> + <file>string.c</file> <file>surface.c</file> <file>transblt.c</file> <file>engwindow.c</file>

1 0

[fireball] 31435: - Move preferred stack boundary = 2^2 out of the OPTIMIZE switch, because it's always defined. - Remove assumption that GDB=1 automatically means -O0. This is wrong, optimization and debugger should be controlled independently. - Cleanup blah-blah from config.template.rbuild.
by fireball＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: fireball Date: Tue Dec 25 19:22:20 2007 New Revision: 31435 URL: http://svn.reactos.org/svn/reactos?rev=31435&view=rev Log: - Move preferred stack boundary = 2^2 out of the OPTIMIZE switch, because it's always defined. - Remove assumption that GDB=1 automatically means -O0. This is wrong, optimization and debugger should be controlled independently. - Cleanup blah-blah from config.template.rbuild. Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=31… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Tue Dec 25 19:22:20 2007 @@ -15,31 +15,25 @@ <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> </if> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Tue Dec 25 19:22:20 2007 @@ -31,17 +31,13 @@  <property name="OPTIMIZE" value="1" />

1 0

[ekohl] 31434: Fix function prototypes and two typos.
by ekohl＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: ekohl Date: Tue Dec 25 18:45:53 2007 New Revision: 31434 URL: http://svn.reactos.org/svn/reactos?rev=31434&view=rev Log: Fix function prototypes and two typos. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h trunk/reactos/base/applications/screensavers/3dtext/settings.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.h (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.h Tue Dec 25 18:45:53 2007 @@ -22,5 +22,5 @@ TCHAR m_Text[MAX_PATH]; -void LoadSettings(); -void SaveSettings(); +VOID LoadSettings(VOID); +VOID SaveSettings(VOID); Modified: trunk/reactos/base/applications/screensavers/3dtext/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/settings.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/settings.c Tue Dec 25 18:45:53 2007 @@ -26,10 +26,10 @@ TCHAR m_Text[MAX_PATH]; -void LoadSettings() +VOID LoadSettings(VOID) { HKEY hkey; - DWORD len = MAX_PATH * sizeof(WCHAR); + DWORD len = MAX_PATH * sizeof(TCHAR); RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, _T(""), 0, KEY_READ, NULL, &hkey, NULL); @@ -42,14 +42,14 @@ RegCloseKey(hkey); } -void SaveSettings() +VOID SaveSettings(VOID) { HKEY hkey; RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); - RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (LPBYTE)m_Text, (_tcslen(m_Text) + 1) * sizeof(WCHAR)); + RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (LPBYTE)m_Text, (_tcslen(m_Text) + 1) * sizeof(TCHAR)); RegCloseKey(hkey); }

1 0

[ekohl] 31433: Query and set the display string using data length counted in bytes.
by ekohl＠svn.reactos.org 25 Dec '07

25 Dec '07

Author: ekohl Date: Tue Dec 25 16:59:57 2007 New Revision: 31433 URL: http://svn.reactos.org/svn/reactos?rev=31433&view=rev Log: Query and set the display string using data length counted in bytes. Modified: trunk/reactos/base/applications/screensavers/3dtext/settings.c Modified: trunk/reactos/base/applications/screensavers/3dtext/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/settings.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/settings.c Tue Dec 25 16:59:57 2007 @@ -29,14 +29,14 @@ void LoadSettings() { HKEY hkey; - DWORD len = MAX_PATH; + DWORD len = MAX_PATH * sizeof(WCHAR); RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, _T(""), 0, KEY_READ, NULL, &hkey, NULL); - if(RegQueryValueEx(hkey, _T("DisplayString"), 0, 0, (LPBYTE)m_Text, &len) != ERROR_SUCCESS) + if (RegQueryValueEx(hkey, _T("DisplayString"), NULL, NULL, (LPBYTE)m_Text, &len) != ERROR_SUCCESS) { - _tcscpy(m_Text , _TEXT("ReactOS Rocks!")); + _tcscpy(m_Text, _TEXT("ReactOS Rocks!")); } RegCloseKey(hkey); @@ -49,7 +49,7 @@ RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); - RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (BYTE *)&m_Text, sizeof (m_Text)); + RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (LPBYTE)m_Text, (_tcslen(m_Text) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); }

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