Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[cwittich] 32062: don't try to append when there is only one parameter given See issue #3023 for more details.
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 12:00:27 2008 New Revision: 32062 URL: http://svn.reactos.org/svn/reactos?rev=32062&view=rev Log: don't try to append when there is only one parameter given See issue #3023 for more details. Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Thu Jan 31 12:00:27 2008 @@ -539,17 +539,20 @@ return 1; } - if(((_tcschr (arg[nSrc], _T('+')) != NULL) || - (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || - (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) - )) - { - /* There is a + in the source filename, this means - that there is more then one file being put into - one file. */ - bAppend = TRUE; - if(_tcschr (arg[nSrc], _T('+')) != NULL) - appendPointer = arg[nSrc]; + if (nDes != -1) /* you can only append files when there is a destination */ + { + if(((_tcschr (arg[nSrc], _T('+')) != NULL) || + (_tcschr (arg[nSrc], _T('*')) != NULL && _tcschr (arg[nDes], _T('*')) == NULL) || + (IsExistingDirectory (arg[nSrc]) && (_tcschr (arg[nDes], _T('*')) == NULL && !IsExistingDirectory (arg[nDes]))) + )) + { + /* There is a + in the source filename, this means + that there is more then one file being put into + one file. */ + bAppend = TRUE; + if(_tcschr (arg[nSrc], _T('+')) != NULL) + appendPointer = arg[nSrc]; + } } /* Reusing the number of files variable */

1 0

[cwittich] 32061: don't draw the standard UI background in minimal mode some code reduction
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 10:33:02 2008 New Revision: 32061 URL: http://svn.reactos.org/svn/reactos?rev=32061&view=rev Log: don't draw the standard UI background in minimal mode some code reduction Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c Thu Jan 31 10:33:02 2008 @@ -149,7 +149,7 @@ TuiEditBox, TuiTextToColor, TuiTextToFillStyle, - TuiFadeInBackdrop, + MiniTuiDrawBackdrop, /* no FadeIn */ TuiFadeOut, TuiDisplayMenu, MiniTuiDrawMenu, Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Thu Jan 31 10:33:02 2008 @@ -95,7 +95,6 @@ } DbgPrint((DPRINT_UI, "Initializing User Interface.\n")); - DbgPrint((DPRINT_UI, "Reading in UI settings from [Display] section.\n")); DisplayModeText[0] = '\0'; @@ -107,14 +106,7 @@ } if (IniReadSettingByName(SectionId, "MinimalUI", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMinimal = TRUE; - } - else - { - UiMinimal = FALSE; - } + UiMinimal = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } } @@ -208,47 +200,19 @@ } if (IniReadSettingByName(SectionId, "SpecialEffects", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiUseSpecialEffects = TRUE; - } - else - { - UiUseSpecialEffects = FALSE; - } + UiUseSpecialEffects = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "ShowTime", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiDrawTime = TRUE; - } - else - { - UiDrawTime = FALSE; - } + UiDrawTime = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "MenuBox", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMenuBox = TRUE; - } - else - { - UiMenuBox = FALSE; - } + UiMenuBox = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "CenterMenu", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiCenterMenu = TRUE; - } - else - { - UiCenterMenu = FALSE; - } + UiCenterMenu = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } }

1 0

[navaraf] 32060: Add NT6 members to the enumerations and structures.
by navaraf＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: navaraf Date: Thu Jan 31 02:04:37 2008 New Revision: 32060 URL: http://svn.reactos.org/svn/reactos?rev=32060&view=rev Log: Add NT6 members to the enumerations and structures. Modified: trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Thu Jan 31 02:04:37 2008 @@ -83,6 +83,7 @@ LoaderXIPRom, LoaderHALCachedMemory, LoaderLargePageFiller, + LoaderErrorLogMemory, LoaderMaximum } TYPE_OF_MEMORY; @@ -317,6 +318,11 @@ LIST_ENTRY BootApplicationPersistentData; PVOID WmdTestResult; GUID BootIdentifier; + // + // NT 6 + // + ULONG ResumePages; + PVOID DumpHeader; } LOADER_PARAMETER_EXTENSION, *PLOADER_PARAMETER_EXTENSION; // @@ -344,6 +350,51 @@ PVOID BootInfo; ULONG MachineType; } PPC_LOADER_BLOCK, *PPPC_LOADER_BLOCK; + +// +// Firmware information block (NT6+) +// + +typedef struct _VIRTUAL_EFI_RUNTIME_SERVICES +{ + ULONG_PTR GetTime; + ULONG_PTR SetTime; + ULONG_PTR GetWakeupTime; + ULONG_PTR SetWakeupTime; + ULONG_PTR SetVirtualAddressMap; + ULONG_PTR ConvertPointer; + ULONG_PTR GetVariable; + ULONG_PTR GetNextVariableName; + ULONG_PTR SetVariable; + ULONG_PTR GetNextHighMonotonicCount; + ULONG_PTR ResetSystem; + ULONG_PTR UpdateCapsule; + ULONG_PTR QueryCapsuleCapabilities; + ULONG_PTR QueryVariableInfo; +} VIRTUAL_EFI_RUNTIME_SERVICES, *PVIRTUAL_EFI_RUNTIME_SERVICES; + +typedef struct _EFI_FIRMWARE_INFORMATION +{ + ULONG FirmwareVersion; + PVIRTUAL_EFI_RUNTIME_SERVICES VirtualEfiRuntimeServices; + ULONG SetVirtualAddressMapStatus; + ULONG MissedMappingsCount; +} EFI_FIRMWARE_INFORMATION, *PEFI_FIRMWARE_INFORMATION; + +typedef struct _PCAT_FIRMWARE_INFORMATION +{ + ULONG PlaceHolder; +} PCAT_FIRMWARE_INFORMATION, *PPCAT_FIRMWARE_INFORMATION; + +typedef struct _FIRMWARE_INFORMATION_LOADER_BLOCK +{ + ULONG FirmwareTypeEfi:1; + ULONG Reserved:31; + union { + EFI_FIRMWARE_INFORMATION EfiInformation; + PCAT_FIRMWARE_INFORMATION PcatInformation; + } u; +} FIRMWARE_INFORMATION_LOADER_BLOCK, *PFIRMWARE_INFORMATION_LOADER_BLOCK; // // Loader Parameter Block @@ -377,6 +428,7 @@ IA64_LOADER_BLOCK Ia64; PPC_LOADER_BLOCK PowerPC; } u; + FIRMWARE_INFORMATION_LOADER_BLOCK FirmwareInformation; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; #endif

1 0

[dreimer] 32059: Bug 2993: slovak translation for usetup (kario@szm.sk) Bug 3020: Ukrainian translation update (temarez@yandex.ru)
by dreimer＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: dreimer Date: Wed Jan 30 20:59:13 2008 New Revision: 32059 URL: http://svn.reactos.org/svn/reactos?rev=32059&view=rev Log: Bug 2993: slovak translation for usetup (kario(a)szm.sk) Bug 3020: Ukrainian translation update (temarez(a)yandex.ru) Added: trunk/reactos/base/setup/usetup/lang/sk-SK.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Added: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (added) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Wed Jan 30 20:59:13 2008 @@ -1,0 +1,1575 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 22-01-2008 + */ + +#ifndef LANG_SK_SK_H__ +#define LANG_SK_SK_H__ + +static MUI_ENTRY skSKLanguagePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Výber jazyka.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Zvo¾te si jazyk, ktorý sa pouije poèas intalácie.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Tento jazyk bude predvoleným jazykom naintalovaného systému.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKWelcomePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Víta Vás Intalátor systému ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Tento stupeò Intalátora skopíruje operaèný systém ReactOS na Vá", + TEXT_NORMAL + }, + { + 6, + 12, + "poèítaè a pripraví druhý stupeò Intalátora.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète R pre opravu systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Stlaète L, ak chcete zobrazi licenèné podmienky systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Pre viac informácií o systéme ReactOS, navtívte prosím:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Pokraèova R = Opravi F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKIntroPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + TEXT_NORMAL + }, + { + 6, + 9, + "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + TEXT_NORMAL + }, + { + 6, + 12, + "Má nasledujúce obmedzenia:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Intalátor nepracuje s viac ako 1 primárnou oblasou na 1 disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Intalátor nevie odstráni primárnu oblas z disku,", + TEXT_NORMAL + }, + { + 8, + 15, + " pokia¾ existujú rozírené oblasti na disku.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Intalátor nevie odstráni prvú rozírenú oblas z disku,", + TEXT_NORMAL + }, + { + 8, + 17, + " pokia¾ existujú iné rozírené oblasti na disku.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Intalátor podporuje iba súborový systém FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- Kontrola súborového systému zatia¾ nie je implementovaná.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Stlaète ENTER pre naintalovanie systému ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Stlaète F3 pre skonèenie intalácie bez naintalovania systému ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKLicensePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 6, + "Licencia:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Záruka:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Návrat", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDevicePageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Zoznam niie, zobrazuje súèasné nastavenia zariadení.", + TEXT_NORMAL + }, + { + 8, + 11, + " Poèítaè:", + TEXT_NORMAL + }, + { + 8, + 12, + " Monitor:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Klávesnica:", + TEXT_NORMAL + }, + { + 8, + 14, + " Rozloenie kl.:", + TEXT_NORMAL + }, + { + 8, + 16, + " Akceptova:", + TEXT_NORMAL + }, + { + 25, + 16, "Akceptova tieto nastavenia zariadení", + TEXT_NORMAL + }, + { + 6, + 19, + "Môete zmeni hardvérové nastavenia stlaèením klávesov HORE alebo DOLE", + TEXT_NORMAL + }, + { + 6, + 20, + "pre výber poloky. Potom stlaète kláves ENTER pre výber alternatívnych", + TEXT_NORMAL + }, + { + 6, + 21, + "nastavení.", + TEXT_NORMAL + }, + { + 6, + 23, + "Ak sú vetky nastavenia správne, vyberte \"Akceptova tieto nastavenia zariadení\"", + TEXT_NORMAL + }, + { + 6, + 24, + "a stlaète ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKRepairPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor systému ReactOS je v zaèiatoènom tádiu vývoja. Zatia¾", + TEXT_NORMAL + }, + { + 6, + 9, + "nepodporuje vetky funkcie plne vyuívajúce program Intalátor.", + TEXT_NORMAL + }, + { + 6, + 12, + "Funkcie na opravu systému zatia¾ nie sú implementované.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète U pre aktualizáciu OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète R pre záchrannú konzolu.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Stlaète ESC pre návrat na hlavnú stránku.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Hlavná stránka ENTER = Retart", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY skSKComputerPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ poèítaèa, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu poèítaèa.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFlushPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systém práve overuje vetky uloené údaje na Vaom disku", + TEXT_NORMAL + }, + { + 10, + 8, + "To môe trva nieko¾ko minút", + TEXT_NORMAL + }, + { + 10, + 9, + "Keï skonèí, poèítaè sa automaticky retartuje", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKQuitPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Systém ReactOS nie je naintalovaný kompletne", + TEXT_NORMAL + }, + { + 10, + 8, + "Vyberte disketu z mechaniky A: a", + TEXT_NORMAL + }, + { + 10, + 9, + "vetky médiá CD-ROM z CD mechaník.", + TEXT_NORMAL + }, + { + 10, + 11, + "Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " Poèkajte, prosím ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDisplayPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ monitora, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu monitora.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu monitora.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKSuccessPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 10, + 6, + "Základné súèastí systému ReactOS boli úspene naintalované.", + TEXT_NORMAL + }, + { + 10, + 8, + "Vyberte disketu z mechaniky A: a", + TEXT_NORMAL + }, + { + 10, + 9, + "vetky médiá CD-ROM z CD mechaník.", + TEXT_NORMAL + }, + { + 10, + 11, + "Stlaète ENTER pre retart poèítaèa.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Retart poèítaèa", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKBootPageEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor nemôe naintalova zavádzaè systému na pevný disk Váho", //bootloader = zavádzaè systému + TEXT_NORMAL + }, + { + 6, + 9, + "poèítaèa", + TEXT_NORMAL + }, + { + 6, + 13, + "Vlote prosím, naformátovanú disketu do mechaniky A:", + TEXT_NORMAL + }, + { + 6, + 14, + "a stlaète ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY skSKSelectPartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Stlaète HORE alebo DOLE pre výber zo zoznamu poloiek.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Stlaète C pre vytvorenie novej oblasti.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Stlaète D pre vymazanie existujúcej oblasti.", + TEXT_NORMAL + }, + { + 0, + 0, + " Poèkajte, prosím ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFormatPartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Formátovanie oblasti", + TEXT_NORMAL + }, + { + 6, + 10, + "Intalátor teraz naformátuje oblas. Stlaète ENTER pre pokraèovanie.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY skSKInstallDirectoryEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor intaluje súbory systému ReactOS na zvolenú oblas.", + TEXT_NORMAL + }, + { + 6, + 9, + "Vyberte adresár kam chcete naintalova systém ReactOS:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKFileCopyEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 11, + 12, + "Poèkajte, prosím, kým Intalátor systému ReactOS skopíruje súbory", + TEXT_NORMAL + }, + { + 30, + 13, + "do Váho intalaèného prieèinka pre ReactOS.", + TEXT_NORMAL + }, + { + 20, + 14, + "Dokonèenie môe trva nieko¾ko minút.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Poèkajte, prosím ... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKBootLoaderEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Intalátor intaluje zavádzaè operaèného systému", + TEXT_NORMAL + }, + { + 8, + 12, + "Naintalova zavádzaè systému na pevný disk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Naintalova zavádzaè systému na disketu.", + TEXT_NORMAL + }, + { + 8, + 14, + "Preskoèi intaláciu zavádzaèa systému.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni typ klávesnice, ktorý má by naintalovaný.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného typu klávesnice.", + TEXT_NORMAL + }, + { + 8, + 11, + " Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " typu klávesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKLayoutSettingsEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Chcete zmeni rozloenie klávesnice, ktoré má by naintalované.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Stlaète kláves HORE alebo DOLE pre výber poadovaného rozloenia", + TEXT_NORMAL + }, + { + 8, + 11, + " klávesnice. Potom stlaète ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Stlaète kláves ESC pre návrat na predchádzajúcu stránku bez zmeny", + TEXT_NORMAL + }, + { + 8, + 14, + " rozloenia klávesnice.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY skSKPrepareCopyEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Pripravuje sa kopírovanie súborov systému ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytvára sa zoznam potrebných súborov ...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY skSKSelectFSEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 17, + "Vyberte systém súborov zo zoznamu uvedeného niie.", + 0 + }, + { + 8, + 19, + "\x07 Stlaète HORE alebo DOLE pre výber systému súborov.", + 0 + }, + { + 8, + 21, + "\x07 Stlaète ENTER pre formátovanie oblasti.", + 0 + }, + { + 8, + 23, + "\x07 Stlaète ESC pre výber inej oblasti.", + 0 + }, + { + 0, + 0, + " ENTER = Pokraèova ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKDeletePartitionEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Vybrali Ste si odstránenie oblasti", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Stlaète D pre odstránenie oblasti.", + TEXT_NORMAL + }, + { + 11, + 19, + "UPOZORNENIE: Vetky údaje na tejto oblasti sa nenávratne stratia!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Stlaète ESC pre zruenie.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Odstráni oblas ESC = Zrui F3 = Skonèi", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY skSKRegistryEntries[] = +{ + { + 4, + 3, + " Intalátor systému ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "Aktualizujú sa systémové nastavenia.", + TEXT_NORMAL + }, + { + 0, + 0, + " Vytvárajú sa poloky registrov ...", //registry hives + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR skSKErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "Systém ReactOS nie je kompletne naintalovaný na Vá\n" + "poèítaè. Ak teraz preruíte intaláciu, budete musie\n" + "spusti Intalátor znova, aby sa systém ReactOS naintaloval.\n" + "\n" + " \x07 Stlaète ENTER pre pokraèovanie v intalácii.\n" + " \x07 Stlaète F3 pre skonèenie intalácie.", + "F3 = Skonèi ENTER = Pokraèova" + }, + { + //ERROR_NO_HDD + "Intalátoru sa nepodarilo nájs pevný disk.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Intalátoru sa nepodarilo nájs jej zdrojovú mechaniku.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Intalátor zlyhal pri nahrávaní súboru TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Intalátor naiel pokodený súbor TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", //chybný (neplatný) podpis (znak, znaèka, ifra) + "ENTER = Retart poèítaèa" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_COMPUTER, + "Intalátor zlyhal pri nahrávaní zoznamu typov poèítaèov.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_DISPLAY, + "Intalátor zlyhal pri nahrávaní zoznamu nastavení monitora.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_KEYBOARD, + "Intalátor zlyhal pri nahrávaní zoznamu typov klávesníc.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Intalátor zlyhal pri nahrávaní zoznamu rozloenia klávesníc.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Vytvorenie alebo odstránenie oblastí môe znièi tabu¾ku oblastí.\n" + "\n" + " \x07 Stlaète F3 pre skonèenie intalácie." + " \x07 Stlaète ENTER pre pokraèovanie.", + "F3 = Skonèi ENTER = Pokraèova" + }, + { + //ERROR_NEW_PARTITION, + "Nemôete vytvori novú oblas\n" + "vo vnútri u existujúcej oblasti!\n" + "\n" + " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Nemôete odstráni miesto na disku, ktoré nie je oblasou!\n" + "\n" + " * Pokraèujte stlaèením ¾ubovo¾ného klávesu.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_NO_FLOPPY, + "V mechanike A: nie je disketa.", + "ENTER = Pokraèova" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_FIND_SETUPDATA, + "Intalátor zlyhal pri h¾adaní sekcie 'SetupData'\n" + "v súbore TXTSETUP.SIF.\n", + "ENTER = Retart poèítaèa" + }, + { + //ERROR_WRITE_PTABLE, + "Intalátor zlyhal pri zápise do tabuliek oblastí.\n" + "ENTER = Retart poèítaèa" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Retart poèítaèa" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Retart poèítaèa" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE skSKPages[] = +{ + { + LANGUAGE_PAGE, + skSKLanguagePageEntries + }, + { + START_PAGE, + skSKWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + skSKIntroPageEntries + }, + { + LICENSE_PAGE, + skSKLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + skSKDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + skSKRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + skSKComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + skSKDisplayPageEntries + }, + { + FLUSH_PAGE, + skSKFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + skSKSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + skSKSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + skSKFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + skSKDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + skSKInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + skSKPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + skSKFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + skSKKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + skSKBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + skSKLayoutSettingsEntries + }, + { + QUIT_PAGE, + skSKQuitPageEntries + }, + { + SUCCESS_PAGE, + skSKSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + skSKBootPageEntries + }, + { + REGISTRY_PAGE, + skSKRegistryEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/sk-SK.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Wed Jan 30 20:59:13 2008 @@ -40,6 +40,7 @@ #include "lang/it-IT.h" #include "lang/pl-PL.h" #include "lang/ru-RU.h" +#include "lang/sk-SK.h" #include "lang/sv-SE.h" #include "lang/uk-UA.h" #include "lang/lt-LT.h" @@ -233,8 +234,8 @@ L"852", L"10029", L"Slovak", - enUSPages, - enUSErrorEntries + skSKPages, + skSKErrorEntries }, { L"0000040A", Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Wed Jan 30 20:59:13 2008 @@ -627,7 +627,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Place" + IDS_NETWORKPLACE "Ìåðåæíå îòî÷åííÿ" IDS_NEWFOLDER "Íîâà ïàïêà"

1 0

[dreimer] 32058: Bug 2993: slovak translation for usetup (kario@szm.sk) Bug 3020: Ukrainian translation update (temarez@yandex.ru)
by dreimer＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: dreimer Date: Wed Jan 30 20:43:12 2008 New Revision: 32058 URL: http://svn.reactos.org/svn/reactos?rev=32058&view=rev Log: Bug 2993: slovak translation for usetup (kario(a)szm.sk) Bug 3020: Ukrainian translation update (temarez(a)yandex.ru) Modified: trunk/rosapps/downloader/lang/uk-UA.rc Modified: trunk/rosapps/downloader/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r… ============================================================================== --- trunk/rosapps/downloader/lang/uk-UA.rc (original) +++ trunk/rosapps/downloader/lang/uk-UA.rc Wed Jan 30 20:43:12 2008 @@ -62,8 +62,8 @@ IDS_DOWNLOAD_FOLDER "Downloader" IDS_UNABLECREATE_FOLDER "Íå âäàëîñÿ ñòâîðèòè ïàïêó ç òàêèì ³ì'ÿì!" IDS_UPDATE_URL "http://svn.reactos.org" - IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?" - TTT_HELPBUTTON "Îòðèìàéòè äîïîìîãó ïðî downloader" + IDS_INSTALL_DEP "%s ïîòð³áíèé ùîá çàïóñòèòè %s. Âñòàíîâèòè %s çàðàç?" + TTT_HELPBUTTON "Îòðèìàéòè äîïîìîãó ïðî çàâàíòàæóâà÷" TTT_UPDATEBUTTON "Ïîêè ùî íå äîñòóïíî" TTT_PROFBUTTON "Íàëàøòóâàòè downloader" END

1 0

[cwittich] 32057: disable Search when there is no text call SearchDialog when SearchNext is called without a string to search for
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 20:20:47 2008 New Revision: 32057 URL: http://svn.reactos.org/svn/reactos?rev=32057&view=rev Log: disable Search when there is no text call SearchDialog when SearchNext is called without a string to search for Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Wed Jan 30 20:20:47 2008 @@ -320,16 +320,16 @@ */ if (GetWindowText(Globals.hEdit, log, SIZEOF(log)) && !_tcscmp(log, dotlog)) { - static const TCHAR lf[] = _T("\r\n"); - SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); - DIALOG_EditTimeDate(); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); + static const TCHAR lf[] = _T("\r\n"); + SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); + DIALOG_EditTimeDate(); + SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lf); } SetFileName(szFileName); UpdateWindowCaption(); - + NOTEPAD_EnableSearchMenu(); done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); @@ -344,6 +344,7 @@ SetWindowText(Globals.hEdit, empty_str); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); + NOTEPAD_EnableSearchMenu(); } } @@ -783,6 +784,8 @@ { if (Globals.find.lpstrFindWhat != NULL) NOTEPAD_FindNext(&Globals.find, FALSE, TRUE); + else + DIALOG_Search(); } VOID DIALOG_Replace(VOID) Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c (original) +++ trunk/reactos/base/applications/notepad/main.c Wed Jan 30 20:20:47 2008 @@ -26,6 +26,14 @@ NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; + +VOID NOTEPAD_EnableSearchMenu() +{ + EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH, + MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); + EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH_NEXT, + MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); +} /*********************************************************************** * @@ -346,6 +354,8 @@ case WM_COMMAND: if (HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == EN_HSCROLL || HIWORD(wParam) == EN_VSCROLL) DIALOG_StatusBarUpdateCaretPos(); + if ((HIWORD(wParam) == EN_CHANGE)) + NOTEPAD_EnableSearchMenu(); NOTEPAD_MenuCommand(LOWORD(wParam)); break; Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h (original) +++ trunk/reactos/base/applications/notepad/main.h Wed Jan 30 20:20:47 2008 @@ -85,3 +85,4 @@ /* from main.c */ BOOL NOTEPAD_FindNext(FINDREPLACE *, BOOL , BOOL ); +VOID NOTEPAD_EnableSearchMenu(VOID);

1 0

[cwittich] 32056: use FILE_SHARE_READ | FILE_SHARE_WRITE to open files which are in use by another process See issue #3011 for more details.
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 19:02:49 2008 New Revision: 32056 URL: http://svn.reactos.org/svn/reactos?rev=32056&view=rev Log: use FILE_SHARE_READ | FILE_SHARE_WRITE to open files which are in use by another process See issue #3011 for more details. Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Wed Jan 30 19:02:49 2008 @@ -289,7 +289,7 @@ if (!DoCloseFile()) return; - hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) {

1 0

[cwittich] 32055: translate some GreatLordish comments in something more similar to english
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 16:46:37 2008 New Revision: 32055 URL: http://svn.reactos.org/svn/reactos?rev=32055&view=rev Log: translate some GreatLordish comments in something more similar to english Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Wed Jan 30 16:46:37 2008 @@ -32,11 +32,11 @@ if (pfnHeapVidMemAllocAligned == NULL) { - DPRINT1("Warring no pfnHeapVidMemAllocAligned"); + DPRINT1("Warning: no pfnHeapVidMemAllocAligned\n"); return 0; } - DPRINT1("Calling on dxg.sys pfnHeapVidMemAllocAligned"); + DPRINT1("Calling dxg.sys pfnHeapVidMemAllocAligned\n"); return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } @@ -55,11 +55,11 @@ if (pfnVidMemFree == NULL) { - DPRINT1("Warring no pfnVidMemFree"); + DPRINT1("Warning: no pfnVidMemFree\n"); } else { - DPRINT1("Calling on dxg.sys pfnVidMemFree"); + DPRINT1("Calling dxg.sys pfnVidMemFree\n"); pfnVidMemFree(pvmh, ptr); } } @@ -80,11 +80,11 @@ if (pfnEngAllocPrivateUserMem == NULL) { - DPRINT1("Warring no pfnEngAllocPrivateUserMem"); + DPRINT1("Warning: no pfnEngAllocPrivateUserMem\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnEngAllocPrivateUserMem"); + DPRINT1("Calling dxg.sys pfnEngAllocPrivateUserMem\n"); return pfnEngAllocPrivateUserMem(psl, cj, tag); } @@ -103,11 +103,11 @@ if (pfnEngFreePrivateUserMem == NULL) { - DPRINT1("Warring no pfnEngFreePrivateUserMem"); + DPRINT1("Warning: no pfnEngFreePrivateUserMem\n"); } else { - DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + DPRINT1("Calling dxg.sys pfnEngFreePrivateUserMem\n"); pfnEngFreePrivateUserMem(psl, pv); } } @@ -145,7 +145,7 @@ PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; DWORD retVal = DDERR_UNSUPPORTED; - DPRINT1("Calling on dxg.sys pfnEngDxIoctl"); + DPRINT1("Calling dxg.sys pfnEngDxIoctl\n"); if (pfnEngDxIoctl != NULL) { @@ -178,7 +178,7 @@ PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = (PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn; PDD_SURFACE_LOCAL retVal = NULL; - DPRINT1("Calling on dxg.sys pfnEngLockDirectDrawSurface"); + DPRINT1("Calling dxg.sys pfnEngLockDirectDrawSurface\n"); if (pfnEngLockDirectDrawSurface != NULL) { @@ -212,7 +212,7 @@ PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = (PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn; BOOL retVal = FALSE; - DPRINT1("Calling on dxg.sys pfnEngUnlockDirectDrawSurface"); + DPRINT1("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n"); if (pfnEngUnlockDirectDrawSurface != NULL) {

1 0

[fireball] 32054: - Wrap MmProbeAndLockPages invocations into SEH. See issue #2121 for more details.
by fireball＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: fireball Date: Wed Jan 30 16:33:16 2008 New Revision: 32054 URL: http://svn.reactos.org/svn/reactos?rev=32054&view=rev Log: - Wrap MmProbeAndLockPages invocations into SEH. See issue #2121 for more details. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Wed Jan 30 16:33:16 2008 @@ -1555,9 +1555,20 @@ } else if (DeviceObject->Flags & DO_DIRECT_IO) { - /* Allocate an MDL */ - Mdl = IoAllocateMdl(FileInformation, Length, FALSE, TRUE, Irp); - MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + _SEH_TRY + { + /* Allocate an MDL */ + Mdl = IoAllocateMdl(FileInformation, Length, FALSE, TRUE, Irp); + MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); + } + _SEH_END; } else { @@ -2119,9 +2130,21 @@ /* Check if we have a buffer length */ if (Length) { - /* Allocate an MDL */ - Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); - MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + _SEH_TRY + { + /* Allocate an MDL */ + Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); + MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); + } + _SEH_END; + } /* No allocation flags */ @@ -2950,6 +2973,7 @@ /* Allocating failed, clean up */ IopCleanupAfterException(FileObject, Irp, Event, NULL); Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); } _SEH_END; @@ -2967,9 +2991,20 @@ /* Check if we have a buffer length */ if (Length) { - /* Allocate an MDL */ - Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); - MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); + _SEH_TRY + { + /* Allocate an MDL */ + Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); + MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + Status = _SEH_GetExceptionCode(); + _SEH_YIELD(return Status); + } + _SEH_END; } /* No allocation flags */

1 0

[cwittich] 32053: call WriteFile with the correct Buffer instead of a NULL pointer See issue #2121 for more details.
by cwittich＠svn.reactos.org 30 Jan '08

30 Jan '08

Author: cwittich Date: Wed Jan 30 15:33:28 2008 New Revision: 32053 URL: http://svn.reactos.org/svn/reactos?rev=32053&view=rev Log: call WriteFile with the correct Buffer instead of a NULL pointer See issue #2121 for more details. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c (original) +++ trunk/reactos/base/applications/notepad/text.c Wed Jan 30 15:33:28 2008 @@ -253,6 +253,7 @@ buffer[i+0] = buffer[i+1]; buffer[i+1] = b; } + pBytes = (LPBYTE) &buffer[dwPos]; dwPos += dwByteCount / sizeof(WCHAR); break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008