Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 19146: Fix wrong test when checking arguments in SetupDiGetDriverInfoDetailW.
by hpoussin＠svn.reactos.com 11 Nov '05

11 Nov '05

Fix wrong test when checking arguments in SetupDiGetDriverInfoDetailW. It was at least preventing install of display drivers Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-11 20:07:05 UTC (rev 19145) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-11 20:15:21 UTC (rev 19146) @@ -5374,7 +5374,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DriverInfoDetailData && DriverInfoDetailData->cbSize != sizeof(SP_DRVINFO_DETAIL_DATA_W)) SetLastError(ERROR_INVALID_USER_BUFFER); - else if (DriverInfoDetailData && DriverInfoDetailData->Reserved == 0) + else if (DriverInfoData->Reserved == 0) SetLastError(ERROR_NO_DRIVER_SELECTED); else {

1 0

[greatlrd] 19145: Add opitopn do not isntall bootloarder as Bug: 961 suggest to make it easy for other people that do not want install freeldr.
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

Add opitopn do not isntall bootloarder as Bug: 961 suggest to make it easy for other people that do not want install freeldr. Modified: trunk/reactos/subsys/system/usetup/usetup.c _____ Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-11-11 19:59:38 UTC (rev 19144) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-11-11 20:07:05 UTC (rev 19145) @@ -3310,6 +3310,7 @@ SetTextXY(8, 12, "Install bootloader on the harddisk (MBR)."); SetTextXY(8, 13, "Install bootloader on a floppy disk."); + SetTextXY(8, 14, "Skip install bootloader."); InvertTextXY (8, Line, 48, 1); SetStatusText(" ENTER = Continue F3 = Quit"); @@ -3322,28 +3323,25 @@ (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { NormalTextXY (8, Line, 48, 1); - if (Line == 12) - Line = 13; - else if (Line == 13) - Line = 12; -#if 0 - else - Line++; -#endif + + Line++; + if (Line<12) Line=14; + if (Line>14) Line=12; + + + InvertTextXY (8, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { NormalTextXY (8, Line, 48, 1); - if (Line == 12) - Line = 13; - else if (Line == 13) - Line = 12; -#if 0 - else - Line--; -#endif + + Line--; + if (Line<12) Line=14; + if (Line>14) Line=12; + + InvertTextXY (8, Line, 48, 1); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -3363,6 +3361,10 @@ { return BOOT_LOADER_FLOPPY_PAGE; } + else if (Line == 14) + { + return SUCCESS_PAGE;; + } return BOOT_LOADER_PAGE; }

1 0

[weiden] 19144: fixed some more warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed some more warnings when compiled with -Wwrite-strings Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h Modified: trunk/reactos/drivers/fs/vfat/volume.c Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c Modified: trunk/reactos/lib/rossym/find.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h --- trunk/reactos/boot/freeldr/freeldr/include/inffile.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/include/inffile.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -51,7 +51,7 @@ BOOLEAN InfOpenFile (PHINF InfHandle, - PCHAR FileName, + PCSTR FileName, PULONG ErrorLine); VOID @@ -60,8 +60,8 @@ BOOLEAN InfFindFirstLine (HINF InfHandle, - PCHAR Section, - PCHAR Key, + PCSTR Section, + PCSTR Key, PINFCONTEXT Context); BOOLEAN @@ -123,7 +123,7 @@ BOOLEAN InfGetDataField (PINFCONTEXT Context, ULONG FieldIndex, - PCHAR *Data); + PCSTR *Data); #endif /* __INFCACHE_H__ */ _____ Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -210,7 +210,7 @@ static PINFCACHESECTION InfpCacheFindSection (PINFCACHE Cache, - PCHAR Name) + PCSTR Name) { PINFCACHESECTION Section = NULL; @@ -373,7 +373,7 @@ static PINFCACHELINE InfpCacheFindKeyLine (PINFCACHESECTION Section, - PCHAR Key) + PCSTR Key) { PINFCACHELINE Line; @@ -876,7 +876,7 @@ BOOLEAN InfOpenFile(PHINF InfHandle, - PCHAR FileName, + PCSTR FileName, PULONG ErrorLine) { PFILE FileHandle; @@ -991,8 +991,8 @@ BOOLEAN InfFindFirstLine (HINF InfHandle, - PCHAR Section, - PCHAR Key, + PCSTR Section, + PCSTR Key, PINFCONTEXT Context) { PINFCACHE Cache; @@ -1457,7 +1457,7 @@ BOOLEAN InfGetDataField (PINFCONTEXT Context, ULONG FieldIndex, - PCHAR *Data) + PCSTR *Data) { PINFCACHELINE CacheLine; PINFCACHEFIELD CacheField; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -60,14 +60,14 @@ } static BOOL -LoadKernel(PCHAR szSourcePath, PCHAR szFileName) +LoadKernel(PCSTR szSourcePath, PCSTR szFileName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -125,7 +125,7 @@ } static BOOL -LoadKernelSymbols(PCHAR szSourcePath, PCHAR szFileName) +LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName) { static ROSSYM_CALLBACKS FreeldrCallbacks = { @@ -180,14 +180,14 @@ } static BOOL -LoadDriver(PCHAR szSourcePath, PCHAR szFileName) +LoadDriver(PCSTR szSourcePath, PCSTR szFileName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -245,14 +245,14 @@ static BOOL -LoadNlsFile(PCHAR szSourcePath, PCHAR szFileName, PCHAR szModuleName) +LoadNlsFile(PCSTR szSourcePath, PCSTR szFileName, PCSTR szModuleName) { CHAR szFullName[256]; #ifdef USE_UI CHAR szBuffer[80]; #endif PFILE FilePointer; - PCHAR szShortName; + PCSTR szShortName; if (szSourcePath[0] != '\\') { @@ -312,8 +312,8 @@ { ULONG_PTR Base; ULONG Size; - char *SourcePath; - char *LoadOptions; + const char *SourcePath; + const char *LoadOptions; UINT i; HINF InfHandle; _____ Modified: trunk/reactos/drivers/bus/pci/pci.c --- trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/bus/pci/pci.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -342,7 +342,7 @@ PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription, PPCI_DEVICE Device) { - PWSTR Description; + PCWSTR Description; switch (Device->PciConfig.BaseClass) { _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -288,7 +288,7 @@ /* fcb.c */ PFCB -CdfsCreateFCB(PWCHAR FileName); +CdfsCreateFCB(PCWSTR FileName); VOID CdfsDestroyFCB(PFCB Fcb); _____ Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -68,7 +68,7 @@ PFCB -CdfsCreateFCB(PWSTR FileName) +CdfsCreateFCB(PCWSTR FileName) { PFCB Fcb; _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c --- trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -121,8 +121,8 @@ static NTSTATUS FsRecRegisterFs(PDRIVER_OBJECT DriverObject, - PWSTR FsName, - PWSTR RecognizerName, + PCWSTR FsName, + PCWSTR RecognizerName, ULONG DeviceType, ULONG FsType) { _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -70,7 +70,7 @@ PFCB -NtfsCreateFCB(PWSTR FileName) +NtfsCreateFCB(PCWSTR FileName) { PFCB Fcb; @@ -180,7 +180,7 @@ PFCB NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PWSTR FileName) + PCWSTR FileName) { KIRQL oldIrql; PFCB Fcb; _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-11-11 19:59:38 UTC (rev 19144) @@ -355,7 +355,7 @@ /* fcb.c */ PFCB -NtfsCreateFCB(PWCHAR FileName); +NtfsCreateFCB(PCWSTR FileName); VOID NtfsDestroyFCB(PFCB Fcb); @@ -380,7 +380,7 @@ PFCB NtfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PWSTR FileName); + PCWSTR FileName); NTSTATUS NtfsFCBInitializeCache(PVCB Vcb, _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -58,7 +58,7 @@ PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, PULONG BufferLength) { - WCHAR* pName; ULONG Length; + PCWSTR pName; ULONG Length; DPRINT("FsdGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); DPRINT("BufferLength %lu\n", *BufferLength); _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -1335,7 +1335,7 @@ Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, DevicePropertyLegacyBusType, Size, &Adapter->NdisMiniportBlock.BusType, &Size); - if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined) + if (!NT_SUCCESS(Status) || (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType == InterfaceTypeUndefined) { NdisInitUnicodeString(&ParamName, L"BusType"); NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, _____ Modified: trunk/reactos/lib/rossym/find.c --- trunk/reactos/lib/rossym/find.c 2005-11-11 19:31:53 UTC (rev 19143) +++ trunk/reactos/lib/rossym/find.c 2005-11-11 19:59:38 UTC (rev 19144) @@ -127,7 +127,7 @@ } if (FileName != NULL) { - PCHAR Name = ""; + PCSTR Name = ""; if (RosSymEntry->FileOffset != 0) { Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FileOffset; @@ -136,7 +136,7 @@ } if (FunctionName != NULL) { - PCHAR Name = ""; + PCSTR Name = ""; if (RosSymEntry->FunctionOffset != 0) { Name = (PCHAR) RosSymInfo->Strings + RosSymEntry->FunctionOffset;

1 0

[greatlrd] 19143: Greek translation by Apal (Apostolos Alexiadis grad0621@di.uoa.gr) Bug 967
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

Greek translation by Apal (Apostolos Alexiadis grad0621(a)di.uoa.gr) Bug 967 Added: trunk/reactos/subsys/system/notepad/Gr.rc Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Added: trunk/reactos/subsys/system/notepad/Gr.rc --- trunk/reactos/subsys/system/notepad/Gr.rc 2005-11-11 19:07:27 UTC (rev 19142) +++ trunk/reactos/subsys/system/notepad/Gr.rc 2005-11-11 19:31:53 UTC (rev 19143) @@ -0,0 +1,167 @@ +/* + * Notepad (Greek resources) + * + * Copyright 2005 Apostolos Alexiadis (djapal(a)gmail.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +MAIN_MENU MENU +BEGIN + POPUP "&?±¸Õ?´" + BEGIN + MENUITEM "&?¦´...", CMD_NEW + MENUITEM "&óÝ´ÚÒýß\tCtrl+O", CMD_OPEN + MENUITEM "?´ÞÌÛÕ§&¾þ\tCtrl+S", CMD_SAVE + MENUITEM "?´ÞÌÛÕ§¾þ &¨?...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "?&ÚÙ´Ò¦? ¾ÕÙ?õß?...", CMD_PAGE_SETUP + MENUITEM "&?Û¶²¨¾þ", CMD_PRINT + MENUITEM "?ÚÙ´Ò¦? ÕÛ&¶§¨¶Ì ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "©&¯´õ´?", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "?&Ýß?±Õ¾þ\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "?´Û´&Ì\tCtrl+X", CMD_CUT + MENUITEM "&?Ý¶ÚÒ±ß÷Ì\tCtrl+C", CMD_COPY + MENUITEM "&?ÚÛ³ÙÙþ¾þ\tCtrl+V", CMD_PASTE + MENUITEM "&?ÚßÒ±ß÷Ì\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&?²±Õ¾þ...\tCtrl+F", CMD_SEARCH + MENUITEM "?²±Õ¾þ Õ&³ýÕÝ´§\tF3", CMD_SEARCH_NEXT + MENUITEM "?Ý¶ÚÛß¶?¾¶ß¾þ\tCtrl+H", CMD_REPLACE + MENUITEM "&?Õ¶?Ôß¾þ ¾¶´...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "?ÚÙ´ÒÌ &?Ù¨Ý\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&?±ß/ÃýÕ±´ýþÝ?ß\tF5", CMD_TIME_DATE + END + POPUP "Í&´±ý?" + BEGIN + MENUITEM "&?ý÷?ÝÚ¾þ ýÕÒ?Ù¨Ý Ò±ßýý?Ý", CMD_WRAP + MENUITEM "&?±ßýýß¶´¾ÕÚ±?...", CMD_FONT + END + POPUP "&?ý÷?ÝÚ¾þ" + BEGIN + MENUITEM "?±ßýýÌ &Ûß¶?¾¶ß¾þ?", CMD_STATUSBAR + END + POPUP "&?´ÌÞÕÚß" + BEGIN + MENUITEM "&ðÕ±ÚÕ¸³ýÕÝß", CMD_HELP_CONTENTS + MENUITEM "&?ÝßµÌ¶þ¾þ...", CMD_HELP_SEARCH + MENUITEM "&?´ÌÞÕÚß ¾¶þ Ô´ÌÞÕÚß", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "ó&õÕÚß", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "ðÙþ±´&÷´±?Õ?", CMD_ABOUT_WINE + END +END + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?ÚÙ´Ò¦? ËÕÙ?õß?" +{ +LTEXT "&?Õ÷ßÙÌ:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&i´¾¦ÙÚõ´:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&?±Úß:", 0x144, 10, 43,160, 45 +LTEXT "&?±Ú¾¶Õ±?:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&ð?Ý¨:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&?Õ¯Ú?:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&??¶¨:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "?Û²±¨¾þ", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&?´ÌÞÕÚß", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?¨õÚÛ´´?þ¾þ" +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "?¨õÚÛ´´?þ¾þ:",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Endlines:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?Õ¶?Ôß¾þ ¾¶þ Ò±ßýýÌ" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "?±ÚÞý³? Ò±ßýýÌ?:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "?Û²±¨¾þ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "ËÕÙ?õß &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ + +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "ERROR" +STRING_WARNING, "WARNING" +STRING_INFO, "ðÙþ±´÷´±?Õ?" + +STRING_UNTITLED, "(Î¨±?? ¶?¶Ù´)" + +STRING_ALL_FILES, "?Ùß ¶ß ß±¸Õ?ß (*.*)" +STRING_TEXT_FILES_TXT, "?±¸Õ?ß ÛÕÚý¦Ý´§ (*.txt)" + +STRING_TOOLARGE, "È´ ß±¸Õ?´ '%s' Õ?ÝßÚ ´Ù² ýÕÒ?Ù´ ÒÚß ¶´ notepad.\n \ +ðß±ßÛßÙ? ¸±þ¾Úý´´ÚÕ?¾¶Õ ?ÙÙ´ ±³Ò±ßýýß ÕÕ¯Õ±Òß¾?ß? ÛÕÚý¦Ý´§." +STRING_NOTEXT, "?ÕÝ ÙþÛ¶±´Ù´ÒÌ¾ß¶Õ Û? ¶Ú. \ +\nðß±ßÛßÙ? ÙþÛ¶±´Ù´ÒÕ?¾¶Õ Û?¶Ú ÛßÚ ±´¾ßÞÕ?¾¶Õ ¯ßÝ?" +STRING_DOESNOTEXIST, "È´ ß±¸Õ?´ '%s'\nõÕÝ § ?±¸ÕÚ\n\n \ +?¦ÙÕ¶Õ Ýß õþýÚ´§±ÒÌ¾Õ¶Õ ¦Ýß Ý¦´ ß±¸Õ?´;" +STRING_NOTSAVED, "È´ ß±¸Õ?´ '%s'\n¦¸ÕÚ ¶±´´´ÚþÞÕ?\n\n \ +?¦ÙÕ¶Õ Ýß ß´ÞþÛÕ²¾Õ¶Õ ¶Ú? ßÙÙßÒ¦?;" +STRING_NOTFOUND, "È´ ß±¸Õ?´ '%s' õÕ ý´±Õ? Ýß Ô±ÕÞÕ?." +STRING_OUT_OF_MEMORY, "?ÕÝ §?±¸ÕÚ ß±ÛÕ¶Ì ýÝÌýþ ÒÚß Ýß ´Ù´ÛÙþ±¨ÞÕ? ß§¶Ì þ \ +õÚÕ±Òß¾?ß. \n?ÙÕ?¾¶Õ ý?ß Ì Õ±±Ú¾³¶Õ±Õ? Õ÷ß±ý´Ò¦? ÒÚß Ýß ß§¯þÞÕ? þ \nÕÙÕ²ÞÕ±þ \ +ýÝÌýþ." +STRING_CANNOTFIND "?Õ ý´±Õ? Ýß Ô±ÕÞÕ? ¶´ '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "Unicode" +STRING_UNICODE_BE, "Unicode (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-11-11 19:07:27 UTC (rev 19142) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-11-11 19:31:53 UTC (rev 19143) @@ -48,6 +48,7 @@ #include "Es.rc" #include "Fi.rc" #include "Fr.rc" +#include "Gr.rc" #include "Hu.rc" #include "It.rc" #include "Ja.rc"

1 0

[chorns] 19142: Display reason for failure
by chorns＠svn.reactos.com 11 Nov '05

11 Nov '05

Display reason for failure Modified: trunk/reactos/regtests/shared/regtests.c _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-11-11 18:46:59 UTC (rev 19141) +++ trunk/reactos/regtests/shared/regtests.c 2005-11-11 19:07:27 UTC (rev 19142) @@ -145,7 +145,6 @@ DisplayResult(PERFORM_TEST_ARGS* Args, LPSTR OutputBuffer) { - char Buffer[5000]; char Format[100]; if (Args->Result == TS_OK) @@ -165,7 +164,7 @@ Args->Time)); } else - sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Buffer); + sprintf(OutputBuffer, "[%s] Failed (%s)\n", Args->TestName, Args->Buffer); if (Args->OutputRoutine != NULL) (*Args->OutputRoutine)(OutputBuffer);

1 0

[gedmurphy] 19141: delete old version of sc.exe
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

delete old version of sc.exe Deleted: trunk/reactos/apps/utils/sc/

1 0

[greatlrd] 19140: sorry did break the build
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

sorry did break the build Modified: trunk/reactos/subsys/system/notepad/Ja.rc _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:39:39 UTC (rev 19139) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:46:32 UTC (rev 19140) @@ -21,8 +21,8 @@ */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) + MAIN_MENU MENU BEGIN POPUP "âtâ@âCâï(&F)"

1 0

[gedmurphy] 19139: add sc.exe to the build
by gedmurphy＠svn.reactos.com 11 Nov '05

11 Nov '05

add sc.exe to the build Modified: trunk/reactos/subsys/system/directory.xml _____ Modified: trunk/reactos/subsys/system/directory.xml --- trunk/reactos/subsys/system/directory.xml 2005-11-11 18:33:29 UTC (rev 19138) +++ trunk/reactos/subsys/system/directory.xml 2005-11-11 18:39:39 UTC (rev 19139) @@ -56,6 +56,9 @@ <directory name="rundll32"> <xi:include href="rundll32/rundll32.xml" /> </directory> +<directory name="sc"> + <xi:include href="sc/sc.xml" /> +</directory> <directory name="services"> <xi:include href="services/services.xml" /> </directory>

1 0

[greatlrd] 19138: Make notepad lang rc MSVC compatible
by greatlrd＠svn.reactos.com 11 Nov '05

11 Nov '05

Make notepad lang rc MSVC compatible Modified: trunk/reactos/subsys/system/notepad/Cs.rc Modified: trunk/reactos/subsys/system/notepad/Da.rc Modified: trunk/reactos/subsys/system/notepad/De.rc Modified: trunk/reactos/subsys/system/notepad/En.rc Modified: trunk/reactos/subsys/system/notepad/Es.rc Modified: trunk/reactos/subsys/system/notepad/Fi.rc Modified: trunk/reactos/subsys/system/notepad/Fr.rc Modified: trunk/reactos/subsys/system/notepad/Hu.rc Modified: trunk/reactos/subsys/system/notepad/It.rc Modified: trunk/reactos/subsys/system/notepad/Ja.rc Modified: trunk/reactos/subsys/system/notepad/Nl.rc Modified: trunk/reactos/subsys/system/notepad/Pl.rc Modified: trunk/reactos/subsys/system/notepad/Pt.rc Modified: trunk/reactos/subsys/system/notepad/Ru.rc Modified: trunk/reactos/subsys/system/notepad/Si.rc Modified: trunk/reactos/subsys/system/notepad/Sk.rc Modified: trunk/reactos/subsys/system/notepad/Sv.rc Modified: trunk/reactos/subsys/system/notepad/Th.rc Modified: trunk/reactos/subsys/system/notepad/Zh.rc _____ Modified: trunk/reactos/subsys/system/notepad/Cs.rc --- trunk/reactos/subsys/system/notepad/Cs.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Cs.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -24,44 +24,47 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Soubor" { - MENUITEM "&Nov²...", CMD_NEW - MENUITEM "&Otev°Ýt\tCtrl+O", CMD_OPEN - MENUITEM "&Ulo¥it\tCtrl+S", CMD_SAVE - MENUITEM "Ulo¥it j&ako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Tisk", CMD_PRINT - MENUITEM "Nas&tavenÝ strßnky...", CMD_PAGE_SETUP - MENUITEM "NastavenÝ tiskß&rny...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Konec", CMD_EXIT - } -POPUP "U&pravit" { - MENUITEM "&Zpýt\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT - MENUITEM "&KopÝrovat\tCtrl+C", CMD_COPY - MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE - MENUITEM "&Smazat\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL - MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP - MENUITEM "&PÝsmo...", CMD_FONT - } -POPUP "&Nßpovýda" { - MENUITEM "&Obsah", CMD_HELP_CONTENTS - MENUITEM "&NajÝt...", CMD_HELP_SEARCH - MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Soubor" + BEGIN + MENUITEM "&Nov²...", CMD_NEW + MENUITEM "&Otev°Ýt\tCtrl+O", CMD_OPEN + MENUITEM "&Ulo¥it\tCtrl+S", CMD_SAVE + MENUITEM "Ulo¥it j&ako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Tisk", CMD_PRINT + MENUITEM "Nas&tavenÝ strßnky...", CMD_PAGE_SETUP + MENUITEM "NastavenÝ tiskß&rny...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Konec", CMD_EXIT + END + POPUP "U&pravit" + BEGIN + MENUITEM "&Zpýt\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT + MENUITEM "&KopÝrovat\tCtrl+C", CMD_COPY + MENUITEM "&Vlo¥it\tCtrl+V", CMD_PASTE + MENUITEM "&Smazat\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH + MENUITEM "&Najdi dal?Ý\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Vybrat v?&e\tCtrl+A", CMD_SELECT_ALL + MENUITEM "?&as/Datum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Zalo&mit dlouhÚ °ßdky", CMD_WRAP + MENUITEM "&PÝsmo...", CMD_FONT + END + POPUP "&Nßpovýda" + BEGIN + MENUITEM "&Obsah", CMD_HELP_CONTENTS + MENUITEM "&NajÝt...", CMD_HELP_SEARCH + MENUITEM "&Pomoc k nßpovýdý", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Da.rc --- trunk/reactos/subsys/system/notepad/Da.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Da.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,43 +22,47 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Fil" { - MENUITEM "&Ny...", CMD_NEW - MENUITEM "?&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE - MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP - MENUITEM "&Udskriv", CMD_PRINT - MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afslut", CMD_EXIT - } -POPUP "&Rediger" { - MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Klip\tCtrl+X", CMD_CUT - MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "Sµt &ind\tCtrl+V", CMD_PASTE - MENUITEM "&Slet\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Marker &alt", CMD_SELECT_ALL - MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Automatisk &linjeskift", CMD_WRAP - } -POPUP "&S°g" { - MENUITEM "&S°g...", CMD_SEARCH - MENUITEM "&Find nµste\tF3", CMD_SEARCH_NEXT - } -POPUP "&Hjµlp" { - MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Om Notesblok", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny...", CMD_NEW + MENUITEM "?&bn\tEnter", CMD_OPEN + MENUITEM "&Gem", CMD_SAVE + MENUITEM "Gem so&m...", CMD_SAVE_AS + MENUITEM "Side&opsµtning...", CMD_PAGE_SETUP + MENUITEM "&Udskriv", CMD_PRINT + MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Afslut", CMD_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klip\tCtrl+X", CMD_CUT + MENUITEM "K&opier\tCtrl+C", CMD_COPY + MENUITEM "Sµt &ind\tCtrl+V", CMD_PASTE + MENUITEM "&Slet\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Marker &alt", CMD_SELECT_ALL + MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Automatisk &linjeskift", CMD_WRAP + END + POPUP "&S°g" + BEGIN + MENUITEM "&S°g...", CMD_SEARCH + MENUITEM "&Find nµste\tF3", CMD_SEARCH_NEXT + END + POPUP "&Hjµlp" + BEGIN + MENUITEM "&Indhold", CMD_HELP_CONTENTS + MENUITEM "&S°g efter hjµlp om...", CMD_HELP_SEARCH + MENUITEM "&Brug af Hjµlp", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Om Notesblok", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/De.rc --- trunk/reactos/subsys/system/notepad/De.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/De.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,50 +23,55 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Datei" { - MENUITEM "&Neu...", CMD_NEW - MENUITEM "Í&ffnen...", CMD_OPEN - MENUITEM "&Speichern", CMD_SAVE - MENUITEM "Speichern &unter...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP - MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", CMD_EXIT - } -POPUP "&Bearbeiten" { - MENUITEM "&R³ckgõngig\tStrg+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT - MENUITEM "&Kopieren\tStrg+C", CMD_COPY - MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE - MENUITEM "&L÷schen\tEntf", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE - MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Alles &markieren", CMD_SELECT_ALL - MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE - } -POPUP "F&ormat" { - MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftart...", CMD_FONT -} -POPUP "&Anicht" { - MENUITEM "Status&leiste", CMD_STATUSBAR -} -POPUP "&Hilfe" { - MENUITEM "&Inhalt", CMD_HELP_CONTENTS - MENUITEM "&Suchen...", CMD_HELP_SEARCH - MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Neu...", CMD_NEW + MENUITEM "Í&ffnen...", CMD_OPEN + MENUITEM "&Speichern", CMD_SAVE + MENUITEM "Speichern &unter...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP + MENUITEM "&Drucken", CMD_PRINT + MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Beenden", CMD_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&R³ckgõngig\tStrg+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT + MENUITEM "&Kopieren\tStrg+C", CMD_COPY + MENUITEM "&Einf³gen\tStrg+V", CMD_PASTE + MENUITEM "&L÷schen\tEntf", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE + MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Alles &markieren", CMD_SELECT_ALL + MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Zeilenumbruch", CMD_WRAP + MENUITEM "&Schriftart...", CMD_FONT + END + POPUP "&Anicht" + BEGIN + MENUITEM "Status&leiste", CMD_STATUSBAR + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Inhalt", CMD_HELP_CONTENTS + MENUITEM "&Suchen...", CMD_HELP_SEARCH + MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/En.rc --- trunk/reactos/subsys/system/notepad/En.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/En.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,52 +23,57 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&File" { - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "&Print", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT - } -POPUP "&Edit" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", CMD_SEARCH - MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - } -POPUP "F&ormat" { - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT -} -POPUP "&View" { - MENUITEM "Status&bar", CMD_STATUSBAR -} -POPUP "&Help" { - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&License", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY - MENUITEM "Inf&o", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New...", CMD_NEW + MENUITEM "&Open\tCtrl+O", CMD_OPEN + MENUITEM "&Save\tCtrl+S", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "&Print", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Find...\tCtrl+F", CMD_SEARCH + MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Help" + BEGIN + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&License", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "Inf&o", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -25,44 +25,47 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Archivo" { - MENUITEM "&Nuevo...", CMD_NEW - MENUITEM "&Abrir\tCtrl+O", CMD_OPEN - MENUITEM "&Guardar\tCtrl+S", CMD_SAVE - MENUITEM "Guardar &como...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "Configurar &pßgina...", CMD_PAGE_SETUP - MENUITEM "Configuraci¾n &impresora...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Salir", CMD_EXIT - } -POPUP "&Editar" { - MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "&Pegar\tCtrl+V", CMD_PASTE - MENUITEM "&Borrar\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Ajuste de lÝnea", CMD_WRAP - MENUITEM "Tipo de &letra...", CMD_FONT - } -POPUP "A&yuda" { - MENUITEM "?&ndice", CMD_HELP_CONTENTS - MENUITEM "&Buscar...", CMD_HELP_SEARCH - MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Nuevo...", CMD_NEW + MENUITEM "&Abrir\tCtrl+O", CMD_OPEN + MENUITEM "&Guardar\tCtrl+S", CMD_SAVE + MENUITEM "Guardar &como...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imprimir", CMD_PRINT + MENUITEM "Configurar &pßgina...", CMD_PAGE_SETUP + MENUITEM "Configuraci¾n &impresora...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Salir", CMD_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "&Pegar\tCtrl+V", CMD_PASTE + MENUITEM "&Borrar\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Ajuste de lÝnea", CMD_WRAP + MENUITEM "Tipo de &letra...", CMD_FONT + END + POPUP "A&yuda" + BEGIN + MENUITEM "?&ndice", CMD_HELP_CONTENTS + MENUITEM "&Buscar...", CMD_HELP_SEARCH + MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Informaci¾n...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Fi.rc --- trunk/reactos/subsys/system/notepad/Fi.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Fi.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,42 +22,45 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Tiedosto" { - MENUITEM "&Uusi...", CMD_NEW - MENUITEM "&Avaa", CMD_OPEN - MENUITEM "Ta&lleta", CMD_SAVE - MENUITEM "Talleta &nimellõ...", CMD_SAVE_AS - MENUITEM "T&ulosta", CMD_PRINT - MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP - MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Poistu", CMD_EXIT - } -POPUP "&Muokkaa" { - MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT - MENUITEM "&Kopioi\tCtrl+C", CMD_COPY - MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE - MENUITEM "P&oista\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Valitse kaikki", CMD_SELECT_ALL - MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP - } -POPUP "&Apua" { - MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS - MENUITEM "&Etsi...", CMD_HELP_SEARCH - MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Tiedosto" + BEGIN + MENUITEM "&Uusi...", CMD_NEW + MENUITEM "&Avaa", CMD_OPEN + MENUITEM "Ta&lleta", CMD_SAVE + MENUITEM "Talleta &nimellõ...", CMD_SAVE_AS + MENUITEM "T&ulosta", CMD_PRINT + MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP + MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Poistu", CMD_EXIT + END + POPUP "&Muokkaa" + BEGIN + MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT + MENUITEM "&Kopioi\tCtrl+C", CMD_COPY + MENUITEM "L&iitõ\tCtrl+V", CMD_PASTE + MENUITEM "P&oista\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Etsi...", CMD_SEARCH + MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "&Valitse kaikki", CMD_SELECT_ALL + MENUITEM "&Aika/Põivõmõõrõ\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Ka&tkaise pitkõ rivi", CMD_WRAP + END + POPUP "&Apua" + BEGIN + MENUITEM "&Sisõlt÷", CMD_HELP_CONTENTS + MENUITEM "&Etsi...", CMD_HELP_SEARCH + MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Fr.rc --- trunk/reactos/subsys/system/notepad/Fr.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Fr.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -23,44 +23,47 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU -{ - POPUP "&Fichier" { - MENUITEM "&Nouveau...", CMD_NEW - MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN - MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE - MENUITEM "Enregistrer &sous...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Im&primer", CMD_PRINT - MENUITEM "&Mise en page...", CMD_PAGE_SETUP - MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Quitter", CMD_EXIT - } -POPUP "&Edition" { - MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Co&uper\tCtrl+X", CMD_CUT - MENUITEM "&Copier\tCtrl+C", CMD_COPY - MENUITEM "C&oller\tCtrl+V", CMD_PASTE - MENUITEM "&Effacer\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Retour Ó la ligne", CMD_WRAP - MENUITEM "&Police...", CMD_FONT - } -POPUP "&Aide" { - MENUITEM "&Sommaire", CMD_HELP_CONTENTS - MENUITEM "&Rechercher...", CMD_HELP_SEARCH - MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau...", CMD_NEW + MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN + MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE + MENUITEM "Enregistrer &sous...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Im&primer", CMD_PRINT + MENUITEM "&Mise en page...", CMD_PAGE_SETUP + MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Quitter", CMD_EXIT + END + POPUP "&Edition" + BEGIN + MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Co&uper\tCtrl+X", CMD_CUT + MENUITEM "&Copier\tCtrl+C", CMD_COPY + MENUITEM "C&oller\tCtrl+V", CMD_PASTE + MENUITEM "&Effacer\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH + MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Tout &sÚlectionner\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Retour Ó la ligne", CMD_WRAP + MENUITEM "&Police...", CMD_FONT + END + POPUP "&Aide" + BEGIN + MENUITEM "&Sommaire", CMD_HELP_CONTENTS + MENUITEM "&Rechercher...", CMD_HELP_SEARCH + MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Hu.rc --- trunk/reactos/subsys/system/notepad/Hu.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Hu.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -22,43 +22,46 @@ */ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -{ - POPUP "&Fßjl" { - MENUITEM "?&j", CMD_NEW - MENUITEM "Meg&nyitßs...", CMD_OPEN - MENUITEM "&MentÚs", CMD_SAVE - MENUITEM "MentÚs mß&skÚnt...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&OldalbeßllÝtßs...", CMD_PAGE_SETUP - MENUITEM "Nyom&tatßs...", CMD_PRINT - MENUITEM "Nyomtat¾ &beßllÝtßs...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&KilÚpÚs", CMD_EXIT - } -POPUP "S&zerkesztÚs" { - MENUITEM "&Visszavonßs\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Kivß&gßs\tCtrl+X", CMD_CUT - MENUITEM "&Mßsolßs\tCtrl+C", CMD_COPY - MENUITEM "&BeillesztÚs\tCtrl+V", CMD_PASTE - MENUITEM "T÷r&lÚs\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&KeresÚs...", CMD_SEARCH - MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Az ÷sszes kijel÷lÚse", CMD_SELECT_ALL - MENUITEM "&Id§/dßtum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Hossz· sorok t÷rdelÚse", CMD_WRAP - } -POPUP "&S·g¾" { - MENUITEM "&TÚmak÷r÷k", CMD_HELP_CONTENTS - MENUITEM "&KeresÚs...", CMD_HELP_SEARCH - MENUITEM "&Hasznßlat", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Fßjl" + BEGIN + MENUITEM "?&j", CMD_NEW + MENUITEM "Meg&nyitßs...", CMD_OPEN + MENUITEM "&MentÚs", CMD_SAVE + MENUITEM "MentÚs mß&skÚnt...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&OldalbeßllÝtßs...", CMD_PAGE_SETUP + MENUITEM "Nyom&tatßs...", CMD_PRINT + MENUITEM "Nyomtat¾ &beßllÝtßs...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&KilÚpÚs", CMD_EXIT + END + POPUP "S&zerkesztÚs" + BEGIN + MENUITEM "&Visszavonßs\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Kivß&gßs\tCtrl+X", CMD_CUT + MENUITEM "&Mßsolßs\tCtrl+C", CMD_COPY + MENUITEM "&BeillesztÚs\tCtrl+V", CMD_PASTE + MENUITEM "T÷r&lÚs\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&KeresÚs...", CMD_SEARCH + MENUITEM "K÷ve&tkez§ keresÚse\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "&Az ÷sszes kijel÷lÚse", CMD_SELECT_ALL + MENUITEM "&Id§/dßtum\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Hossz· sorok t÷rdelÚse", CMD_WRAP + END + POPUP "&S·g¾" + BEGIN + MENUITEM "&TÚmak÷r÷k", CMD_HELP_CONTENTS + MENUITEM "&KeresÚs...", CMD_HELP_SEARCH + MENUITEM "&Hasznßlat", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&ormßci¾...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/It.rc --- trunk/reactos/subsys/system/notepad/It.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/It.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -25,44 +25,47 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&File" { - MENUITEM "&Nuovo", CMD_NEW - MENUITEM "&Apri...\tCtrl+O", CMD_OPEN - MENUITEM "&Salva\tCtrl+S", CMD_SAVE - MENUITEM "Salva &con nome...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Stampa", CMD_PRINT - MENUITEM "&Imposta pagina...", CMD_PAGE_SETUP - MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&sci", CMD_EXIT - } -POPUP "&Modifica" { - MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Taglia\tCtrl+X", CMD_CUT - MENUITEM "&Copia\tCtrl+C", CMD_COPY - MENUITEM "&Incolla\tCtrl+V", CMD_PASTE - MENUITEM "&Elimina\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Trova\tCtrl+F", CMD_SEARCH - MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "Seleziona &tutto\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Ora/Data\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&A campo automatico", CMD_WRAP - MENUITEM "&Imposta carattere...", CMD_FONT - } -POPUP "&Aiuto" { - MENUITEM "&Contenuti", CMD_HELP_CONTENTS - MENUITEM "&Trova...", CMD_HELP_SEARCH - MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Nuovo", CMD_NEW + MENUITEM "&Apri...\tCtrl+O", CMD_OPEN + MENUITEM "&Salva\tCtrl+S", CMD_SAVE + MENUITEM "Salva &con nome...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Stampa", CMD_PRINT + MENUITEM "&Imposta pagina...", CMD_PAGE_SETUP + MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&sci", CMD_EXIT + END + POPUP "&Modifica" + BEGIN + MENUITEM "&Anulla\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia\tCtrl+X", CMD_CUT + MENUITEM "&Copia\tCtrl+C", CMD_COPY + MENUITEM "&Incolla\tCtrl+V", CMD_PASTE + MENUITEM "&Elimina\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Trova\tCtrl+F", CMD_SEARCH + MENUITEM "&Trova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM SEPARATOR + MENUITEM "Seleziona &tutto\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Ora/Data\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&A campo automatico", CMD_WRAP + MENUITEM "&Imposta carattere...", CMD_FONT + END + POPUP "&Aiuto" + BEGIN + MENUITEM "&Contenuti", CMD_HELP_CONTENTS + MENUITEM "&Trova...", CMD_HELP_SEARCH + MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Ja.rc --- trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Ja.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -20,55 +20,61 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +#pragma code_page(932) MAIN_MENU MENU -{ - POPUP "âtâ@âCâï(&F)" { - MENUITEM "ÉVïKìýÉ¼(&N)...", CMD_NEW - MENUITEM "èJé¡(&O)\tCtrl+O", CMD_OPEN - MENUITEM "ò?æÂ(&S)\tCtrl+S", CMD_SAVE - MENUITEM "û?æOéòté»é?ò?æÂ(&A)...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "âyü[âWÉ¦ÆÞ(&T)...", CMD_PAGE_SETUP - MENUITEM "ê¾ì³(&P)", CMD_PRINT - MENUITEM "âvâèâôâ^é?É¦ÆÞ(&R)...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "ÅIù?(&X)", CMD_EXIT - } -POPUP "òÊÅW(&E)" { - MENUITEM "î?é?û?éÀ(&U)\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "ÉÏéÞÄµéÞ(&T)\tCtrl+X", CMD_CUT - MENUITEM "âRâsü[(&C)\tCtrl+C", CMD_COPY - MENUITEM "âyü[âXâg(&P)\tCtrl+V", CMD_PASTE - MENUITEM "ìÝÅ£(&D)\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT - MENUITEM "ÆuèÀ\tCtrl+H", CMD_REPLACE - MENUITEM "ìséÍê?ô«...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "æSé?æIæ(&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "ô·òtéãÄ×ìÅé?æ}ô³(&T)\tF5", CMD_TIME_DATE - } -POPUP "ÅæÄ«(&O)" { - MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP - MENUITEM "âtâHâôâg(&F)...", CMD_FONT -} -POPUP "ò\\Äª(&V)" { - MENUITEM "âXâeü[â^âX âoü[(&B)", CMD_STATUSBAR -} -POPUP "âwâïâv(&H)" { - MENUITEM "û?Äf(&C)", CMD_HELP_CONTENTS - MENUITEM "îfì§(&S)...", CMD_HELP_SEARCH - MENUITEM "âwâïâvé?Ägéóò¹(&H)", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE - MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY - MENUITEM "Å¯ò±(&O)" CMD_ABOUT_WINE - } -} +BEGIN + POPUP "âtâ@âCâï(&F)" + BEGIN + MENUITEM "ÉVïKìýÉ¼(&N)...", CMD_NEW + MENUITEM "èJé¡(&O)\tCtrl+O", CMD_OPEN + MENUITEM "ò?æÂ(&S)\tCtrl+S", CMD_SAVE + MENUITEM "û?æOéòté»é?ò?æÂ(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "âyü[âWÉ¦ÆÞ(&T)...", CMD_PAGE_SETUP + MENUITEM "ê¾ì³(&P)", CMD_PRINT + MENUITEM "âvâèâôâ^é?É¦ÆÞ(&R)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "ÅIù?(&X)", CMD_EXIT + END + POPUP "òÊÅW(&E)" + BEGIN + MENUITEM "î?é?û?éÀ(&U)\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "ÉÏéÞÄµéÞ(&T)\tCtrl+X", CMD_CUT + MENUITEM "âRâsü[(&C)\tCtrl+C", CMD_COPY + MENUITEM "âyü[âXâg(&P)\tCtrl+V", CMD_PASTE + MENUITEM "ìÝÅ£(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "îfì§(&S)\tCtrl+F", CMD_SEARCH + MENUITEM "Äfé?î¾òÔéîfì§(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "ÆuèÀ\tCtrl+H", CMD_REPLACE + MENUITEM "ìséÍê?ô«...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "æSé?æIæ(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "ô·òtéãÄ×ìÅé?æ}ô³(&T)\tF5", CMD_TIME_DATE + END + POPUP "ÅæÄ«(&O)" + BEGIN + MENUITEM "ÆÀéóìséÉ?éÞòÈéÀ(&W)", CMD_WRAP + MENUITEM "âtâHâôâg(&F)...", CMD_FONT + END + POPUP "ò\\Äª(&V)" + BEGIN + MENUITEM "âXâeü[â^âX âoü[(&B)", CMD_STATUSBAR + END + POPUP "âwâïâv(&H)" + BEGIN + MENUITEM "û?Äf(&C)", CMD_HELP_CONTENTS + MENUITEM "îfì§(&S)...", CMD_HELP_SEARCH + MENUITEM "âwâïâvé?Ägéóò¹(&H)", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "âëâCâZâôâX(&L)", CMD_LICENSE + MENUITEM "ûóò?ÅÏ(&N)", CMD_NO_WARRANTY + MENUITEM "Å¯ò±(&O)" CMD_ABOUT_WINE + END +END /* Dialog `Page setup' */ _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-11-11 18:22:07 UTC (rev 19137) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-11-11 18:33:29 UTC (rev 19138) @@ -21,44 +21,47 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&Bestand" { - MENUITEM "&Nieuw...", CMD_NEW - MENUITEM "&Openen\tCtrl+O", CMD_OPEN - MENUITEM "O&pslaan\tCtrl+p", CMD_SAVE - MENUITEM "Ops&laan als...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Afdrukken", CMD_PRINT - MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP - MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afsluiten", CMD_EXIT - } -POPUP "Be&werken" { - MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "K&nippen\tCtrl+X", CMD_CUT - MENUITEM "&KopiÙren\tCtrl+C", CMD_COPY - MENUITEM "&Plakken\tCtrl+V", CMD_PASTE - MENUITEM "&Verwijderen\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - MENUITEM SEPARATOR - MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "A&utomatische terugloop", CMD_WRAP - MENUITEM "&Lettertype instellen...", CMD_FONT - } -POPUP "&Help" { - MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS - MENUITEM "&Zoeken...", CMD_HELP_SEARCH - MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Inf&o...", CMD_ABOUT_WINE - } -} +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw...", CMD_NEW + MENUITEM "&Openen\tCtrl+O", CMD_OPEN + MENUITEM "O&pslaan\tCtrl+p", CMD_SAVE [truncated at 1000 lines; 770 more skipped]

1 0

[weiden] 19137: fixed warnings when compiled with -Wwrite-strings
by weiden＠svn.reactos.com 11 Nov '05

11 Nov '05

fixed warnings when compiled with -Wwrite-strings Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.h _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-11 18:22:07 UTC (rev 19137) @@ -32,7 +32,7 @@ #define _UNICODE -PTCHAR GetNodeTypeName(UINT NodeType) +LPCTSTR GetNodeTypeName(UINT NodeType) { switch (NodeType) { case 1: return _T("Broadcast"); @@ -43,7 +43,7 @@ } } -PTCHAR GetInterfaceTypeName(UINT InterfaceType) +LPCTSTR GetInterfaceTypeName(UINT InterfaceType) { switch (InterfaceType) { case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-11-11 18:22:07 UTC (rev 19137) @@ -523,7 +523,7 @@ * Translate port numbers into their text equivalent if there is one */ PCHAR -GetPortName(UINT Port, PCHAR Proto, CHAR Name[], INT NameLen) +GetPortName(UINT Port, PCSTR Proto, CHAR Name[], INT NameLen) { struct servent *pSrvent; _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.h --- trunk/reactos/apps/utils/net/netstat/netstat.h 2005-11-11 18:19:12 UTC (rev 19136) +++ trunk/reactos/apps/utils/net/netstat/netstat.h 2005-11-11 18:22:07 UTC (rev 19137) @@ -54,7 +54,7 @@ VOID ShowEthernetStatistics(VOID); VOID ShowTcpTable(VOID); VOID ShowUdpTable(VOID); -PCHAR GetPortName(UINT Port, PCHAR Proto, CHAR Name[PORTNAMELEN], INT NameLen); +PCHAR GetPortName(UINT Port, PCSTR Proto, CHAR Name[PORTNAMELEN], INT NameLen); PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen); VOID Usage(VOID);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs