Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[mjmartin] 41276: - IopDeleteDevice: Fix a typo.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jun 4 07:40:47 2009 New Revision: 41276 URL: http://svn.reactos.org/svn/reactos?rev=41276&view=rev Log: - IopDeleteDevice: Fix a typo. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Jun 4 07:40:47 2009 @@ -33,7 +33,7 @@ /* TODO: Delete Device Node */ /* Dereference the driver object, referenced in IoCreateDevice */ - if (DeviceObject->DriverObject); + if (DeviceObject->DriverObject) ObDereferenceObject(DeviceObject->DriverObject); }

15 years, 5 months

[jimtabor] 41275: - More research is required to fix NtGdiSetPixelFormat, so removing disputed information.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 4 05:33:43 2009 New Revision: 41275 URL: http://svn.reactos.org/svn/reactos?rev=41275&view=rev Log: - More research is required to fix NtGdiSetPixelFormat, so removing disputed information. Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/wingl.c [iso-8859-1] Thu Jun 4 05:33:43 2009 @@ -162,23 +162,14 @@ ppdev = pdc->ppdev; + /* + WndObj is needed so exit on NULL pointer. + */ if (pWndObj) pso = pWndObj->psoOwner; else { SetLastWin32Error(ERROR_INVALID_PIXEL_FORMAT); goto Exit; - } - - if (!pso) - { - /* - Based on some rules! InfoDC to DC or, based on wiki information! - All pointers, it's a "must be!", (CONTAINING_RECORD +10h = SURFOBJ), the - pointer will start at SURFOBJ of the SURFACE structure. - */ - pso = (SURFOBJ *)pdc->dclevel.pSurface; - if (!pso) pso = pdc->pSurfInfo; - if (!pso) pso = ppdev->pSurface; } if (ppdev->flFlags & PDEV_META_DEVICE)

15 years, 5 months

[dgorbachev] 41274: Estonian translations by Andres Traks (anthrax11*AT*hot*DOT*ee), bug #4580.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Jun 4 05:08:57 2009 New Revision: 41274 URL: http://svn.reactos.org/svn/reactos?rev=41274&view=rev Log: Estonian translations by Andres Traks (anthrax11*AT*hot*DOT*ee), bug #4580. Added: trunk/reactos/base/setup/reactos/lang/et-EE.rc (with props) trunk/reactos/base/setup/welcome/lang/et-EE.rc (with props) trunk/reactos/dll/win32/syssetup/lang/et-EE.rc (with props) Modified: trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/dll/win32/syssetup/syssetup.rc Added: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc (added) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -1,0 +1,150 @@ +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tere tulemast ReactOSi paigaldamisprogrammi.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Selle CD pealt ei saa praegu veel ReactOSi paigaldada! ReactOSi paigaldamiseks on tarvis arvuti taaskäivitada selle CD-ga.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Vajuta lõpeta, et installeerimine lõpetada.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Paigaldamise keel:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Klaviatuur või sisestusmeetod:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Vajuta Järgmine, et valida paigalduse tüüp.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Paigalduse tüüp", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Installeeri ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Paranda või uuenda installeeritud ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Seadmete seaded", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Arvuti:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 + LTEXT "Monitor:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 + LTEXT "Klaviatuur:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 + LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partitsioneerimine", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Partitsiooni loomine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Loo ja vorminda ketas",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Suurus:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Failisüsteem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&Olgu",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Tühista",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Täpsemad vormindamise seaded" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Paigalda alglaadur kõvakettale (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&Olgu", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Tühista", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Paigaldamise kokkuvõte", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Vajuta Järgmine, et paigaldamist alustada.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamise lõpetamine" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ReactOSi paigaldamise esimese järgu lõpetamine", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "ReactOSi paigaldamise esimene järk on edukalt lõpetatud.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "Vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "Võta CD välja ja vajuta Lõpeta, et arvuti taaskäivitada.", IDC_STATIC, 10, 180, 297, 20 +END + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Keele valimine" + IDS_LANGSUBTITLE "Vali paigaldamise ja süsteemi keel." + IDS_TYPETITLE "Tere tulemast ReactOSi paigaldama" + IDS_TYPESUBTITLE "Vali paigalduse tüüp." + IDS_DEVICETITLE "Põhiliste seadmete paigaldamine" + IDS_DEVICESUBTITLE "Monitori ja klaviatuuri seadistamine." + IDS_DRIVETITLE "Partitsioonide ja süsteemikausta seadistamine" + IDS_DRIVESUBTITLE "Sihtpartitsiooni, süsteemikausta ja alglaaduri ettevalmistamine." + IDS_PROCESSTITLE "Partitsiooni ettevalmistamine, failide kopeerimine ja süsteemi üles seadmine" + IDS_PROCESSSUBTITLE "Partitsiooni loomine ja vormindamine, failide kopeerimine, alglaaduri seadistamine" + IDS_RESTARTTITLE "Paigaldamise esimene järk lõpetatud" + IDS_RESTARTSUBTITLE "Paigaldamise esimene järk on lõpetatud, teise järgu alustamiseks taaskäivita arvuti" + IDS_SUMMARYTITLE "Paigaldamise kokkuvõte" + IDS_SUMMARYSUBTITLE "Seadete kontrollimine enne paigaldamise alustamist" + IDS_ABORTSETUP "ReactOS ei ole veel täielikult paigaldatud. Kas tõesti lahkuda?" + IDS_ABORTSETUP2 "Katkestada paigaldamine?" +END Propchange: trunk/reactos/base/setup/reactos/lang/et-EE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -8,6 +8,7 @@ //#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/et-EE.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -7,4 +7,1689 @@ { NULL, NULL } }; +static MUI_ENTRY etEELanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Keele valik", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Vali keel, mida paigaldamisel kasutada.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Ja vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Seda keelt kasutatakse hiljem ssteemi keelena.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Tere tulemast ReactOSi paigaldama", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "Selles paigaldamise osas kopeeritakse ReactOSi failid arvutisse ja", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "valmistatakse ette paigaldamise teine jrk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Vajuta ENTER, et ReactOS paigaldada.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Vajuta R, et ReactOSi parandada.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Vajuta L, et nha ReactOSi litsentsi ja kasutamise tingimusi", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Vajuta F3, et vljuda ReactOSi paigaldamata.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "ReactOSi kohta saab rohkem infot:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "ENTER = Jtka R = Paranda L = Litsents F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOSi paigaldusprogramm on varajases arendusfaasis. Praegu ei ole", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "veel käik korraliku paigaldusprogrammi funktsioonid toetatud.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Kehtivad jrgmised piirangud:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Sihtkettal väib olla ainult ks peamine partitsioon.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Peamist partitsiooni ei saa kettalt kustutada", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " kui kettal on ka laiendatud partitsioone.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Esimest laiendatud partitsiooni ei saa kettalt kustutada", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " kui kettal on ka teisi laiendatud partitsioone.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Toetatud on ainult FAT failissteem.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- Failissteemi kontrollimist veel ei tehta.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 Vajuta ENTER, et ReactOS paigaldada.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 Vajuta F3, et vljuda ReactOSi paigaldamata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS| TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEELicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Litsents:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "ReactOS kasutab GNU ldist avalikku litsentsi(GPL),", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "mäned komponendid kasutavad muid hilduvaid litsentse,", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "nagu niteks X11, BSD ja GNU LGPL.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "Kogu ReactOSi ssteem on seega kaitstud GPL litsentsiga", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "ning samas kehtivad ka algsed litsentsid.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "Kesoleva tarkvaraga ei anta kaasa garantiid ega mrata kasutamise", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "piiranguid kehtiva seadusega stestatud piirides. ReactOSi", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "litsents mrab ainult levitamise kolmandatele osapooltele.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "Kui mingil pähjusel ei olnud tarkvaraga kaasas GNU GPL", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "ldist avalikku litsentsi, siis saab seda vaadata lehel", + TEXT_STYLE_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 22, + "Garantii:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 24, + "Tegemist on vaba tarkvaraga; kopeerimise tingimused on kirjas algkoodis.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "Garantii puudub; pole isegi turustamiseks väi mingil", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "kindlal eesmrgil kasutamiseks sobivuse garantiid", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Tagasi", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Jrgnev nimekiri nitab riistvara seadeid.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Arvuti:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Monitor:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "Klaviatuur:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "Klaviatuuri asetus:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Rakenda:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, "Rakenda need seaded", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "Riistvara seadeid saab muuta les ja alla liikudes.", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "Seadistuse muutmiseks vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 6, + 21, + "", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "Kui seadistus on paigas, vali \"Rakenda need seaded\"", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "ja vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEERepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOSi paigaldusprogramm on varajases arendusfaasis. Praegu ei ole", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "veel käik korraliku paigaldusprogrammi funktsioonid toetatud.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Parandamine ei ole veel toetatud.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Vajuta U, et ssteemi uuendada.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Vajuta R, et kasutada taastuskonsooli.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Vajuta ESC, et minna tagasi pealehele.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Vajuta ENTER, et arvuti taaskivitada.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Pealeht U = Uuenda R = Taastamine ENTER = Taaskivitus", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY etEEComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Arvuti tbi muutmine.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Liigu les-alla, et valida sobiv arvuti tp.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Seejrel vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Vajuta ESC, et minna tagasi eelmisele lehele", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " ilma arvuti tpi muutmata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Ssteem kirjutab nd andmed kettale", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Väib kuluda veidi aega", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "Läpetamisel taaskivitub arvuti automaatselt", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Vahemlu thjendamine", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS ei ole tielikult paigaldatud", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Eemalda flopiketas ja CD-ROMid draividest.", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Vajuta ENTER, et arvuti taaskivitada.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Palun oota...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Monitori tbi muutmine.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Liigu les-alla, et monitori tpi muuta.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Seejrel vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Vajuta ESC, et minna tagasi eelmisele lehele", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " ilma monitori tpi muutmata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEESuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOSi pähilised komponendid on edukalt paigaldatud.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Eemalda flopiketas ja CD-ROMid draividest.", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Vajuta ENTER, et arvuti taaskivitada.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Taaskivita arvuti", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Alglaadurit ei saanud kettale kirjutada.", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "Sisesta vormindatud flopiketas draivi A:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "ja vajuta ENTER.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY etEESelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "See nimekiri nitab partitsioone ja vaba ruumi", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "uute partitsioonide jaoks.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Liigu les-alla, et valida kirje.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Vajuta ENTER, et paigaldada ReactOS valitud partitsioonile.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Vajuta C, et teha uus partitsioon.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Vajuta D, et kustutada olemasolev partitsioon.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Palun oota...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Partitsiooni vormindamine", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Nd vormindatakse partitsioon. Vajuta ENTER, et jtkata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY etEEInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS paigaldatakse valitud partitsioonile.", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "Vali kaust, kuhu ReactOS paigaldada:", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "Kausta muutmiseks kustuta kirje BACKSPACE klahviga ja", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "trki asemele kaust, kuhu ReactOS installeerida.", + TEXT_STYLE_NORMAL + }, + { + 6, + 16, + "", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Palun oota, kuni ReactOS paigaldatakse sihtkausta.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "Väib kuluda mitu minutit.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Palun oota... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Alglaaduri paigaldamine", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "Paigalda alglaadur kävakettale (MBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "Paigalda alglaadur flopikettale.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "ra paigalda alglaadurit.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Klaviatuuri tbi muutmine.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Vajuta les-alla, et valida klaviatuuri tp.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Seejrel vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Vajuta ESC, et minna tagasi eelmisele lehele", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " klaviatuuri tpi muutmata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEELayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Vali vaikimisi klaviatuuriasetus.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Liigu les-alla, et valida klaviatuuriasetus.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Seejrel vajuta ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Vajuta ESC, et minna tagasi eelmisele lehele", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " klaviatuuriasetust muutmata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = Jtka ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY etEEPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Arvutit valmistatakse ette ReactOSi failide kopeerimiseks.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Failide nimekirja loomine...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY etEESelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Vali nimekirjast failissteem.", + 0 + }, + { + 8, + 19, + "\x07 Liigu les-alla, et valida failissteem.", + 0 + }, + { + 8, + 21, + "\x07 Vajuta ENTER, et partitsioon vormindada.", + 0 + }, + { + 8, + 23, + "\x07 Vajuta ESC, et valida muu partitsioon.", + 0 + }, + { + 0, + 0, + "ENTER = Jtka ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEEDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Oled valinud partitsiooni kustutamise", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Vajuta D, et partitsioon kustutada.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "HOIATUS: Käik andmed partitsioonil kustutatakse!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Vajuta ESC, et katkestada.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Kustuta partitsioon ESC = Katkesta F3 = Vlju", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY etEERegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Uuendatakse ssteemi seadistust.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Registri vätmete loomine...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR etEEErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS ei ole tielikult paigaldatud.\n" + "Kui paigaldamine praegu katkestada, siis tuleb\n" + "ReactOSi paigaldamiseks paigaldusprogramm uuesti kivitada.\n" + "\n" + " \x07 Vajuta ENTER, et paigaldamist jtkata.\n" + " \x07 Vajuta F3, et paigaldamie peatada.", + "F3 = Vlju ENTER = Jtka" + }, + { + //ERROR_NO_HDD + "Kävaketast ei leitud.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Paigaldusprogramm ei leidnud ketast, millelt see kivitati.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "TXTSETUP.SIF faili ei ännestunud laadida.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "TXTSETUP.SIF on vigane.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "TXTSETUP.SIF faili signatuur on vigane.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_DRIVE_INFORMATION + "Ssteemiketta parameetreid ei ännestunud lugeda.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_WRITE_BOOT, + "Ssteemikettale ei ännestunud kirjutada FAT alglaadimiskoodi.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_LOAD_COMPUTER, + "Arvutitpide nimekirja ei ännestunud laadida.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_LOAD_DISPLAY, + "Monitoride nimekirja ei ännestunud laadida.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_LOAD_KEYBOARD, + "Klaviatuuri tpide nimekirja ei ännestunud laadida.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Klaviatuuriasetuste nimekirja ei ännestunud laadida.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_WARN_PARTITION, + "Leiti vhemalt ks kävaketas, millel on hildamatu partitsioonitabel,\n" + "millega ei saanud korralikult mber kia!\n" + "\n" + "Partitsioonide loomine väi kustutamine väib vigastada partitsioonitabelit.\n" + "\n" + " \x07 Vajuta F3, et vljuda paigaldusest.." + " \x07 Vajuta ENTER, et jtkata.", + "F3= Vlju ENTER = Jtka" + }, + { + //ERROR_NEW_PARTITION, + "Uut partitsioonitabelit ei saa juba olemasoleva\n" + "partitsiooni sisse tekitada!\n" + "\n" + " * Vajuta suvalist klahvi, et jtkata.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Partitsioneerimata kettaruumi ei saa kustutada!\n" + "\n" + " * Vajuta suvalist klahvi, et jtkata.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Ssteemikettale ei ännestunud paigaldada FAT alglaadimiskoodi.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_NO_FLOPPY, + "Draivis A: ei ole flopiketast.", + "ENTER = Jtka" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Klaviatuuriasetuse seadistust ei ännestunud uuendada.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Monitori seadistust registris ei ännestunud uuendada.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_IMPORT_HIVE, + "Tarufaili ei ännestunud importida.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_FIND_REGISTRY + "Registri andmete faile ei leitud.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CREATE_HIVE, + "Registri tarusid ei ännestunud luua.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Registrit ei ännestunud luua.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_INVALID_CABINET_INF, + "Kapifailis ei olnud pdevaid inf faile.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CABINET_MISSING, + "Kapifaili ei leitud.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CABINET_SCRIPT, + "Kapifailis puudub paigaldusskript.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_COPY_QUEUE, + "Kopeeritavate failide nimekirja ei ännestunud avada.\n", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CREATE_DIR, + "Paigalduskaustu ei ännestunud luua.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_TXTSETUP_SECTION, + "TXTSETUP.SIF failist ei leitud 'Directories' sektsiooni.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CABINET_SECTION, + "Kapifailist ei leitud 'Directories' sektsiooni.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Paigalduskausta ei ännestunud luua.", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_FIND_SETUPDATA, + "TXTSETUP.SIF failist ei leitud 'SetupData' sektsiooni", + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_WRITE_PTABLE, + "Partitsioonitabeleid ei ännestunud kirjutada.\n" + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_ADDING_CODEPAGE, + "Kooditabelit ei ännestunud registrisse lisada.\n" + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Ssteemilokaati ei ännestunud sedistada.\n" + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Klaviatuuriasetusi ei ännestunud registrisse lisada.\n" + "ENTER = Taaskivita arvuti" + }, + { + //ERROR_UPDATE_GEOID, + "Geograafilist asukohta ei ännestunud seadistada.\n" + "ENTER = Taaskivita arvuti" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE etEEPages[] = +{ + { + LANGUAGE_PAGE, + etEELanguagePageEntries + }, + { + START_PAGE, + etEEWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + etEEIntroPageEntries + }, + { + LICENSE_PAGE, + etEELicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + etEEDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + etEERepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + etEEComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + etEEDisplayPageEntries + }, + { + FLUSH_PAGE, + etEEFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + etEESelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + etEESelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + etEEFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + etEEDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + etEEInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + etEEPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + etEEFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + etEEKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + etEEBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + etEELayoutSettingsEntries + }, + { + QUIT_PAGE, + etEEQuitPageEntries + }, + { + SUCCESS_PAGE, + etEESuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + etEEBootPageEntries + }, + { + REGISTRY_PAGE, + etEERegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING etEEStrings[] = +{ + {STRING_PLEASEWAIT, + " Palun oota..."}, + {STRING_INSTALLCREATEPARTITION, + " ENTER = Paigalda C = Loo partitsioon F3 = Vlju"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Paigalda D = Kustuta partitsioon F3 = Vlju"}, + {STRING_PARTITIONSIZE, + "Uue partitsiooni suurus:"}, + {STRING_CHOOSENEWPARTITION, + "Oled valinud kettale uue partitsiooni loomise"}, + {STRING_HDDSIZE, + "Sisesta uue partitsiooni suurus megabaitides."}, + {STRING_CREATEPARTITION, + " ENTER = Loo partitsioon ESC = Katkesta F3 = Vlju"}, + {STRING_PARTFORMAT, + "Jrgmisena vormindatakse seda partitsiooni."}, + {STRING_NONFORMATTEDPART, + "Oled valinud ReactOSi paigaldamise uuele väi vormindamata partitsioonile."}, + {STRING_INSTALLONPART, + "ReactOS paigaldatakse partitsioonile"}, + {STRING_CHECKINGPART, + "Valitud partitsiooni kontrollitakse."}, + {STRING_QUITCONTINUE, + "F3= Vlju ENTER = Jtka"}, + {STRING_REBOOTCOMPUTER, + "ENTER = Taaskivita arvuti"}, + {STRING_TXTSETUPFAILED, + "TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"}, + {STRING_COPYING, + "\xB3 Kopeerimine: %S"}, + {STRING_SETUPCOPYINGFILES, + "Failide kopeerimine..."}, + {STRING_REGHIVEUPDATE, + " Registritarude uuendamine..."}, + {STRING_IMPORTFILE, + " %S importimine..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Monitori seadistuse uuendamine registris..."}, + {STRING_LOCALESETTINGSUPDATE, + " Lokaadi seadistuse uuendamine..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " Klaviatuuriasetuse seadistuse uuendamine..."}, + {STRING_CODEPAGEINFOUPDATE, + " Kooditabeli info lisamine registrisse..."}, + {STRING_DONE, + " Valmis..."}, + {STRING_REBOOTCOMPUTER2, + " ENTER = Taaskivita arvuti"}, + {STRING_CONSOLEFAIL1, + "Konsooli ei ännestunud avada\n\n"}, + {STRING_CONSOLEFAIL2, + "Täenoliselt on probleem USB klaviatuuri kasutamises\n"}, + {STRING_CONSOLEFAIL3, + "USB klaviatuurid ei ole veel toetatud\n"}, + {STRING_FORMATTINGDISK, + "Kävaketta vormindamine"}, + {STRING_CHECKINGDISK, + "Kävaketta kontrollimine"}, + {STRING_FORMATDISK1, + " Vorminda partitsioon %S failissteemiga (kiire vormindus) "}, + {STRING_FORMATDISK2, + " Vorminda partitsioon %S failissteemiga "}, + {STRING_KEEPFORMAT, + " ra muuda praegust failissteemi "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ."}, + {STRING_HDDINFOUNK1, + "%I64u %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "%I64u %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ."}, + {STRING_HDDINFOUNK3, + "%I64u %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK4, + "%c%c Type %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "Kävaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFOUNK5, + "%c%c Tp %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu) on %S"}, + {STRING_HDDINFOUNK6, + "%6lu %s Kävaketas %lu (Port=%hu, Siin=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Loodi uus partitsioon"}, + {STRING_UNPSPACE, + " Kasutamata kettaruum %6lu %s"}, + {STRING_MAXSIZE, + "MB (maks. %lu MB)"}, + {STRING_UNFORMATTED, + "Uus (Vormindamata)"}, + {STRING_FORMATUNUSED, + "Kasutamata"}, + {STRING_FORMATUNKNOWN, + "Tundmatu"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "Klaviatuuriasetuste lisamine"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -190,7 +190,7 @@ {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"63", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, {L"0000048F", L"1252", L"437", L"10000", L"Esperanto", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, eoAALayouts }, - {L"00000425", L"1257", L"775", L"10029", L"Estonian", L"372", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, etEELayouts }, + {L"00000425", L"1252", L"775", L"10029", L"Estonian", L"372", etEEPages, etEEErrorEntries, etEEStrings, LatinFonts, etEELayouts }, {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"358", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, Added: trunk/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/et… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/et-EE.rc (added) +++ trunk/reactos/base/setup/welcome/lang/et-EE.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -1,0 +1,60 @@ +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - Tere tulemast" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "Tere tulemast operatsioonisüsteemi ReactOS.\n\nVali teema vasakult." +// IDS_CHECKTEXT "Näita seda dialoogi veel" +// IDS_CLOSETEXT "Välju" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "Paigalda ReactOS" + IDS_TOPICBUTTON1 "Sirvi CD sisu" + IDS_TOPICBUTTON2 "Välju" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "Paigalda ReactOS" + IDS_TOPICTITLE1 "Sirvi CD sisu" + IDS_TOPICTITLE2 "Välju" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "Paigalda ReactOS oma arvutisse või uuenda olemasolevat installatsiooni." + IDS_TOPICDESC1 "Sirvi CD sisu." + IDS_TOPICDESC2 "Vajuta, et väljuda." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Propchange: trunk/reactos/base/setup/welcome/lang/et-EE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -46,6 +46,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/et-EE.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" Added: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc (added) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -1,0 +1,302 @@ +/* + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT + + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Tere tulemast ReactOSi paigaldusprogrammi.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Selle programmi abil paigaldatakse ReactOS arvutisse. "\ + "Selleks peab esmalt koguma natuke andmeid sinu ja su arvuti kohta.",\ + IDC_STATIC, 115, 40, 195, 100 + LTEXT "Vajuta Järgmine, et jätkata paigaldamist.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ReactOSi arendajad sooviksid tunnustada järgmisi avatud lähtekoodiga projekte, "\ + "mida kasutati ReactOSi loomisel:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOSi litsentsiks on GPL, seega kui soovid ReactOSi (või selle osasid) "\ + "kasutada või levitada, peab see toimuma GPL litsentsiga kooskõlas", + IDC_STATIC,15,110,220,22 + PUSHBUTTON "&Vaata GPL litsentsi...",IDC_VIEWGPL,230,110,71,19 + LTEXT "Vajuta Järgmine, et jätkata paigaldamist.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Sisesta enda täisnimi ja oma firma või asutuse nimi.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "Ni&mi:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organisatsioon:", IDC_STATIC, 54, 57, 47, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Anna oma arvutile nimi. See ei tohi olla pikem kui 63 tähemärki. "\ + "Võrgus peab arvuti nimi olema unikaalne.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "&Arvuti nimi:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "Arvuti täielikuks haldamiseks luuakse administraatori konto (Administrator). ",\ + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Sisesta administraatori parool, mille pikkus on maksimaalselt 14 tähemärki.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "A&dministraatori parool:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Kinnita parool:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "Süsteemi lokaat peaks olema ühtiv nende programmide keelega, "\ + "mida soovid kasutada. Kasutaja lokaat määrab, kuidas näidatakse numbreid, "\ + "valuutat ja kuupäeva.", IDC_STATIC, 53, 7, 253, 22 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Süsteemi või kasutaja lokaadi muutmiseks vajuta Täpsusta.", + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "Tä&psusta...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "Klaviatuuriasetus määrab tähemärgid, mis klaviatuuril kirjutades ilmuvad.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Klaviatuuriasetuse muutmiseks vajuta Täp&susta.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "Täp&susta...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Kuupäev ja kellaaeg:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Ajavöönd:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Säti &suveajale üleminekul kellaaeg automaatselt", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamine" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOSi paigaldamise lõpetamine" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOSi paigalduse lõpetamine", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "ReactOS on edukalt paigaldatud.\n\n" \ + "Pärast Lõpeta vajutamist taaskäivitatakse arvuti.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Kui CD draivis on CD, siis eemalda see. Seejärel vajuta "\ + "taaskäivitamiseks Lõpeta.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU üldine avalik litsents" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "Olgu",IDOK,141,209,50,14 +END + + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Palun oota..." +FONT 8,"MS Shell Dlg 2",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Tänud" + IDS_ACKSUBTITLE "Kellele toetub ReactOS ja informatsioon litsentsi kohta" + IDS_OWNERTITLE "Tee tarkvara isikupäraseks" + IDS_OWNERSUBTITLE "Seda informatsiooni kasutatakse ReactOSi isikupäraseks tegemiseks." + IDS_COMPUTERTITLE "Arvuti nimi ja administraatori parool" + IDS_COMPUTERSUBTITLE "Arvutile tuleb anda nimi ja administraatori parool." + IDS_LOCALETITLE "Regionaalsed seaded" + IDS_LOCALESUBTITLE "ReactOSi saab kohandada erinevatele regioonidele ja keeltele vastavaks." + IDS_DATETIMETITLE "Kuupäev ja kellaaeg" + IDS_DATETIMESUBTITLE "Sisesta õige kellaaeg ja kuupäev." + IDS_PROCESSTITLE "Komponentide registreerimine" + IDS_PROCESSSUBTITLE "Palun oota..." +END + +STRINGTABLE +BEGIN + IDS_CMT_DOWNLOADER "Laadi alla ja paigalda erinevaid rakendusi" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Tarvikud" + IDS_CMT_CALC "Ava Kalkulaator" + IDS_CMT_CMD "Ava käsurida" + IDS_CMT_DEVMGMT "Ava Seadmehaldur" + IDS_CMT_EVENTVIEW "Ava Sündmuste logi" + IDS_CMT_EXPLORER "Ava sirvija" + IDS_CMT_MSCONFIG "Ava süsteemi seadistamise programm" + IDS_CMT_NOTEPAD "Ava Tekstiredaktor" + IDS_CMT_RDESKTOP "Ava Kaugarvuti" + IDS_CMT_REGEDIT "Ava Registriredaktor" + IDS_CMT_SCREENSHOT "Tee ekraanitõmmis" + IDS_CMT_SERVMAN "Ava Teenustehaldur" + IDS_CMT_WORDPAD "Ava Dokumendiredaktor" + IDS_CMT_PAINT "Ava Paint" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Mängud" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Süsteemi tööriistad" + IDS_CMT_CHARMAP "Kirjamärkide Tabel" + IDS_CMT_DXDIAG "Ava ReactX-Diagnostika programm" + IDS_CMT_KBSWITCH "Klaviatuuriasetuse Muutmine" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Ligipääsetavus" + IDS_CMT_MAGNIFY "Suurenda" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Meelelahutus" + IDS_CMT_MPLAY32 "Ava Meediamängija" + IDS_CMT_SNDVOL32 "Ava Helitugevuse Kontroll" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOSi paigaldamine" + IDS_UNKNOWN_ERROR "Tundmatu viga" + IDS_REGISTERING_COMPONENTS "Komponentide registreerimine..." + IDS_LOADLIBRARY_FAILED "LoadLibrary ebaõnnestus: " + IDS_GETPROCADDR_FAILED "GetProcAddr ebaõnnestus: " + IDS_REGSVR_FAILED "DllRegisterServer ebaõnnestus: " + IDS_DLLINSTALL_FAILED "DllInstall ebaõnnestus: " + IDS_TIMEOUT "Aeg sai registreerimise käigus otsa" + IDS_REASON_UNKNOWN "" +END + +STRINGTABLE +BEGIN + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_EVENTVIEW "Event Viewer.lnk" + IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" + IDS_SHORT_SERVICE "Service Manager.lnk" + IDS_SHORT_SNAP "SnapShot.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_SOLITAIRE "Solitaire.lnk" + IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_PAINT "Paint.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Paigaldamine ei saa jätkuda enne kui on sisestatud nimi." + IDS_WZD_SETCOMPUTERNAME "Arvuti nime ei õnnestunud seadistada." + IDS_WZD_COMPUTERNAME "Paigaldamine ei saa jätkuda enne kui on sisestatud arvuti nimi." + IDS_WZD_PASSWORDEMPTY "Sa pead parooli sisestama!" + IDS_WZD_PASSWORDMATCH "Paroolid ei klapi. Proovi paroolid uuesti sisestada." + IDS_WZD_PASSWORDCHAR "Paroolis on vigased tähemärgid. Proovi teistsugust parooli." + IDS_WZD_LOCALTIME "Kohalikku aega ei õnnestunud seadistada." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Seadmete paigaldamine..." +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Thu Jun 4 05:08:57 2009 @@ -55,6 +55,7 @@ #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/et-EE.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/id-ID.rc"

15 years, 5 months

[mjmartin] 41273: - IoGetLowerDeviceObject: Return lower device object if pending flags are not set. Noticed by Johannes Anderwald.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jun 4 04:01:43 2009 New Revision: 41273 URL: http://svn.reactos.org/svn/reactos?rev=41273&view=rev Log: - IoGetLowerDeviceObject: Return lower device object if pending flags are not set. Noticed by Johannes Anderwald. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Jun 4 04:01:43 2009 @@ -1200,10 +1200,10 @@ /* Make sure it's not getting deleted */ DeviceExtension = IoGetDevObjExtension(DeviceObject); - if (DeviceExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | + if (!(DeviceExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | - DOE_REMOVE_PROCESSED)) + DOE_REMOVE_PROCESSED))) { /* Get the Lower Device Object */ LowerDeviceObject = DeviceExtension->AttachedTo;

15 years, 5 months

[cgutman] 41272: - Export NdisFreeToBlockPool

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jun 4 03:51:35 2009 New Revision: 41272 URL: http://svn.reactos.org/svn/reactos?rev=41272&view=rev Log: - Export NdisFreeToBlockPool Modified: trunk/reactos/drivers/network/ndis/ndis.def Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Thu Jun 4 03:51:35 2009 @@ -97,6 +97,7 @@ NdisFreeBuffer@4 NdisFreeBufferPool@4 NdisFreeDmaChannel@4 +NdisFreeToBlockPool@4 NdisFreeMemory@12 NdisFreePacket@4 NdisFreePacketPool@4

15 years, 5 months

[gedmurphy] 41271: Missed this...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 3 16:32:13 2009 New Revision: 41271 URL: http://svn.reactos.org/svn/reactos?rev=41271&view=rev Log: Missed this... Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Jun 3 16:32:13 2009 @@ -90,14 +90,14 @@ if (mCurrentFile.CompareTo("unknown") != 0) { - toolStripStatusSourceLocation.Text = "Source Location:"; + toolStripStatusSourceLocation.Visible = true; toolStripStatusSourceLocationFile.Text = mCurrentFile; toolStripStatusSourceLocationLine.Text = mCurrentLine.ToString(); toolStripStatusSourceLocationColon.Visible = true; } else { - toolStripStatusSourceLocation.Text = string.Empty; + toolStripStatusSourceLocation.Visible = false; toolStripStatusSourceLocationFile.Text = string.Empty; toolStripStatusSourceLocationLine.Text = string.Empty; toolStripStatusSourceLocationColon.Visible = false; Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jun 3 16:32:13 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.55")] -[assembly: AssemblyFileVersion("1.0.2.55")] +[assembly: AssemblyVersion("1.0.2.56")] +[assembly: AssemblyFileVersion("1.0.2.56")]

15 years, 5 months

[gedmurphy] 41270: split and set the status info instead of dumping everything into a string

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 3 16:28:36 2009 New Revision: 41270 URL: http://svn.reactos.org/svn/reactos?rev=41270&view=rev Log: split and set the status info instead of dumping everything into a string Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Wed Jun 3 16:28:36 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -95,9 +95,16 @@ this.continueToolStripButton = new System.Windows.Forms.ToolStripButton(); this.breakToolStripButton = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusConnectionMode = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusConnected = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocation = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationFile = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationLine = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusSourceLocationColon = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -381,19 +388,19 @@ // externalToolsToolStripMenuItem // this.externalToolsToolStripMenuItem.Name = "externalToolsToolStripMenuItem"; - this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.externalToolsToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.externalToolsToolStripMenuItem.Text = "Exte&rnal Tools"; this.externalToolsToolStripMenuItem.Click += new System.EventHandler(this.externalToolsToolStripMenuItem_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(144, 6); // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -525,18 +532,19 @@ // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabel}); - this.statusStrip.Location = new System.Drawing.Point(0, 542); + this.toolStripStatusLabel1, + this.toolStripStatusConnectionMode, + this.toolStripStatusLabel3, + this.toolStripStatusConnected, + this.toolStripStatusSourceLocation, + this.toolStripStatusSourceLocationFile, + this.toolStripStatusSourceLocationColon, + this.toolStripStatusSourceLocationLine}); + this.statusStrip.Location = new System.Drawing.Point(0, 540); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(784, 22); + this.statusStrip.Size = new System.Drawing.Size(784, 24); this.statusStrip.TabIndex = 2; this.statusStrip.Text = "StatusStrip"; - // - // toolStripStatusLabel - // - this.toolStripStatusLabel.Name = "toolStripStatusLabel"; - this.toolStripStatusLabel.Size = new System.Drawing.Size(39, 17); - this.toolStripStatusLabel.Text = "Status"; // // dockPanel // @@ -549,52 +557,115 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(784, 490); - dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin2.DockStripGradient = dockPanelGradient4; - tabGradient8.EndColor = System.Drawing.SystemColors.Control; - tabGradient8.StartColor = System.Drawing.SystemColors.Control; - tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin2.TabGradient = tabGradient8; - dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; - tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.ActiveTabGradient = tabGradient9; - dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; - tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.InactiveTabGradient = tabGradient10; - dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; - tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; - tabGradient12.EndColor = System.Drawing.SystemColors.Control; - tabGradient12.StartColor = System.Drawing.SystemColors.Control; - tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; - dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; - tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; - tabGradient14.EndColor = System.Drawing.Color.Transparent; - tabGradient14.StartColor = System.Drawing.Color.Transparent; - tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; - dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; - dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; - this.dockPanel.Skin = dockPanelSkin2; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 4; this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(106, 19); + this.toolStripStatusLabel1.Text = "Connection Mode:"; + this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // toolStripStatusConnectionMode + // + this.toolStripStatusConnectionMode.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.toolStripStatusConnectionMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusConnectionMode.Name = "toolStripStatusConnectionMode"; + this.toolStripStatusConnectionMode.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.toolStripStatusConnectionMode.Size = new System.Drawing.Size(72, 19); + this.toolStripStatusConnectionMode.Text = "Unknown"; + this.toolStripStatusConnectionMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripStatusLabel3 + // + this.toolStripStatusLabel3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusLabel3.Name = "toolStripStatusLabel3"; + this.toolStripStatusLabel3.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.toolStripStatusLabel3.Size = new System.Drawing.Size(78, 19); + this.toolStripStatusLabel3.Text = "Connected:"; + this.toolStripStatusLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // toolStripStatusConnected + // + this.toolStripStatusConnected.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.toolStripStatusConnected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripStatusConnected.ForeColor = System.Drawing.Color.Crimson; + this.toolStripStatusConnected.Name = "toolStripStatusConnected"; + this.toolStripStatusConnected.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + this.toolStripStatusConnected.Size = new System.Drawing.Size(45, 19); + this.toolStripStatusConnected.Text = "false"; + this.toolStripStatusConnected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // toolStripStatusSourceLocation + // + this.toolStripStatusSourceLocation.Name = "toolStripStatusSourceLocation"; + this.toolStripStatusSourceLocation.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.toolStripStatusSourceLocation.Size = new System.Drawing.Size(105, 19); + this.toolStripStatusSourceLocation.Text = "Source Location:"; + // + // toolStripStatusSourceLocationFile + // + this.toolStripStatusSourceLocationFile.Name = "toolStripStatusSourceLocationFile"; + this.toolStripStatusSourceLocationFile.Size = new System.Drawing.Size(25, 19); + this.toolStripStatusSourceLocationFile.Text = "File"; + // + // toolStripStatusSourceLocationLine + // + this.toolStripStatusSourceLocationLine.Name = "toolStripStatusSourceLocationLine"; + this.toolStripStatusSourceLocationLine.Size = new System.Drawing.Size(29, 19); + this.toolStripStatusSourceLocationLine.Text = "Line"; + // + // toolStripStatusSourceLocationColon + // + this.toolStripStatusSourceLocationColon.Name = "toolStripStatusSourceLocationColon"; + this.toolStripStatusSourceLocationColon.Size = new System.Drawing.Size(10, 19); + this.toolStripStatusSourceLocationColon.Text = ":"; // // MainWindow // @@ -635,7 +706,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripMenuItem printSetupToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; - private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem fileMenu; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; @@ -678,6 +748,14 @@ private System.Windows.Forms.ToolStripMenuItem externalToolsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnectionMode; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusConnected; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocation; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationFile; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationLine; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusSourceLocationColon; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Jun 3 16:28:36 2009 @@ -73,7 +73,35 @@ void ComposeTitleString() { FocusAddress(mCurrentEip); - toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + (mCurrentFile.CompareTo("unknown") != 0 ? " - Source Location: " + mCurrentFile + ":" + mCurrentLine : ""); + + string mode; + switch (mConnectionMode) + { + case DebugConnection.Mode.ClosedMode: mode = "Closed"; break; + case DebugConnection.Mode.PipeMode: mode = "Pipe"; break; + case DebugConnection.Mode.SerialMode: mode = "Serial"; break; + case DebugConnection.Mode.SocketMode: mode = "Socket"; break; + default: mode = "Unknown"; break; + } + + toolStripStatusConnectionMode.Text = mode; + toolStripStatusConnected.ForeColor = mRunning ? Color.Green : Color.Crimson; + toolStripStatusConnected.Text = mRunning.ToString(); + + if (mCurrentFile.CompareTo("unknown") != 0) + { + toolStripStatusSourceLocation.Text = "Source Location:"; + toolStripStatusSourceLocationFile.Text = mCurrentFile; + toolStripStatusSourceLocationLine.Text = mCurrentLine.ToString(); + toolStripStatusSourceLocationColon.Visible = true; + } + else + { + toolStripStatusSourceLocation.Text = string.Empty; + toolStripStatusSourceLocationFile.Text = string.Empty; + toolStripStatusSourceLocationLine.Text = string.Empty; + toolStripStatusSourceLocationColon.Visible = false; + } } void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jun 3 16:28:36 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.54")] -[assembly: AssemblyFileVersion("1.0.2.54")] +[assembly: AssemblyVersion("1.0.2.55")] +[assembly: AssemblyFileVersion("1.0.2.55")]

15 years, 5 months

[mjmartin] 41269: - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Jun 3 13:48:33 2009 New Revision: 41269 URL: http://svn.reactos.org/svn/reactos?rev=41269&view=rev Log: - IopCreateDriver: Change MajorFunction routines back to internal function IopInvalidDeviceRequest for ones that were set to NULL in the Drivers DriverEntry. Windows does it and so shall we. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Jun 3 13:48:33 2009 @@ -1302,7 +1302,7 @@ RtlZeroMemory(DriverObject, ObjectSize); DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); - DriverObject->Flags = DRVO_BUILTIN_DRIVER; + DriverObject->Flags = DRVO_LEGACY_DRIVER;//DRVO_BUILTIN_DRIVER; DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; @@ -1398,6 +1398,14 @@ { /* Returns to caller the object */ *pDriverObject = DriverObject; + } + + /* Loop all Major Functions */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + /* Set each function that was set to NULL to internal routine */ + if (!DriverObject->MajorFunction[i]) + DriverObject->MajorFunction[i] = IopInvalidDeviceRequest; } /* Return the Status */

15 years, 5 months

[gedmurphy] 41268: - Detect when clients disconnect from the pipe server and raise an event - Reinitialize the pipe server and wait for new connections on disconnect - You can disconnect and reconnect reactos without restarting rosdbg now - Fix the read and write threads to we don't have to call the evil Thread.Abort (for kjk) - Don't enumerate the externals tools if the list is empty, fixes a NullReferenceException

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 3 13:41:47 2009 New Revision: 41268 URL: http://svn.reactos.org/svn/reactos?rev=41268&view=rev Log: - Detect when clients disconnect from the pipe server and raise an event - Reinitialize the pipe server and wait for new connections on disconnect - You can disconnect and reconnect reactos without restarting rosdbg now - Fix the read and write threads to we don't have to call the evil Thread.Abort (for kjk) - Don't enumerate the externals tools if the list is empty, fixes a NullReferenceException Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/pipe.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -173,6 +173,8 @@ #region Named Pipe Members NamedPipe mNamedPipe; + string mPipeName; + ConnectionMode mMode; Thread ReadThread; Thread WriteThread; #endregion @@ -235,13 +237,24 @@ WriteThread.Start(); } + void NamedPipe_ClientDisconectedEvent(object sender, EventArgs e) + { + Running = false; + mNamedPipe.Close(); + mNamedPipe.CreatePipe(mPipeName, mMode); + } + public void StartPipe(string pipeName, ConnectionMode mode) { + mPipeName = pipeName; + mMode = mode; + Close(); ConnectionMode = Mode.PipeMode; mNamedPipe = new NamedPipe(); mNamedPipe.ClientConnectedEvent += new EventHandler(NamedPipe_ClientConnectedEvent); + mNamedPipe.ClientDisconnectedEvent += new EventHandler(NamedPipe_ClientDisconectedEvent); mNamedPipe.PipeReceiveEvent +=new PipeReceiveEventHandler(PipeReceiveEvent); mNamedPipe.PipeErrorEvent +=new PipeErrorEventHandler(MediumErrorEvent); @@ -352,10 +365,7 @@ mNamedPipe = null; } Running = false; - if (ReadThread != null) - ReadThread.Abort(); - if (WriteThread != null) - WriteThread.Abort(); + break; } Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -27,6 +27,7 @@ private Thread waitThread; public event EventHandler ClientConnectedEvent; + public event EventHandler ClientDisconnectedEvent; public event PipeReceiveEventHandler PipeReceiveEvent; public event PipeErrorEventHandler PipeErrorEvent; @@ -129,6 +130,11 @@ if (ioStream != null) ioStream.Close(); + bClientConn = false; + + /* Wake up the write thread so it can die */ + newWriteData.Set(); + if (waitThread != null) waitThread.Abort(); } @@ -144,7 +150,7 @@ { try { - while (true) + while (bClientConn) { if (cmdList.Count > 0) { @@ -186,7 +192,7 @@ { try { - while (true) + while (bClientConn) { read = ioStream.Read(buf, 0, PIPE_SIZE); if (read > 0) @@ -196,7 +202,16 @@ } else { - /* connecion closed */ + /* + * Connecion closed! + * We'll hijack this thread and use it to set up our pipe server again. + * This thread will terminate once the connection is set up, it does not block. + */ + if (ClientDisconnectedEvent != null) + { + ClientDisconnectedEvent(this, EventArgs.Empty); + } + break; } } Modified: trunk/tools/reactosdbg/Pipe/pipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/pipe.cs?rev=… ============================================================================== --- trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/pipe.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -35,5 +35,6 @@ public interface NPipe { event EventHandler ClientConnectedEvent; + event EventHandler ClientDisconnectedEvent; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -408,14 +408,17 @@ if (i >= toolsMenu.DropDownItems.Count - 1) break; } - foreach (object o in Settings.ExternalTools) - { - ToolStripMenuItem item = new ToolStripMenuItem(o.ToString(), null, - new System.EventHandler(this.LaunchExternalToolToolStripMenuItem_Click), - ((ExternalTool)o).Path); - item.Tag = "tool"; - toolsMenu.DropDownItems.Insert(bFirst ? 0 : 1, item); - bFirst = false; + if (Settings.ExternalTools != null) + { + foreach (object o in Settings.ExternalTools) + { + ToolStripMenuItem item = new ToolStripMenuItem(o.ToString(), null, + new System.EventHandler(this.LaunchExternalToolToolStripMenuItem_Click), + ((ExternalTool)o).Path); + item.Tag = "tool"; + toolsMenu.DropDownItems.Insert(bFirst ? 0 : 1, item); + bFirst = false; + } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jun 3 13:41:47 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.53")] -[assembly: AssemblyFileVersion("1.0.2.53")] +[assembly: AssemblyVersion("1.0.2.54")] +[assembly: AssemblyFileVersion("1.0.2.54")]

15 years, 5 months

[cwittich] 41267: -remove unused app.config from project -attempt to fix external tool list

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 3 12:08:30 2009 New Revision: 41267 URL: http://svn.reactos.org/svn/reactos?rev=41267&view=rev Log: -remove unused app.config from project -attempt to fix external tool list Modified: trunk/tools/reactosdbg/RosDBG/ExtTools.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/ExtTools.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ExtTools.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ExtTools.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ExtTools.cs [iso-8859-1] Wed Jun 3 12:08:30 2009 @@ -17,6 +17,7 @@ { private ExternalToolList mExternalToolsList; private bool mUpdatingList = false; + private bool mAddRemove = false; public ExtTools() { @@ -36,11 +37,12 @@ private void btnAdd_Click(object sender, EventArgs e) { + mAddRemove = true; ExternalTool t = new ExternalTool(); - mExternalToolsList.Add(t); ToolsListBox.Items.Add(t); ToolsListBox.SelectedIndex = ToolsListBox.Items.Count - 1; btnRemove.Enabled = true; + mAddRemove = false; } private void ExtTools_Load(object sender, EventArgs e) @@ -50,7 +52,7 @@ mExternalToolsList = new ExternalToolList(); foreach (object o in mExternalToolsList) - ToolsListBox.Items.Add(o); + ToolsListBox.Items.Add((ExternalTool) o); } private void btnRemove_Click(object sender, EventArgs e) @@ -67,13 +69,16 @@ } } - private void SaveItem(ExternalTool item, int Idx) - { - mUpdatingList = true; - item.Title = txtTitle.Text; - item.Path = txtPath.Text; - ToolsListBox.Items[Idx] = item; - mUpdatingList = false; + private void SaveItem(int Idx) + { + if (!mAddRemove) + { + ExternalTool item = new ExternalTool(txtTitle.Text, txtPath.Text); + mUpdatingList = true; + ToolsListBox.Items[Idx] = item; + mExternalToolsList[Idx] = item; + mUpdatingList = false; + } } private void ToolsListBox_SelectedIndexChanged(object sender, EventArgs e) @@ -108,20 +113,19 @@ fd.Filter = "Executable files (*.exe)|*.exe"; if (fd.ShowDialog() == DialogResult.OK) { - txtPath.Text = fd.FileName; + txtPath.Text = fd.FileName; + SaveItem(ToolsListBox.SelectedIndex); } } private void txtTitle_TextChanged(object sender, EventArgs e) { - if (ToolsListBox.SelectedItem != null) - SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + SaveItem(ToolsListBox.SelectedIndex); } private void txtPath_TextChanged(object sender, EventArgs e) { - if (ToolsListBox.SelectedItem != null) - SaveItem((ExternalTool)ToolsListBox.SelectedItem, ToolsListBox.SelectedIndex); + SaveItem(ToolsListBox.SelectedIndex); } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Jun 3 12:08:30 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.51")] -[assembly: AssemblyFileVersion("1.0.2.51")] +[assembly: AssemblyVersion("1.0.2.53")] +[assembly: AssemblyFileVersion("1.0.2.53")] Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Wed Jun 3 12:08:30 2009 @@ -314,7 +314,6 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> - <None Include="app.config" /> <None Include="Resources\copyToolStripMenuItem.Image.png" /> <None Include="Resources\Run.bmp" /> <None Include="Resources\Pause.bmp" />

15 years, 5 months

← Newer
1
...
43
44
45
46
47
48
49
50
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 June 2009