Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

by navaraf＠svn.reactos.org

Author: navaraf Date: Sun Feb 17 22:39:28 2008 New Revision: 32407 URL: http://svn.reactos.org/svn/reactos?rev=32407&view=rev Log: Fix some typos. Modified: trunk/reactos/base/setup/usetup/lang/en-US.h 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 Sun Feb 17 22:39:28 2008 @@ -1395,7 +1395,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", + "Setup failed to initialize the registry.", "ENTER = Reboot computer" }, { @@ -1589,7 +1589,7 @@ {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, {STRING_INSTALLONPART, - "Setup install ReactOS onto Partition"}, + "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, {STRING_QUITCONTINUE,

16 years, 8 months

[dreimer] 32406: Bug 3070: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru Bug 3078: czech translation for solitaire by radekliska@gmail.com Bug 3083: usetup update by Paolo Devoti - devotip@tiscali.it Added the English Strings to all USETUP Resources and activated these. This makes translating easier. Renamed German to Deutsch and Russian to Russkij, which seems like it does not work... (thx to Caemyr anyway)

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Feb 17 21:05:08 2008 New Revision: 32406 URL: http://svn.reactos.org/svn/reactos?rev=32406&view=rev Log: Bug 3070: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Bug 3078: czech translation for solitaire by radekliska(a)gmail.com Bug 3083: usetup update by Paolo Devoti - devotip(a)tiscali.it Added the English Strings to all USETUP Resources and activated these. This makes translating easier. Renamed German to Deutsch and Russian to Russkij, which seems like it does not work... (thx to Caemyr anyway) Added: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h 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/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.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/partlist.c trunk/reactos/base/shell/cmd/lang/uk-UA.rc Added: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc Sun Feb 17 21:05:08 2008 @@ -1,0 +1,87 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/cs-CZ.rc + * PURPOSE: Czech Language File for Solitaire + * TRANSLATOR: Black_Fox <radekliska at gmail dot com> + * DATE OF TR.: 13-07-2007 + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ +#include "resource.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Monosti" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Obrátit", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Jednu kartu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Tøi karty", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "È&asovì neomezená hra", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "Stavový øád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Vybrat rub karet" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Storno", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib verze 1.0." + IDS_SOL_QUIT "Ukonèit rozehranou hru?" + IDS_SOL_WIN "Gratulujeme, zvítìzili jste!!" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Hra" + BEGIN + MENUITEM "&Rozdat\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Rub& karet...", IDM_GAME_DECK + MENUITEM "&Monosti...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Konec", IDM_GAME_EXIT + END + POPUP "Nápo&vìda" + BEGIN + MENUITEM "&Obsah\tF1", IDM_HELP_CONTENTS + MENUITEM "O høe &Solitaire", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Sun Feb 17 21:05:08 2008 @@ -7,6 +7,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" 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 Sun Feb 17 21:05:08 2008 @@ -1628,7 +1628,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO1), + MUIGetString(STRING_HDINFOPARTCREATE), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1640,7 +1640,7 @@ else { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO2), + MUIGetString(STRING_HDDINFOUNK1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1798,7 +1798,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - MUIGetString(STRING_HDDINFO3), + MUIGetString(STRING_HDDINFOUNK2), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1836,7 +1836,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFO4), + MUIGetString(STRING_HDINFOPARTDELETE), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1848,7 +1848,7 @@ else { CONSOLE_PrintTextXY(6, 12, - MUIGetString(STRING_HDDINFO5), + MUIGetString(STRING_HDDINFOUNK3), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1975,7 +1975,7 @@ PartType); #endif - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFO6), + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), DiskEntry->DiskNumber, DiskSize, DiskUnit, @@ -2001,7 +2001,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFO7), + MUIGetString(STRING_HDDINFOUNK4), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -2019,7 +2019,7 @@ PartUnit); } - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDINFO8), + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS), DiskEntry->DiskNumber, DiskSize, DiskUnit, Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Sun Feb 17 21:05:08 2008 @@ -1577,4 +1577,105 @@ } }; +MUI_STRING bgBGStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif 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 Sun Feb 17 21:05:08 2008 @@ -1646,27 +1646,27 @@ " Formatiere Partition als %S Dateisystem "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Vernderungen) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Typ %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Typ %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Typ %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup erstellte eine neue Partition auf"}, 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 Sun Feb 17 21:05:08 2008 @@ -1568,4 +1568,105 @@ } }; +MUI_STRING elGRStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif 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 Sun Feb 17 21:05:08 2008 @@ -1640,27 +1640,27 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, 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 Sun Feb 17 21:05:08 2008 @@ -1567,4 +1567,105 @@ } }; +MUI_STRING esESStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif 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 Sun Feb 17 21:05:08 2008 @@ -1652,27 +1652,27 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, 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 Sun Feb 17 21:05:08 2008 @@ -112,7 +112,7 @@ { 0, 0, - " INVIO = Continuare R = Riparare F3 = Termina", + " INVIO = Continua R = Ripara F3 = Termina", TEXT_STATUS }, { @@ -193,12 +193,6 @@ }, { 8, - 19, - "- La verifica dei volumi non stata ancora implementata.", - TEXT_NORMAL - }, - { - 8, 23, "\x07 Premere INVIO per installare ReactOS.", TEXT_NORMAL @@ -212,7 +206,7 @@ { 0, 0, - " INVIO = Continuare F3 = Termina", + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -336,7 +330,7 @@ { 0, 0, - " INVIO = Ritornare", + " INVIO = Ritorna", TEXT_STATUS }, { @@ -405,31 +399,31 @@ { 6, 20, - "Premere INVIO per modificare la configurazione", + "Premere INVIO per modificare la configurazione alternativa.", TEXT_NORMAL }, { 6, 21, - "alternativa.", + " ", TEXT_NORMAL }, { 6, 23, - "Quando le impostazioni saranno corrette, scegliere \"Accettare la configurazione", + "Quando le impostazioni saranno corrette, selezionare", TEXT_NORMAL }, { 6, 24, - "delle periferiche\" e premere INVIO.", - TEXT_NORMAL - }, - { - 0, - 0, - " INVIO = Continuare F3 = Termina", + "\"Accettare la configurazione delle periferiche\" e premere INVIO.", + TEXT_NORMAL + }, + { + 0, + 0, + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -544,7 +538,7 @@ { 0, 0, - " INVIO = Continuare ESC = Annulla F3 = Termina", + " INVIO = Continua ESC = Annulla F3 = Termina", TEXT_STATUS }, { @@ -681,7 +675,7 @@ { 0, 0, - " INVIO = Continuare ESC = Annullare F3 = Termina", + " INVIO = Continua ESC = Annulla F3 = Termina", TEXT_STATUS }, { @@ -727,7 +721,7 @@ { 0, 0, - " INVIO = Riavviare il computer", + " INVIO = Riavvia il computer", TEXT_STATUS }, { @@ -773,7 +767,7 @@ { 0, 0, - " INVIO = Continuare F3 = Termina", + " INVIO = Continua F3 = Termina", TEXT_STATUS }, { @@ -888,31 +882,31 @@ { 6, 8, - "Setup installer i file di ReactOS nella partizione selezionata. Scegliere una", + "Setup installer i file di ReactOS nella partizione selezionata.", TEXT_NORMAL }, { 6, 9, - "cartella dove volete che ReactOS verr installato:", + "Scegliere una cartella dove volete che ReactOS verr installato:", TEXT_NORMAL }, { 6, 14, - "Per modificare la cartella suggerita premere CANC", + "Per modificare la cartella suggerita premere CANC e poi digitate", TEXT_NORMAL }, { 6, 15, - "e poi digitate la cartella dove volete che ReactOS sia", + "la cartella dove volete che ReactOS sia installato.", TEXT_NORMAL }, { 6, 16, - "installato.", + " ", TEXT_NORMAL }, { @@ -940,13 +934,13 @@ { 11, 12, - "Attendere mentre il setup di ReactOS copia i file nella cartella di", - TEXT_NORMAL - }, - { - 30, + "Attendere mentre il setup di ReactOS copia i file nella", + TEXT_NORMAL + }, + { + 18, 13, - "installazione di ReactOS.", + "cartella di installazione di ReactOS.", TEXT_NORMAL }, { @@ -1473,6 +1467,7 @@ } }; + MUI_PAGE itITPages[] = { { @@ -1573,4 +1568,105 @@ } }; +MUI_STRING itITStrings[] = +{ + {STRING_PLEASEWAIT, + " Attendere..."}, + {STRING_INSTALLCREATEPARTITION, + " INVIO = Installa C = Crea Partizione F3 = Esci"}, + {STRING_INSTALLDELETEPARTITION, + " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, + {STRING_PARTITIONSIZE, + "Dimensione della nuova partizione:"}, + {STRING_CHOOSENEWPARTITION, + "Avete scelto di creare una nuova partizione su"}, + {STRING_HDDSIZE, + "Indicare la dimensione della nuova partizione in megabyte."}, + {STRING_CREATEPARTITION, + " INVIO = Creare la partizione ESC = Annulla F3 = Esci"}, + {STRING_PARTFORMAT, + "Questa partizione verrà formattata successivamente."}, + {STRING_NONFORMATTEDPART, + "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, + {STRING_INSTALLONPART, + "Setup installerà ReactOS sulla partitione"}, + {STRING_CHECKINGPART, + "Setup sta controllando la partizione selezionata."}, + {STRING_QUITCONTINUE, + "F3= Esci INVIO = Continua"}, + {STRING_REBOOTCOMPUTER, + "INVIO = Riavvia il computer"}, + {STRING_TXTSETUPFAILED, + "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, + {STRING_COPYING, + " \xB3 Copia di: %S"}, + {STRING_SETUPCOPYINGFILES, + "Copia dei file in corso..."}, + {STRING_PAGEDMEM, + "Memoria paginata"}, + {STRING_NONPAGEDMEM, + "Memoria non paginata"}, + {STRING_FREEMEM, + "Memoria libera"}, + {STRING_REGHIVEUPDATE, + " Aggiornamento del registry hives..."}, + {STRING_IMPORTFILE, + " Importazione di %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Aggiornamento delle impostazioni del display nel registry..."}, + {STRING_LOCALESETTINGSUPDATE, + " Aggiornamento delle impostazioni di regionalizzazione..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Aggiornamento delle impostazioni della tastiera..."}, + {STRING_CODEPAGEINFOUPDATE, + " Aggiunta delle informazioni di codepage al registry..."}, + {STRING_DONE, + " Fatto..."}, + {STRING_REBOOTCOMPUTER2, + " INVIO = Riavvia il computer"}, + {STRING_CONSOLEFAIL1, + "Impossibile aprire la console\n\n"}, + {STRING_CONSOLEFAIL2, + "La causa piu' frequente di questo e' l'uso di una tastiera USB\n"}, + {STRING_CONSOLEFAIL3, + "le tastiere USB non sono ancora supportate per intero\n"}, + {STRING_FORMATTINGDISK, + "Setup sta formattando il disco"}, + {STRING_CHECKINGDISK, + "Setup sta controllando il disco"}, + {STRING_FORMATDISK1, + " Formatta la partizione con file system %S (formattazione rapida) "}, + {STRING_FORMATDISK2, + " Formatta la partizione con file system %S "}, + {STRING_KEEPFORMAT, + " Mantieni il file system attuale (nessuna modifica) "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ."}, + {STRING_HDDINFOUNK3, + "su %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 Tipo %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Tipo %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup ha creato una nuova partizione su"}, + {STRING_UNPSPACE, + " Spazio non partizionato %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Sun Feb 17 21:05:08 2008 @@ -1577,4 +1577,105 @@ } }; +MUI_STRING ltLTStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Sun Feb 17 21:05:08 2008 @@ -1648,27 +1648,27 @@ " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, "Setup created a new partition on"}, 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 Sun Feb 17 21:05:08 2008 @@ -1640,30 +1640,28 @@ " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S "}, {STRING_KEEPFORMAT, " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0} Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sun Feb 17 21:05:08 2008 @@ -1645,30 +1645,28 @@ " Naform tova oblas ako systm s£borov %S "}, {STRING_KEEPFORMAT, " Ponecha s£asnì systm s£borov (bez zmeny) "}, - {STRING_HDDINFO1, + {STRING_HDINFOPARTCREATE, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO2, + {STRING_HDDINFOUNK1, "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO3, + {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, - {STRING_HDDINFO4, + {STRING_HDINFOPARTDELETE, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, - {STRING_HDDINFO5, + {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, - {STRING_HDDINFO6, + {STRING_HDINFOPARTZEROED, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO7, + {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, - {STRING_HDDINFO8, + {STRING_HDINFOPARTEXISTS, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, - {STRING_HDDINFO9, + {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, - {STRING_HDDINFO10, + {STRING_HDINFOPARTSELECT, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, - {STRING_HDDINFO11, + {STRING_HDDINFOUNK6, "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, - {STRING_NEWPARTITION, - "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {0, 0} 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 Sun Feb 17 21:05:08 2008 @@ -1567,4 +1567,105 @@ } }; +MUI_STRING svSEStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif 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 Sun Feb 17 21:05:08 2008 @@ -82,7 +82,7 @@ { 8, 17, - "\x07 â¨áiâì <R> é®¡ ¢_¤®¢¨â¨ ReactOS.", + "\x07 â¨áiâì <R> é®¡ ¢i¤®¢¨â¨ ReactOS.", TEXT_NORMAL }, { @@ -1241,7 +1241,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1275,7 +1275,7 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1334,14 +1334,14 @@ }, { //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 partiton table.\n" - "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + "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." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" }, { //ERROR_NEW_PARTITION, @@ -1475,8 +1475,8 @@ ukUALanguagePageEntries }, { - START_PAGE, - ukUAWelcomePageEntries + START_PAGE, + ukUAWelcomePageEntries }, { INSTALL_INTRO_PAGE, @@ -1568,4 +1568,105 @@ } }; +MUI_STRING ukUAStrings[] = +{ + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new 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 install 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, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {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\n\n"}, + {STRING_CONSOLEFAIL2, + "The most common cause of this is using an USB keyboard\n"}, + {STRING_CONSOLEFAIL3, + "USB keyboards are not fully supported yet\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 Type %-3u %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, + " Unpartitioned space %6lu %s"}, + {0, 0} +}; + #endif 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 Sun Feb 17 21:05:08 2008 @@ -50,32 +50,32 @@ /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000401", L"00000401", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000405", L"00000405", L"1250", L"852", L"10029", L"Czech", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, {NULL, NULL, NULL, NULL, NULL} }; 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 Sun Feb 17 21:05:08 2008 @@ -104,17 +104,17 @@ #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 -#define STRING_HDDINFO1 36 -#define STRING_HDDINFO2 37 -#define STRING_HDDINFO3 38 -#define STRING_HDDINFO4 39 -#define STRING_HDDINFO5 40 -#define STRING_HDDINFO6 41 -#define STRING_HDDINFO7 42 -#define STRING_HDDINFO8 43 -#define STRING_HDDINFO9 44 -#define STRING_HDDINFO10 45 -#define STRING_HDDINFO11 46 +#define STRING_HDINFOPARTCREATE 36 +#define STRING_HDDINFOUNK1 37 +#define STRING_HDDINFOUNK2 38 +#define STRING_HDINFOPARTDELETE 39 +#define STRING_HDDINFOUNK3 40 +#define STRING_HDINFOPARTZEROED 41 +#define STRING_HDDINFOUNK4 42 +#define STRING_HDINFOPARTEXISTS 43 +#define STRING_HDDINFOUNK5 44 +#define STRING_HDINFOPARTSELECT 45 +#define STRING_HDDINFOUNK6 46 #define STRING_NEWPARTITION 47 #define STRING_UNPSPACE 48 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sun Feb 17 21:05:08 2008 @@ -1194,7 +1194,7 @@ if (PartType == NULL) { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO9), + MUIGetString(STRING_HDDINFOUNK5), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1288,7 +1288,7 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO10), + MUIGetString(STRING_HDINFOPARTSELECT), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1300,7 +1300,7 @@ else { sprintf (LineBuffer, - MUIGetString(STRING_HDDINFO11), + MUIGetString(STRING_HDDINFOUNK6), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Sun Feb 17 21:05:08 2008 @@ -27,23 +27,23 @@ /D Îáðîáêà òàêîæ ³ ïàïîê\n\n\ Ââåä³òü ATTRIB áåç ïàðàìåòðà, ùîá âèâåñòè àòðèáóòè âñ³õ ôàéë³â.\n" -STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ -ALIAS [alias=[command]]\n\n\ - alias Name for an alias.\n\ - command Text to be substituted for an alias.\n\n\ -To list all aliases:\n\ +STRING_ALIAS_HELP, "Âñòàíîâëåííÿ, âèäàëåííÿ àáî ïîêàç ïñåâäîí³ì³â.\n\n\ +ALIAS [ïñåâäîí³ì=[êîìàíäà]]\n\n\ + ïñåâäîí³ì ²ì'ÿ ïñåâäîí³ìà.\n\ + êîìàíäà Òåêñò, ùî ï³äñòàâëÿºòüñÿ çàì³ñòü ïñåâäîí³ìà.\n\n\ +Âèâåäåííÿ ñïèñêó âñ³õ ïñåâäîí³ì³â:\n\ ALIAS\n\n\ -To set a new or replace an existing alias:\n\ +Âñòàíîâëåííÿ àáî çì³íà ³ñíóþ÷îãî ïñåâäîí³ìà:\n\ ALIAS da=dir a:\n\n\ -To remove an alias from the alias list:\n\ +Âèäàëåííÿ ïñåâäîí³ìà ç³ ñïèñêó:\n\ ALIAS da=" -STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP\n" - -STRING_CALL_HELP, "Calls one batch program from another.\n\n\ -CALL [drive:][path]filename [batch-parameter]\n\n\ - batch-parameter Specifies any command-line information required by the\n\ - batch program." +STRING_BEEP_HELP, "Çâóêîâèé ñèãíàë ñï³êåðà.\n\nBEEP\n" + +STRING_CALL_HELP, "Âèêëèê îäí³º¿ ïàêåòíî¿ ïðîãðàìè ç ³íøî¿.\n\n\ +CALL [äèñê:][øëÿõ]³ì'ÿ_ôàéëà [ïàðàìåòðè]\n\n\ + ïàðàìåòðè Íàá³ð ïàðàìåòð³â êîìàíäíîãî ðÿäêà, íåîáõ³äíèõ äëÿ ïàêåòíîãî\n\ + ôàéëó." STRING_CD_HELP, "Changes the current directory or displays it's name\n\n\ CHDIR [/D][drive:][path]\n\

16 years, 8 months

[fireball] 32405: - Fix a bug, when the page first was marked as free and put into free pages list to zero out, and then was marked as used for PFN database, but *not* removed from that list! Certainly it was zeroed out later, introducing a corruption within the free list and a pagefault. - This revision completely removes hacks introduced in 32386. See issue #3076 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 17 19:24:24 2008 New Revision: 32405 URL: http://svn.reactos.org/svn/reactos?rev=32405&view=rev Log: - Fix a bug, when the page first was marked as free and put into free pages list to zero out, and then was marked as used for PFN database, but *not* removed from that list! Certainly it was zeroed out later, introducing a corruption within the free list and a pagefault. - This revision completely removes hacks introduced in 32386. See issue #3076 for more details. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Feb 17 19:24:24 2008 @@ -20,8 +20,6 @@ #define KERNEL_RVA(x) RVA(x,KSEG0_BASE) #define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT) #endif - -ULONG MmFreeLdrPageDirectoryEnd; typedef struct _BIOS_MEMORY_DESCRIPTOR { @@ -922,8 +920,6 @@ /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; - MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; - if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = KeLoaderBlock = LoaderBlock = &BldrLoaderBlock; Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Feb 17 19:24:24 2008 @@ -251,7 +251,6 @@ return Pfn; } -#if 0 VOID NTAPI MmInitializePageList(VOID) @@ -375,7 +374,15 @@ i <= MmPageArraySize; i++) { - /* Mark them as used kernel memory */ + /* If this page was marked as free it should be removed from + the unzeroed free pages list */ + if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + RemoveEntryList(&MmPageArray[i].ListEntry); + UnzeroedPageCount--; + } + + /* Mark it as used kernel memory */ MmPageArray[i] = UsedPage; MmStats.NrSystemPages++; } @@ -386,198 +393,6 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } -#else -VOID -NTAPI -MmInitializePageList() -{ - ULONG i; - ULONG Reserved; - NTSTATUS Status; - PFN_TYPE Pfn = 0; - PHYSICAL_PAGE UsedPage; - ULONG PdeStart = PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart; - ULONG PdePageStart, PdePageEnd; - ULONG VideoPageStart, VideoPageEnd; - ULONG KernelPageStart, KernelPageEnd; - ULONG_PTR KernelStart, KernelEnd; - extern ULONG MiKSeg0Start, MiKSeg0End, MmFreeLdrPageDirectoryEnd; - - /* Initialize the page lists */ - KeInitializeSpinLock(&PageListLock); - InitializeListHead(&UserPageListHead); - InitializeListHead(&FreeUnzeroedPageListHead); - InitializeListHead(&FreeZeroedPageListHead); - - DPRINT1("HACK: Using old incorrect MmInitializePageList(). " - "Please bugfix the new version and delete this one\n"); - - /* Set the size and start of the PFN Database */ - MmPageArray = (PHYSICAL_PAGE *)MmPfnDatabase; - MmPageArraySize = MmHighestPhysicalPage; - Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; - - /* Loop every page required to hold the PFN database */ - for (i = 0; i < Reserved; i++) - { - PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); - - /* Check if FreeLDR has already allocated it for us */ - if (!MmIsPagePresent(NULL, Address)) - { - /* Use one of our highest usable pages */ - Pfn = MmAllocEarlyPage(); - - /* Set the PFN */ - Status = MmCreateVirtualMappingForKernel(Address, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } - } - else - { - /* Setting the page protection is necessary to set the global bit */ - MmSetPageProtect(NULL, Address, PAGE_READWRITE); - } - } - - /* Clear the PFN database */ - RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); - - /* This is what a used page looks like */ - RtlZeroMemory(&UsedPage, sizeof(UsedPage)); - UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; - UsedPage.Flags.Consumer = MC_NPPOOL; - UsedPage.ReferenceCount = 2; - UsedPage.MapCount = 1; - - /* We'll be applying a bunch of hacks -- precompute some static values */ - KernelStart = MiKSeg0Start - KSEG0_BASE; - KernelEnd = MiKSeg0End - KSEG0_BASE; - PdePageStart = PdeStart / PAGE_SIZE; - PdePageEnd = MmFreeLdrPageDirectoryEnd / PAGE_SIZE; - VideoPageStart = 0xA0000 / PAGE_SIZE; - VideoPageEnd = 0x100000 / PAGE_SIZE; - KernelPageStart = KernelStart / PAGE_SIZE; - KernelPageEnd = KernelEnd / PAGE_SIZE; - - // Glorious Hack: - // The kernel seems to crash if the region of memory that FreeLDR maps - // (those evil 6MB) is not *entirely* marked "in use", even though only - // 3 or 4MB of it may actually be in use. - // This wasn't noticed before, because the PFN database pages which are - // *VIRTUALLY* continous after the kernel end were also marked as - // *PHYSICALLY* continous (even though they were allocated at the very far - // end of physical memory). - // - // So we'll simply gobble up whatever is left of what FreeLDR mapped. - // - // PS. This is really sinister - // - KernelEnd += (KernelStart + 0x600000) - KernelEnd; - KernelPageEnd = KernelEnd / PAGE_SIZE; - - /* Loop every page on the system */ - for (i = 0; i <= MmPageArraySize; i++) - { - /* Check if it's part of RAM */ - if (/*MiIsPfnRam(BIOSMemoryMap, AddressRangeCount, i)*/TRUE) - { - /* Apply assumptions that all computers are built the same way */ - if (i == 0) - { - /* Page 0 is reserved for the IVT */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i == 1) - { - /* Page 1 is reserved for the PCR */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i == 2) - { - /* Page 2 is reserved for the KUSER_SHARED_DATA */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= PdePageStart) && (i < PdePageEnd)) - { - /* These pages contain the initial FreeLDR PDEs */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if ((i >= VideoPageStart) && (i < VideoPageEnd)) - { - /* - * These pages are usually for the Video ROM BIOS. - * Supposedly anyway. We'll simply ignore the fact that - * many systems have this area somewhere else entirely - * (which we'll assume to be "free" a couple of lines below) - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } - else if ((i >= KernelPageStart) && (i < KernelPageEnd)) - { - /* These are pages beloning to the kernel */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else if (i >= (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount)) - { - /* These are pages we allocated above to hold the PFN DB */ - MmPageArray[i] = UsedPage; - MmStats.NrSystemPages++; - } - else - { - /* - * These are supposedly free pages. - * By the way, not all of them are, some contain vital - * FreeLDR data, but since we choose to ignore the Memory - * Descriptor List, why bother, right? - */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_FREE; - MmPageArray[i].ReferenceCount = 0; - InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[i].ListEntry); - UnzeroedPageCount++; - MmStats.NrFreePages++; - } - } - else - { - /* These are pages reserved by the BIOS/ROMs */ - MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } - } - - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - DPRINT("Pages: %x %x\n", MmStats.NrFreePages, MmStats.NrSystemPages); - /* - DPRINT1("Unzeroed pages: %x\n", UnzeroedPageCount); - { - ULONG j = 0; - for (j=0; j<=MmPageArraySize; j++) - { - if (j % 0x10 == 0) DbgPrint ("\n0x%x\t", j); - DbgPrint("0x%x\t", MmPageArray[j].AllFlags); - } - }*/ - MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; - MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); -} -#endif VOID NTAPI

16 years, 8 months

[gbrunmar] 32404: Fixed duplicate typedef in DirectX headers for real this time :)

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Feb 17 17:51:26 2008 New Revision: 32404 URL: http://svn.reactos.org/svn/reactos?rev=32404&view=rev Log: Fixed duplicate typedef in DirectX headers for real this time :) Modified: trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/dmemmgr.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 17:51:26 2008 @@ -68,7 +68,10 @@ /* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */ /************************************************************************/ struct _DD_GETHEAPALIGNMENTDATA; +#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; +#define DD_GETHEAPALIGNMENTDATA_DECLARED +#endif /************************************************************************/ /* Video memory info structures */ Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:51:26 2008 @@ -126,6 +126,20 @@ DWORD dwAgpCommitMaskSize; } VMEMHEAP, *LPVMEMHEAP; +typedef struct _DD_GETHEAPALIGNMENTDATA +{ + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + VOID* GetHeapAlignment; + HEAPALIGNMENT Alignment; +} DD_GETHEAPALIGNMENTDATA; + +#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED +typedef DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; +#define DD_GETHEAPALIGNMENTDATA_DECLARED +#endif + extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);

16 years, 8 months

[gbrunmar] 32403: Fixed duplicate typedefs in DirectX headers

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Feb 17 17:40:23 2008 New Revision: 32403 URL: http://svn.reactos.org/svn/reactos?rev=32403&view=rev Log: Fixed duplicate typedefs in DirectX headers Modified: trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/dmemmgr.h Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 17:40:23 2008 @@ -57,7 +57,10 @@ #define MAKE_HRESULT(sev,fac,code) ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) #endif +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Sun Feb 17 17:40:23 2008 @@ -17,10 +17,21 @@ #endif #ifndef __NTDDKCOMP__ + +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif + typedef struct _VIDMEM *LPVIDMEM; + #else + +#ifndef FLATPTR_DEFINED typedef ULONG_PTR FLATPTR; +#define FLATPTR_DEFINED +#endif + typedef struct _VIDEOMEMORY *LPVIDMEM; #endif @@ -115,15 +126,6 @@ DWORD dwAgpCommitMaskSize; } VMEMHEAP, *LPVMEMHEAP; -typedef struct _DD_GETHEAPALIGNMENTDATA -{ - ULONG_PTR dwInstance; - DWORD dwHeap; - HRESULT ddRVal; - VOID* GetHeapAlignment; - HEAPALIGNMENT Alignment; -} DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; - extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);

16 years, 8 months

[gbrunmar] 32402: Oops, removed OsThunkD3dDrawPrimitives2 from d3d8thk.h.

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Feb 17 16:42:02 2008 New Revision: 32402 URL: http://svn.reactos.org/svn/reactos?rev=32402&view=rev Log: Oops, removed OsThunkD3dDrawPrimitives2 from d3d8thk.h. Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/include/reactos/dll/directx/d3d8thk.h (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h Sun Feb 17 16:42:02 2008 @@ -23,6 +23,16 @@ DWORD STDCALL OsThunkD3dContextDestroyAll( LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL OsThunkD3dDrawPrimitives2( + HANDLE hCmdBuf, + HANDLE hVBuf, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + FLATPTR *pfpVidMemCmd, + DWORD *pdwSizeCmd, + FLATPTR *pfpVidMemVtx, + DWORD *pdwSizeVtx ); DWORD STDCALL OsThunkD3dValidateTextureStageState(

16 years, 8 months

[gbrunmar] 32401: * Updated d3d headers to make it possible to include both d3d and d3d9 at the same time. * Updated d3dhal.h to support DirectX 9 * Fixed broken d3dnthal.h * Fixed missing structures in d3d8thk.h

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Feb 17 16:34:59 2008 New Revision: 32401 URL: http://svn.reactos.org/svn/reactos?rev=32401&view=rev Log: * Updated d3d headers to make it possible to include both d3d and d3d9 at the same time. * Updated d3dhal.h to support DirectX 9 * Fixed broken d3dnthal.h * Fixed missing structures in d3d8thk.h Modified: trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/psdk/d3d.h trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/psdk/d3dtypes.h trunk/reactos/include/reactos/dll/directx/d3d8thk.h Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/d3dhal.h (original) +++ trunk/reactos/include/ddk/d3dhal.h Sun Feb 17 16:34:59 2008 @@ -26,7 +26,25 @@ extern "C" { #endif +#include <ddraw.h> +#include <d3dtypes.h> +#include <d3dcaps.h> #include <d3d.h> + +#if (DIRECT3D_VERSION >= 0x0900) +#include <d3d9.h> +#endif + +#ifndef DDRAWI_DIRECTDRAW_DEFINED +typedef struct _DDRAWI_DIRECTDRAW_GBL FAR *LPDDRAWI_DIRECTDRAW_GBL; +typedef struct _DDRAWI_DIRECTDRAW_LCL FAR *LPDDRAWI_DIRECTDRAW_LCL; +#define DDRAWI_DIRECTDRAW_DEFINED +#endif + +#ifndef DDRAWI_DDRAWSURFACE_DEFINED +typedef struct _DDRAWI_DDRAWSURFACE_LCL FAR *LPDDRAWI_DDRAWSURFACE_LCL; +#define DDRAWI_DDRAWSURFACE_DEFINED +#endif #define D3DERR_COMMAND_UNPARSED 0x88760BB8; @@ -579,6 +597,155 @@ DWORD dwLOD; } D3DHAL_DP2SETTEXLOD,*LPD3DHAL_DP2SETTEXLOD; + +#if (DIRECT3D_VERSION >= 0x0900) + +#define DX9_DDI_VERSION 4 + +#ifndef D3DVTXPCAPS_NO_VSDT_UBYTE4 +#define D3DVTXPCAPS_NO_VSDT_UBYTE4 0x00000080 +#endif + +#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004 + +#define D3DDEVCAPS_HWVERTEXBUFFER 0x02000000 +#define D3DDEVCAPS_HWINDEXBUFFER 0x04000000 +#define D3DDEVCAPS_SUBVOLUMELOCK 0x08000000 + +#ifndef D3DPMISCCAPS_FOGINFVF +#define D3DPMISCCAPS_FOGINFVF 0x00002000 +#endif + +#ifndef D3DFVF_FOG +#define D3DFVF_FOG 0x00002000 +#endif + +typedef struct _DD_GETDRIVERINFO2DATA +{ + DWORD dwReserved; + DWORD dwMagic; + DWORD dwType; + DWORD dwExpectedSize; +} DD_GETDRIVERINFO2DATA; + +/** + * A driver must check DD_GETDRIVERINFO2DATA.dwHeight for + * D3DGDI2_MAGIC to see if the passed GUID is GUID_GetDriverInfo2 + * or a GUID_DDStereoMode. + */ +#define GUID_GetDriverInfo2 GUID_DDStereoMode + +/** + * Magic number used in DD_GETDRIVERINFO2DATA.dwHeight when + * GUID_GetDriverInfo2/GUID_DDStereoMode is specified in a + * GetDriverInfo call. + */ +#define D3DGDI2_MAGIC 0xFFFFFFFF + +#define D3DGDI2_TYPE_GETD3DCAPS8 0x00000001 +#define D3DGDI2_TYPE_GETFORMATCOUNT 0x00000002 +#define D3DGDI2_TYPE_GETFORMAT 0x00000003 +#define D3DGDI2_TYPE_DXVERSION 0x00000004 /* Make driver aware of currently used DirectX version */ +#define D3DGDI2_TYPE_GETD3DCAPS9 0x00000010 +#define D3DGDI2_TYPE_GETEXTENDEDMODECOUNT 0x00000011 +#define D3DGDI2_TYPE_GETEXTENDEDMODE 0x00000012 +#define D3DGDI2_TYPE_GETADAPTERGROUP 0x00000013 +#define D3DGDI2_TYPE_GETMULTISAMPLEQUALITYLEVELS 0x00000016 +#define D3DGDI2_TYPE_DEFERRED_AGP_AWARE 0x00000018 +#define D3DGDI2_TYPE_FREE_DEFERRED_AGP 0x00000019 +#define D3DGDI2_TYPE_DEFER_AGP_FREES 0x00000020 +#define D3DGDI2_TYPE_GETD3DQUERYCOUNT 0x00000021 +#define D3DGDI2_TYPE_GETD3DQUERY 0x00000022 +#define D3DGDI2_TYPE_GETDDIVERSION 0x00000023 /* Returns DX9_DDI_VERSION, used to check which DDK version the driver is compiled against */ + +typedef struct _DD_GETFORMATCOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwFormatCount; + DWORD dwReserved; +} DD_GETFORMATCOUNTDATA; + +typedef struct _DD_GETFORMATDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwFormatIndex; + DDPIXELFORMAT format; +} DD_GETFORMATDATA; + +typedef struct _DD_DXVERSION +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwDXVersion; + DWORD dwReserved; +} DD_DXVERSION; + +typedef struct _DD_DEFERRED_AGP_AWARE_DATA +{ + DD_GETDRIVERINFO2DATA gdi2; +} DD_DEFERRED_AGP_AWARE_DATA; + +typedef struct _DD_FREE_DEFERRED_AGP_DATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwProcessId; +} DD_FREE_DEFERRED_AGP_DATA; + +typedef struct _DD_GETEXTENDEDMODECOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwModeCount; + DWORD dwReserved; +} DD_GETEXTENDEDMODECOUNTDATA; + +typedef struct _DD_GETEXTENDEDMODEDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwModeIndex; + D3DDISPLAYMODE mode; +} DD_GETEXTENDEDMODEDATA; + +typedef struct _DD_GETADAPTERGROUPDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + ULONG_PTR ulUniqueAdapterGroupId; + DWORD dwReserved1; + DWORD dwReserved2; +} DD_GETADAPTERGROUPDATA; + +typedef struct _DD_MULTISAMPLEQUALITYLEVELSDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + D3DFORMAT Format; + BOOL bFlip : 1; + D3DMULTISAMPLE_TYPE MSType : 31; + DWORD QualityLevels; +} DD_MULTISAMPLEQUALITYLEVELSDATA; + +typedef struct _DD_GETD3DQUERYCOUNTDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwNumQueries; +} DD_GETD3DQUERYCOUNTDATA; + +typedef struct _DD_GETD3DQUERYDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + union + { + DWORD dwQueryIndex; + D3DQUERYTYPE QueryType; + }; +} DD_GETD3DQUERYDATA; + +typedef struct _DD_GETDDIVERSIONDATA +{ + DD_GETDRIVERINFO2DATA gdi2; + DWORD dwDXVersion; + DWORD dwDDIVersion; +} DD_GETDDIVERSIONDATA; + +#endif /* (DIRECT3D_VERSION >= 0x0900) */ + #ifdef __cplusplus } /* extern "C" */ #endif Modified: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… ============================================================================== --- trunk/reactos/include/ddk/d3dnthal.h (original) +++ trunk/reactos/include/ddk/d3dnthal.h Sun Feb 17 16:34:59 2008 @@ -167,7 +167,18 @@ ULONG_PTR dwReserved9; } D3DNTHAL_CALLBACKS, *LPD3DNTHAL_CALLBACKS; + +typedef struct _D3DNTHAL_SETRENDERTARGETDATA +{ + ULONG_PTR dwhContext; + PDD_SURFACE_LOCAL lpDDS; + PDD_SURFACE_LOCAL lpDDSZ; + HRESULT ddrval; +} D3DNTHAL_SETRENDERTARGETDATA; +typedef D3DNTHAL_SETRENDERTARGETDATA *LPD3DNTHAL_SETRENDERTARGETDATA; + typedef DWORD (APIENTRY *LPD3DNTHAL_SETRENDERTARGETCB)(LPD3DNTHAL_SETRENDERTARGETDATA); + typedef struct _D3DNTHAL_CALLBACKS2 { @@ -181,6 +192,55 @@ LPVOID dwReserved4; } D3DNTHAL_CALLBACKS2, *LPD3DNTHAL_CALLBACKS2; + +typedef struct _D3DNTHAL_CLEAR2DATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + DWORD dwFillColor; + D3DVALUE dvFillDepth; + DWORD dwFillStencil; + LPD3DRECT lpRects; + DWORD dwNumRects; + HRESULT ddrval; +} D3DNTHAL_CLEAR2DATA; +typedef D3DNTHAL_CLEAR2DATA FAR *LPD3DNTHAL_CLEAR2DATA; + +typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + ULONG_PTR dwReserved; + DWORD dwNumPasses; + HRESULT ddrval; +} D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA, FAR *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; + +typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + DWORD dwVertexType; + PDD_SURFACE_LOCAL lpDDCommands; + DWORD dwCommandOffset; + DWORD dwCommandLength; + union + { + PDD_SURFACE_LOCAL lpDDVertex; + LPVOID lpVertices; + }; + DWORD dwVertexOffset; + DWORD dwVertexLength; + DWORD dwReqVertexBufSize; + DWORD dwReqCommandBufSize; + LPDWORD lpdwRStates; + union + { + DWORD dwVertexSize; + HRESULT ddrval; + }; + DWORD dwErrorOffset; +} D3DNTHAL_DRAWPRIMITIVES2DATA, FAR *LPD3DNTHAL_DRAWPRIMITIVES2DATA; + typedef DWORD (APIENTRY *LPD3DNTHAL_CLEAR2CB)(LPD3DNTHAL_CLEAR2DATA); typedef DWORD (APIENTRY *LPD3DNTHAL_VALIDATETEXTURESTAGESTATECB)(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA); typedef DWORD (APIENTRY *LPD3DNTHAL_DRAWPRIMITIVES2CB)(LPD3DNTHAL_DRAWPRIMITIVES2DATA); @@ -196,42 +256,6 @@ LPD3DNTHAL_DRAWPRIMITIVES2CB DrawPrimitives2; } D3DNTHAL_CALLBACKS3, *LPD3DNTHAL_CALLBACKS3; - -typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA -{ - ULONG_PTR dwhContext; - DWORD dwFlags; - ULONG_PTR dwReserved; - DWORD dwNumPasses; - HRESULT ddrval; -} D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA, FAR *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; - -typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA -{ - ULONG_PTR dwhContext; - DWORD dwFlags; - DWORD dwVertexType; - PDD_SURFACE_LOCAL lpDDCommands; - DWORD dwCommandOffset; - DWORD dwCommandLength; - union - { - PDD_SURFACE_LOCAL lpDDVertex; - LPVOID lpVertices; - }; - DWORD dwVertexOffset; - DWORD dwVertexLength; - DWORD dwReqVertexBufSize; - DWORD dwReqCommandBufSize; - LPDWORD lpdwRStates; - union - { - DWORD dwVertexSize; - HRESULT ddrval; - }; - DWORD dwErrorOffset; -} D3DNTHAL_DRAWPRIMITIVES2DATA, FAR *LPD3DNTHAL_DRAWPRIMITIVES2DATA; - #ifdef __cplusplus } /* extern "C" */ #endif Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/ddrawi.h (original) +++ trunk/reactos/include/ddk/ddrawi.h Sun Feb 17 16:34:59 2008 @@ -129,10 +129,20 @@ /* predeclare some structures */ typedef struct _DDHALINFO *LPDDHALINFO; typedef struct _DDRAWI_DIRECTDRAW_INT *LPDDRAWI_DIRECTDRAW_INT; + +#ifndef DDRAWI_DIRECTDRAW_DEFINED typedef struct _DDRAWI_DIRECTDRAW_LCL *LPDDRAWI_DIRECTDRAW_LCL; typedef struct _DDRAWI_DIRECTDRAW_GBL *LPDDRAWI_DIRECTDRAW_GBL; +#define DDRAWI_DIRECTDRAW_DEFINED +#endif + typedef struct _DDRAWI_DDRAWSURFACE_INT *LPDDRAWI_DDRAWSURFACE_INT; + +#ifndef DDRAWI_DDRAWSURFACE_DEFINED typedef struct _DDRAWI_DDRAWSURFACE_LCL *LPDDRAWI_DDRAWSURFACE_LCL; +#define DDRAWI_DDRAWSURFACE_DEFINED +#endif + typedef struct _DDRAWI_DDRAWSURFACE_GBL *LPDDRAWI_DDRAWSURFACE_GBL; typedef struct _DDRAWI_DDRAWSURFACE_MORE *LPDDRAWI_DDRAWSURFACE_MORE; typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE *LPDDRAWI_DDRAWSURFACE_GBL_MORE; Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ddrawint.h (original) +++ trunk/reactos/include/ddk/ddrawint.h Sun Feb 17 16:34:59 2008 @@ -1451,15 +1451,6 @@ #define DDRAWI_VPORTGETCOLOR 0x0001 #define DDRAWI_VPORTSETCOLOR 0x0002 -#ifndef __DDRAWI_INCLUDED__ -#define VIDMEM_ISLINEAR 0x00000001 -#define VIDMEM_ISRECTANGULAR 0x00000002 -#define VIDMEM_ISHEAP 0x00000004 -#define VIDMEM_ISNONLOCAL 0x00000008 -#define VIDMEM_ISWC 0x00000010 -#define VIDMEM_ISDISABLED 0x00000020 -#endif - #ifdef __cplusplus } /* extern "C" */ Modified: trunk/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d.h?rev=324… ============================================================================== --- trunk/reactos/include/psdk/d3d.h (original) +++ trunk/reactos/include/psdk/d3d.h Sun Feb 17 16:34:59 2008 @@ -18,6 +18,12 @@ #ifndef __WINE_D3D_H #define __WINE_D3D_H + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0700 +#endif + +#if (DIRECT3D_VERSION < 0x0800) #include <stdlib.h> @@ -1528,4 +1534,5 @@ #define IDirect3DVertexBuffer7_ProcessVerticesStrided(p,a,b,c,d,e,f,g) (p)->ProcessVerticesStrided(a,b,c,d,e,f,g) #endif +#endif /* (DIRECT3D_VERSION < 0x0800) */ #endif /* __WINE_D3D_H */ Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Feb 17 16:34:59 2008 @@ -875,7 +875,7 @@ D3DMULTISAMPLE_15_SAMPLES = 15, D3DMULTISAMPLE_16_SAMPLES = 16, - D3DMULTISAMPLE_FORCE_DWORD = 0xffffffff + D3DMULTISAMPLE_FORCE_DWORD = 0x7fffffff } D3DMULTISAMPLE_TYPE; #if 0 Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h (original) +++ trunk/reactos/include/psdk/d3dtypes.h Sun Feb 17 16:34:59 2008 @@ -147,6 +147,7 @@ typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE; typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE; +#ifndef D3DCOLORVALUE_DEFINED typedef struct _D3DCOLORVALUE { union { D3DVALUE r; @@ -165,7 +166,9 @@ D3DVALUE dvA; } DUMMYUNIONNAME4; } D3DCOLORVALUE,*LPD3DCOLORVALUE; - +#endif + +#ifndef D3DRECT_DEFINED typedef struct _D3DRECT { union { LONG x1; @@ -183,7 +186,9 @@ LONG y2; LONG lY2; } DUMMYUNIONNAME4; -} D3DRECT, *LPD3DRECT; +} D3DRECT; +#endif +typedef struct _D3DRECT *LPD3DRECT; typedef struct _D3DHVERTEX { DWORD dwFlags; @@ -324,6 +329,7 @@ #endif } D3DVERTEX, *LPD3DVERTEX; +#ifndef D3DMATRIX_DEFINED typedef struct _D3DMATRIX { D3DVALUE _11, _12, _13, _14; D3DVALUE _21, _22, _23, _24; @@ -339,6 +345,7 @@ { return ((const D3DVALUE [4][4])&_11)[r][c]; } #endif } D3DMATRIX, *LPD3DMATRIX; +#endif #if defined(__cplusplus) && defined(D3D_OVERLOADS) #include <d3dvec.inl> @@ -534,6 +541,8 @@ } DUMMYUNIONNAME4; } D3DMATERIAL7, *LPD3DMATERIAL7; +#if (DIRECT3D_VERSION < 0x0800) + typedef enum { D3DLIGHT_POINT = 1, D3DLIGHT_SPOT = 2, @@ -542,6 +551,8 @@ D3DLIGHT_GLSPOT = 5, D3DLIGHT_FORCE_DWORD = 0x7fffffff } D3DLIGHTTYPE; + +#endif typedef struct _D3DLIGHT { DWORD dwSize; @@ -609,10 +620,17 @@ typedef DWORD D3DCOLORMODEL; - +#ifndef D3DCLEAR_TARGET #define D3DCLEAR_TARGET 0x00000001 +#endif + +#ifndef D3DCLEAR_ZBUFFER #define D3DCLEAR_ZBUFFER 0x00000002 +#endif + +#ifndef D3DCLEAR_STENCIL #define D3DCLEAR_STENCIL 0x00000004 +#endif typedef enum _D3DOPCODE { D3DOP_POINT = 1, @@ -651,6 +669,8 @@ D3DVALUE dvZ; } D3DPICKRECORD, *LPD3DPICKRECORD; +#if (DIRECT3D_VERSION < 0x0800) + typedef enum { D3DSHADE_FLAT = 1, D3DSHADE_GOURAUD = 2, @@ -669,6 +689,8 @@ WORD wRepeatFactor; WORD wLinePattern; } D3DLINEPATTERN; + +#endif /* (DIRECT3D_VERSION < 0x0800) */ typedef enum { D3DFILTER_NEAREST = 1, @@ -679,6 +701,8 @@ D3DFILTER_LINEARMIPLINEAR = 6, D3DFILTER_FORCE_DWORD = 0x7fffffff } D3DTEXTUREFILTER; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DBLEND_ZERO = 1, @@ -697,6 +721,9 @@ D3DBLEND_FORCE_DWORD = 0x7fffffff } D3DBLEND; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + + typedef enum { D3DTBLEND_DECAL = 1, D3DTBLEND_MODULATE = 2, @@ -709,6 +736,9 @@ D3DTBLEND_FORCE_DWORD = 0x7fffffff } D3DTEXTUREBLEND; + +#if (DIRECT3D_VERSION < 0x0800) + typedef enum _D3DTEXTUREADDRESS { D3DTADDRESS_WRAP = 1, D3DTADDRESS_MIRROR = 2, @@ -763,6 +793,8 @@ D3DZB_FORCE_DWORD = 0x7fffffff } D3DZBUFFERTYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum _D3DANTIALIASMODE { D3DANTIALIAS_NONE = 0, D3DANTIALIAS_SORTDEPENDENT = 1, @@ -776,6 +808,8 @@ D3DVT_TLVERTEX = 3, D3DVT_FORCE_DWORD = 0x7fffffff } D3DVERTEXTYPE; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DPT_POINTLIST = 1, @@ -787,9 +821,13 @@ D3DPT_FORCE_DWORD = 0x7fffffff } D3DPRIMITIVETYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + #define D3DSTATE_OVERRIDE_BIAS 256 #define D3DSTATE_OVERRIDE(type) (D3DRENDERSTATETYPE)(((DWORD) (type) + D3DSTATE_OVERRIDE_BIAS)) + +#if (DIRECT3D_VERSION < 0x0800) typedef enum _D3DTRANSFORMSTATETYPE { D3DTRANSFORMSTATE_WORLD = 1, @@ -809,6 +847,8 @@ D3DTRANSFORMSTATE_FORCE_DWORD = 0x7fffffff } D3DTRANSFORMSTATETYPE; +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum { D3DLIGHTSTATE_MATERIAL = 1, D3DLIGHTSTATE_AMBIENT = 2, @@ -820,6 +860,8 @@ D3DLIGHTSTATE_COLORVERTEX = 8, D3DLIGHTSTATE_FORCE_DWORD = 0x7fffffff } D3DLIGHTSTATETYPE; + +#if (DIRECT3D_VERSION < 0x0800) typedef enum { D3DRENDERSTATE_TEXTUREHANDLE = 1, @@ -966,6 +1008,8 @@ #define D3DWRAPCOORD_2 0x00000004L #define D3DWRAPCOORD_3 0x00000008L +#endif /* (DIRECT3D_VERSION < 0x0800) */ + #define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y)) typedef struct _D3DSTATE { @@ -1006,6 +1050,8 @@ #define D3DPROCESSVERTICES_UPDATEEXTENTS 0x00000008L #define D3DPROCESSVERTICES_NOCOLOR 0x00000010L + +#if (DIRECT3D_VERSION < 0x0800) typedef enum _D3DTEXTURESTAGESTATETYPE { @@ -1085,6 +1131,8 @@ #define D3DTA_COMPLEMENT 0x00000010 #define D3DTA_ALPHAREPLICATE 0x00000020 +#endif /* (DIRECT3D_VERSION < 0x0800) */ + typedef enum _D3DTEXTUREMAGFILTER { D3DTFG_POINT = 1, @@ -1230,6 +1278,8 @@ #define D3DVOP_TRANSFORM (1 << 0) #define D3DVOP_CLIP (1 << 2) #define D3DVOP_EXTENTS (1 << 3) + +#if (DIRECT3D_VERSION < 0x0800) #define D3DMAXNUMVERTICES ((1<<16) - 1) @@ -1264,6 +1314,8 @@ #define D3DFVF_TEX8 0x800 #define D3DFVF_RESERVED2 0xf000 + +#endif /* (DIRECT3D_VERSION < 0x0800) */ #define D3DFVF_VERTEX ( D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_TEX1 ) #define D3DFVF_LVERTEX ( D3DFVF_XYZ | D3DFVF_RESERVED1 | D3DFVF_DIFFUSE | \ @@ -1316,6 +1368,9 @@ #define D3DVIS_MASK_NEAR (3 << 10) #define D3DVIS_MASK_FAR (3 << 12) + +#if (DIRECT3D_VERSION < 0x0800) + #define D3DDEVINFOID_TEXTUREMANAGER 1 #define D3DDEVINFOID_D3DTEXTUREMANAGER 2 #define D3DDEVINFOID_TEXTURING 3 @@ -1356,4 +1411,6 @@ #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) -#endif +#endif /* (DIRECT3D_VERSION < 0x0800) */ + +#endif Modified: trunk/reactos/include/reactos/dll/directx/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/include/reactos/dll/directx/d3d8thk.h (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h Sun Feb 17 16:34:59 2008 @@ -9,40 +9,26 @@ extern "C" { #endif -/* FIXME missing PD3DNTHAL_CONTEXTCREATEDATA BOOL STDCALL OsThunkD3dContextCreate( HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, - PD3DNTHAL_CONTEXTCREATEDATA pdcci + LPD3DNTHAL_CONTEXTDESTROYDATA pdcci ); DWORD STDCALL OsThunkD3dContextDestroy( - PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData -); - -DWORD STDCALL - OsThunkD3dContextDestroyAll(PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData); -*/ - -DWORD STDCALL OsThunkD3dContextDestroyAll(LPVOID); - -/* FIXME PD3DNTHAL_DRAWPRIMITIVES2DATA, PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA missing -DWORD STDCALL OsThunkD3dDrawPrimitives2( - HANDLE hCmdBuf, - HANDLE hVBuf, - PD3DNTHAL_DRAWPRIMITIVES2DATA pded, - FLATPTR *pfpVidMemCmd, - DWORD *pdwSizeCmd, - FLATPTR *pfpVidMemVtx, - DWORD *pdwSizeVtx + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData +); + +DWORD STDCALL OsThunkD3dContextDestroyAll( + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); DWORD STDCALL OsThunkD3dValidateTextureStageState( - PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData -); -*/ + LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData +); + DWORD STDCALL OsThunkDdAddAttachedSurface( HANDLE hSurface,

16 years, 8 months

[fireball] 32400: - Zero early-allocated pages for PFN DB itself, as suggested on the ros-dev mailing list, and hyperspace mapping seems to work, at least on x86. Fixes the "warm reboot-bug" in 2nd stage.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 17 16:08:28 2008 New Revision: 32400 URL: http://svn.reactos.org/svn/reactos?rev=32400&view=rev Log: - Zero early-allocated pages for PFN DB itself, as suggested on the ros-dev mailing list, and hyperspace mapping seems to work, at least on x86. Fixes the "warm reboot-bug" in 2nd stage. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Feb 17 16:08:28 2008 @@ -242,11 +242,11 @@ MmAllocEarlyPage(VOID) { PFN_TYPE Pfn; - + /* Use one of our highest usable pages */ Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; MiFreeDescriptor->PageCount--; - + /* Return it */ return Pfn; } @@ -285,7 +285,7 @@ { /* Use one of our highest usable pages */ Pfn = MmAllocEarlyPage(); - + /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, PAGE_READWRITE, @@ -303,7 +303,7 @@ MmSetPageProtect(NULL, Address, PAGE_READWRITE); } } - + /* Clear the PFN database */ RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); @@ -386,8 +386,7 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } -#endif - +#else VOID NTAPI MmInitializePageList() @@ -427,9 +426,8 @@ if (!MmIsPagePresent(NULL, Address)) { /* Use one of our highest usable pages */ - Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; - MiFreeDescriptor->PageCount--; - + Pfn = MmAllocEarlyPage(); + /* Set the PFN */ Status = MmCreateVirtualMappingForKernel(Address, PAGE_READWRITE, @@ -579,6 +577,7 @@ MmStats.NrTotalPages = MmStats.NrFreePages + MmStats.NrSystemPages + MmStats.NrUserPages; MmInitializeBalancer(MmStats.NrFreePages, MmStats.NrSystemPages); } +#endif VOID NTAPI @@ -945,7 +944,9 @@ { /* Allocate an early page -- we'll account for it later */ KeReleaseSpinLock(&PageListLock, oldIrql); - return MmAllocEarlyPage(); + PfnOffset = MmAllocEarlyPage(); + MiZeroPage(PfnOffset); + return PfnOffset; } DPRINT1("MmAllocPage(): Out of memory\n");

16 years, 8 months

[cfinck] 32399: - Only add a command for deleting the proxy makefile, when one was really generated. Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ; -) - Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC. - Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Feb 17 02:45:23 2008 New Revision: 32399 URL: http://svn.reactos.org/svn/reactos?rev=32399&view=rev Log: - Only add a command for deleting the proxy makefile, when one was really generated. Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ;-) - Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC. - Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Sun Feb 17 02:45:23 2008 @@ -133,10 +133,11 @@ ~ProxyMakefile (); void GenerateProxyMakefiles ( bool verbose, std::string outputTree ); + static bool GenerateProxyMakefile ( const Module& module ); + private: std::string GeneratePathToParentDirectory ( int numberOfParentDirectories ); std::string GetPathToTopDirectory ( Module& module ); - bool GenerateProxyMakefile ( Module& module ); void GenerateProxyMakefileForModule ( Module& module, bool verbose, std::string outputTree ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Feb 17 02:45:23 2008 @@ -18,6 +18,7 @@ */ #include "../../pch.h" #include <assert.h> +#include <algorithm> #include "../../rbuild.h" #include "mingw.h" @@ -615,13 +616,15 @@ } fprintf ( fMakefile, " 2>$(NUL)\n" ); - if ( module.name != "zlib" ) /* Avoid make warning */ + if( ProxyMakefile::GenerateProxyMakefile(module) ) { DirectoryLocation root; + if ( backend->configuration.GenerateProxyMakefilesInSourceTree ) root = SourceDirectory; else root = OutputDirectory; + FileLocation proxyMakefile ( root, module.output->relative_path, "GNUmakefile" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Sun Feb 17 02:45:23 2008 @@ -33,7 +33,7 @@ } bool -ProxyMakefile::GenerateProxyMakefile ( Module& module ) +ProxyMakefile::GenerateProxyMakefile ( const Module& module ) { return module.output->directory == OutputDirectory; } Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Sun Feb 17 02:45:23 2008 @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true"

16 years, 8 months

[cfinck] 32398: [FORMATTING] - 2 spaces --> 4 spaces - some other changes to make the code style consistent with most ROS code - Change in the .rbuild file to treat warnings as errors (the lib currently doesn't spit out any warnings, so it shouldn't do in the future)

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Feb 17 02:07:40 2008 New Revision: 32398 URL: http://svn.reactos.org/svn/reactos?rev=32398&view=rev Log: [FORMATTING] - 2 spaces --> 4 spaces - some other changes to make the code style consistent with most ROS code - Change in the .rbuild file to treat warnings as errors (the lib currently doesn't spit out any warnings, so it shouldn't do in the future) Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c Sun Feb 17 02:07:40 2008 @@ -1,12 +1,13 @@ /* - Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> - - This library is (hopefully) compatible with Microsoft's - screen saver library. - - This is public domain software. + Screen saver library by Anders Norlander <anorland(a)hem2.passagen.se> + + This library is (hopefully) compatible with Microsoft's + screen saver library. + + This is public domain software. */ + #include <windows.h> #include <scrnsave.h> #include <regstr.h> @@ -15,16 +16,16 @@ #define CLASS_SCRNSAVE TEXT("WindowsScreenSaverClass") /* globals */ -HWND hMainWindow = NULL; -BOOL fChildPreview = FALSE; -HINSTANCE hMainInstance; -TCHAR szName[TITLEBARNAMELEN]; -TCHAR szAppName[APPNAMEBUFFERLEN]; -TCHAR szIniFile[MAXFILELEN]; -TCHAR szScreenSaver[22]; -TCHAR szHelpFile[MAXFILELEN]; -TCHAR szNoHelpMemory[BUFFLEN]; -UINT MyHelpMessage; +HWND hMainWindow = NULL; +BOOL fChildPreview = FALSE; +HINSTANCE hMainInstance; +TCHAR szName[TITLEBARNAMELEN]; +TCHAR szAppName[APPNAMEBUFFERLEN]; +TCHAR szIniFile[MAXFILELEN]; +TCHAR szScreenSaver[22]; +TCHAR szHelpFile[MAXFILELEN]; +TCHAR szNoHelpMemory[BUFFLEN]; +UINT MyHelpMessage; /* local house keeping */ static HINSTANCE hPwdLib = NULL; @@ -54,355 +55,383 @@ static int ISSPACE(char c) { - return (c == ' ' || c == '\t'); + return (c == ' ' || c == '\t'); } #define ISNUM(c) ((c) >= '0' && c <= '9') + static unsigned long _toul(const char *s) { - unsigned long res; - unsigned long n; - const char *p; - for (p = s; *p; p++) - if (!ISNUM(*p)) break; - p--; - res = 0; - for (n = 1; p >= s; p--, n *= 10) - res += (*p - '0') * n; - return res; + unsigned long res; + unsigned long n; + const char *p; + + for (p = s; *p; p++) + if (!ISNUM(*p)) + break; + + p--; + res = 0; + + for (n = 1; p >= s; p--, n *= 10) + res += (*p - '0') * n; + + return res; } /* screen saver entry point */ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, - LPSTR CmdLine, int nCmdShow) -{ - LPSTR p; - OSVERSIONINFO vi; - - /* initialize */ - hMainInstance = hInst; - - vi.dwOSVersionInfoSize = sizeof(vi); - GetVersionEx(&vi); - /* check if we are going to check for passwords */ - if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) - { - HKEY hKey; - /* we are using windows 95 */ - w95 = TRUE; - if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == - ERROR_SUCCESS) + LPSTR CmdLine, int nCmdShow) +{ + LPSTR p; + OSVERSIONINFO vi; + + /* initialize */ + hMainInstance = hInst; + + vi.dwOSVersionInfoSize = sizeof(vi); + GetVersionEx(&vi); + /* check if we are going to check for passwords */ + if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + HKEY hKey; + /* we are using windows 95 */ + w95 = TRUE; + if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) == + ERROR_SUCCESS) { - DWORD check_pwd; - DWORD size = sizeof(DWORD); - DWORD type; - LONG res; - res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, - NULL, &type, (PBYTE) &check_pwd, &size); - if (check_pwd && res == ERROR_SUCCESS) + DWORD check_pwd; + DWORD size = sizeof(DWORD); + DWORD type; + LONG res; + + res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD, + NULL, &type, (PBYTE) &check_pwd, &size); + + if (check_pwd && res == ERROR_SUCCESS) { - hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); - if (hPwdLib) - VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); + hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL")); + if (hPwdLib) + VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword); } - RegCloseKey(hKey); + + RegCloseKey(hKey); } } - /* parse arguments */ - for (p = CmdLine; *p; p++) - { - switch (*p) + /* parse arguments */ + for (p = CmdLine; *p; p++) + { + switch (*p) { - case 'S': - case 's': - /* start screen saver */ - return LaunchScreenSaver(NULL); - - case 'P': - case 'p': - { - /* start screen saver in preview window */ - HWND hParent; - fChildPreview = TRUE; - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - if (hParent && IsWindow(hParent)) - return LaunchScreenSaver(hParent); - } - return 0; - - case 'C': - case 'c': - /* display configure dialog */ - LaunchConfig(); - return 0; - - case 'A': - case 'a': - { - /* change screen saver password */ - HWND hParent; - while (ISSPACE(*++p)); - hParent = (HWND) _toul(p); - if (!hParent || !IsWindow(hParent)) - hParent = GetForegroundWindow(); - ScreenSaverChangePassword(hParent); - } - return 0; - - case '-': - case '/': - case ' ': - default: - break; + case 'S': + case 's': + /* start screen saver */ + return LaunchScreenSaver(NULL); + + case 'P': + case 'p': + { + /* start screen saver in preview window */ + HWND hParent; + fChildPreview = TRUE; + + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + + if (hParent && IsWindow(hParent)) + return LaunchScreenSaver(hParent); + } + return 0; + + case 'C': + case 'c': + /* display configure dialog */ + LaunchConfig(); + return 0; + + case 'A': + case 'a': + { + /* change screen saver password */ + HWND hParent; + while (ISSPACE(*++p)); + hParent = (HWND) _toul(p); + + if (!hParent || !IsWindow(hParent)) + hParent = GetForegroundWindow(); + + ScreenSaverChangePassword(hParent); + } + return 0; + + case '-': + case '/': + case ' ': + default: + break; } } - LaunchConfig(); - return 0; + + LaunchConfig(); + + return 0; } static void LaunchConfig(void) { - /* FIXME: should this be called */ - RegisterDialogClasses(hMainInstance); - /* display configure dialog */ - DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), - GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); -} - + /* FIXME: should this be called */ + RegisterDialogClasses(hMainInstance); + + /* display configure dialog */ + DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE), + GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog); +} static int LaunchScreenSaver(HWND hParent) { - BOOL foo; - UINT style; - RECT rc; - MSG msg; - - /* don't allow other tasks to get into the foreground */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); - - msg.wParam = 0; - - /* register classes, both user defined and classes used by screen saver - library */ - if (!RegisterClasses()) - { - MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); - goto restore; - } - - /* a slightly different approach needs to be used when displaying - in a preview window */ - if (hParent) - { - style = WS_CHILD; - GetClientRect(hParent, &rc); - } - else - { - style = WS_POPUP; - rc.right = GetSystemMetrics(SM_CXSCREEN); - rc.bottom = GetSystemMetrics(SM_CYSCREEN); - style |= WS_VISIBLE; - } - - /* create main screen saver window */ - hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, - TEXT("SCREENSAVER"), style, - 0, 0, rc.right, rc.bottom, hParent, NULL, - hMainInstance, NULL); - - /* display window and start pumping messages */ - if (hMainWindow) - { - UpdateWindow(hMainWindow); - ShowWindow(hMainWindow, SW_SHOW); - - while (GetMessage(&msg, NULL, 0, 0) == TRUE) + BOOL foo; + UINT style; + RECT rc; + MSG msg; + + /* don't allow other tasks to get into the foreground */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0); + + msg.wParam = 0; + + /* register classes, both user defined and classes used by screen saver + library */ + if (!RegisterClasses()) + { + MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND); + goto restore; + } + + /* a slightly different approach needs to be used when displaying + in a preview window */ + if (hParent) + { + style = WS_CHILD; + GetClientRect(hParent, &rc); + } + else + { + style = WS_POPUP; + rc.right = GetSystemMetrics(SM_CXSCREEN); + rc.bottom = GetSystemMetrics(SM_CYSCREEN); + style |= WS_VISIBLE; + } + + /* create main screen saver window */ + hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE, + TEXT("SCREENSAVER"), style, + 0, 0, rc.right, rc.bottom, hParent, NULL, + hMainInstance, NULL); + + /* display window and start pumping messages */ + if (hMainWindow) + { + UpdateWindow(hMainWindow); + ShowWindow(hMainWindow, SW_SHOW); + + while (GetMessage(&msg, NULL, 0, 0) == TRUE) { - TranslateMessage(&msg); - DispatchMessage(&msg); + TranslateMessage(&msg); + DispatchMessage(&msg); } } restore: - /* restore system */ - if (w95 && !fChildPreview) - SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); - FreeLibrary(hPwdLib); - return msg.wParam; + /* restore system */ + if (w95 && !fChildPreview) + SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0); + + FreeLibrary(hPwdLib); + return msg.wParam; } /* this function takes care of *must* do tasks, like terminating screen saver */ -static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_CREATE: - if (!fChildPreview) - SetCursor(NULL); - /* mouse is not supposed to move from this position */ - GetCursorPos(&pt_orig); - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_TIMER: - if (closing) - return 0; - break; - case WM_PAINT: - if (closing) +static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CREATE: + if (!fChildPreview) + SetCursor(NULL); + /* mouse is not supposed to move from this position */ + GetCursorPos(&pt_orig); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + case WM_TIMER: + if (closing) + return 0; + break; + + case WM_PAINT: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + break; + + case WM_SYSCOMMAND: + if (!fChildPreview) + { + switch (wParam) + { + case SC_CLOSE: + case SC_SCREENSAVE: + case SC_NEXTWINDOW: + case SC_PREVWINDOW: + return FALSE; + } + } + break; + + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (closing) + return DefWindowProc(hWnd, msg, wParam, lParam); + + break; + } + + return ScreenSaverProc(hWnd, msg, wParam, lParam); +} + +LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + /* don't do any special processing when in preview mode */ + if (fChildPreview || closing) return DefWindowProc(hWnd, msg, wParam, lParam); - break; - case WM_SYSCOMMAND: - if (!fChildPreview) - switch (wParam) - { - case SC_CLOSE: - case SC_SCREENSAVE: - case SC_NEXTWINDOW: - case SC_PREVWINDOW: - return FALSE; - } - break; - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - case WM_NCACTIVATE: - case WM_ACTIVATE: - case WM_ACTIVATEAPP: - if (closing) - return DefWindowProc(hWnd, msg, wParam, lParam); - break; - } - return ScreenSaverProc(hWnd, msg, wParam, lParam); -} - -LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) -{ - /* don't do any special processing when in preview mode */ - if (fChildPreview || closing) + + switch (msg) + { + case WM_CLOSE: + TerminateScreenSaver(hWnd); + /* do NOT pass this to DefWindowProc; it will terminate even if + an invalid password was given. + */ + return 0; + + case SCRM_VERIFYPW: + /* verify password or return TRUE if password checking is turned off */ + if (VerifyScreenSavePwd) + return VerifyScreenSavePwd(hWnd); + else + return TRUE; + + case WM_SETCURSOR: + if (checking_pwd) + break; + SetCursor(NULL); + return TRUE; + + case WM_NCACTIVATE: + case WM_ACTIVATE: + case WM_ACTIVATEAPP: + if (wParam != FALSE) + break; + + case WM_MOUSEMOVE: + { + POINT pt; + GetCursorPos(&pt); + if (pt.x == pt_orig.x && pt.y == pt_orig.y) + break; + } + + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + /* try to terminate screen saver */ + if (!checking_pwd) + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; + } + return DefWindowProc(hWnd, msg, wParam, lParam); - - switch (msg) - { - case WM_CLOSE: - TerminateScreenSaver(hWnd); - /* do NOT pass this to DefWindowProc; it will terminate even if - an invalid password was given. - */ - return 0; - case SCRM_VERIFYPW: - /* verify password or return TRUE if password checking is turned off */ - if (VerifyScreenSavePwd) - return VerifyScreenSavePwd(hWnd); - else - return TRUE; - case WM_SETCURSOR: - if (checking_pwd) - break; - SetCursor(NULL); - return TRUE; - case WM_NCACTIVATE: - case WM_ACTIVATE: - case WM_ACTIVATEAPP: - if (wParam != FALSE) - break; - case WM_MOUSEMOVE: - { - POINT pt; - GetCursorPos(&pt); - if (pt.x == pt_orig.x && pt.y == pt_orig.y) - break; - } - case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: - case WM_KEYDOWN: - case WM_SYSKEYDOWN: - /* try to terminate screen saver */ - if (!checking_pwd) - PostMessage(hWnd, WM_CLOSE, 0, 0); - break; - } - return DefWindowProc(hWnd, msg, wParam, lParam); } static void TerminateScreenSaver(HWND hWnd) { - /* don't allow recursion */ - if (checking_pwd || closing) - return; - - /* verify password */ - if (VerifyScreenSavePwd) - { - checking_pwd = TRUE; - closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); - checking_pwd = FALSE; - } - else - closing = TRUE; - - /* are we closing? */ - if (closing) - { - DestroyWindow(hWnd); - } - else - GetCursorPos(&pt_orig); /* if not: get new mouse position */ + /* don't allow recursion */ + if (checking_pwd || closing) + return; + + /* verify password */ + if (VerifyScreenSavePwd) + { + checking_pwd = TRUE; + closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0); + checking_pwd = FALSE; + } + else + closing = TRUE; + + /* are we closing? */ + if (closing) + { + DestroyWindow(hWnd); + } + else + GetCursorPos(&pt_orig); /* if not: get new mouse position */ } /* - Register screen saver window class and call user - supplied hook. + Register screen saver window class and call user + supplied hook. */ static BOOL RegisterClasses(void) { - WNDCLASS cls; - ZeroMemory(&cls, sizeof(cls)); - cls.hCursor = NULL; - cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); - cls.lpszMenuName = NULL; - cls.lpszClassName = CLASS_SCRNSAVE; - cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); - cls.hInstance = hMainInstance; - cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; - cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; - cls.cbWndExtra = 0; - cls.cbClsExtra = 0; - - if (!RegisterClass(&cls)) - return FALSE; - - return RegisterDialogClasses(hMainInstance); + WNDCLASS cls; + ZeroMemory(&cls, sizeof(cls)); + cls.hCursor = NULL; + cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); + cls.lpszMenuName = NULL; + cls.lpszClassName = CLASS_SCRNSAVE; + cls.hbrBackground = NULL; //(HBRUSH)GetStockObject(BLACK_BRUSH); + cls.hInstance = hMainInstance; + cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC; + cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc; + cls.cbWndExtra = 0; + cls.cbClsExtra = 0; + + if (!RegisterClass(&cls)) + return FALSE; + + return RegisterDialogClasses(hMainInstance); } void WINAPI ScreenSaverChangePassword(HWND hParent) { - /* load Master Password Router (MPR) */ - HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); - - if (hMpr) - { - CHPWDPROC ChangePassword; - ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); - - /* change password for screen saver provider */ - if (ChangePassword) - ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); - - FreeLibrary(hMpr); - } -} - + /* load Master Password Router (MPR) */ + HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL")); + + if (hMpr) + { + CHPWDPROC ChangePassword; + ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword); + + /* change password for screen saver provider */ + if (ChangePassword) + ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL); + + FreeLibrary(hMpr); + } +} Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.rbuild Sun Feb 17 02:07:40 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="scrnsave" type="staticlibrary" allowwarnings="true"> +<module name="scrnsave" type="staticlibrary"> <file>scrnsave.c</file> </module> </group>

16 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008