Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cgutman] 35964: - Handle AllocatedResources and AllocatedResourcesTranslated separately - Fix a memory leak - Fix a handle leak
by cgutman＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cgutman Date: Fri Sep 5 14:51:18 2008 New Revision: 35964 URL: http://svn.reactos.org/svn/reactos?rev=35964&view=rev Log: - Handle AllocatedResources and AllocatedResourcesTranslated separately - Fix a memory leak - Fix a handle leak Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 5 14:51:18 2008 @@ -1293,8 +1293,7 @@ * NdisMQueryAdapterResources. */ - if (Stack->Parameters.StartDevice.AllocatedResources != NULL && - Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) + if (Stack->Parameters.StartDevice.AllocatedResources != NULL) { ResourceCount = Stack->Parameters.StartDevice.AllocatedResources->List[0]. PartialResourceList.Count; @@ -1310,24 +1309,31 @@ return STATUS_INSUFFICIENT_RESOURCES; } + RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResources, + ResourceListSize); + } + + if (Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) + { + ResourceCount = Stack->Parameters.StartDevice.AllocatedResources->List[0]. + PartialResourceList.Count; + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); + Adapter->NdisMiniportBlock.AllocatedResourcesTranslated = ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResourcesTranslated == NULL) { - ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); - Adapter->NdisMiniportBlock.AllocatedResources = NULL; ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResources, - ResourceListSize); - RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResourcesTranslated, Stack->Parameters.StartDevice.AllocatedResourcesTranslated, ResourceListSize); - } + } /* * Store the Bus Type, Bus Number and Slot information. It's used by Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Sep 5 14:51:18 2008 @@ -805,10 +805,11 @@ NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + ZwClose(DriverKeyHandle); + if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); - ZwClose(DriverKeyHandle); ExFreePool(KeyInformation); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; @@ -893,7 +894,8 @@ */ } - *Status = NDIS_STATUS_SUCCESS; + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_SUCCESS; }

1 0

[dreimer] 35963: Update the Version output if we choose another arch to show THESE Versions.
by dreimer＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: dreimer Date: Fri Sep 5 13:54:15 2008 New Revision: 35963 URL: http://svn.reactos.org/svn/reactos?rev=35963&view=rev Log: Update the Version output if we choose another arch to show THESE Versions. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Fri Sep 5 13:54:15 2008 @@ -53,8 +53,13 @@ set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= -for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +if not .%ROS_ARCH%. == .. ( + for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i + for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +) else ( + for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i + for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +) set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( @@ -69,9 +74,15 @@ :: :: Display the current version of GCC, NASM, ld and make. :: -gcc -v 2>&1 | find "gcc version" -echo gcc target^: %_ROSBE_GCCTARGET% -ld -v +if not .%ROS_ARCH%. == .. ( + %ROS_PREFIX%-gcc -v 2>&1 | find "gcc version" + echo gcc target^: %_ROSBE_GCCTARGET% + %ROS_PREFIX%-ld -v +) else ( + gcc -v 2>&1 | find "gcc version" + echo gcc target^: %_ROSBE_GCCTARGET% + ld -v +) if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else (

1 0

[dreimer] 35962: Update winfile and write to most recent Wine Version.
by dreimer＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: dreimer Date: Fri Sep 5 12:00:16 2008 New Revision: 35962 URL: http://svn.reactos.org/svn/reactos?rev=35962&view=rev Log: Update winfile and write to most recent Wine Version. Added: trunk/rosapps/applications/winfile/lang/ja-JP.rc (with props) Modified: trunk/rosapps/applications/winfile/lang/zh-CN.rc trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/write.c Added: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc (added) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Fri Sep 5 12:00:16 2008 @@ -1,0 +1,260 @@ +/* + * WineFile + * Japanese Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "t@C(&F)" { + MENUITEM "J(&O)\tEnter", ID_ACTIVATE + MENUITEM "Ú®(&M)...\tF7", ID_FILE_MOVE + MENUITEM "Rs[(&C)...\tF8", ID_FILE_COPY + MENUITEM "&In Clipboard...\tF9", 118 + MENUITEM "í(&D)\tDel", ID_FILE_DELETE + MENUITEM "¼OÌÏX(&N)...", 109 + MENUITEM "vpeB(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "³k(&O)...", 119 + MENUITEM "ð(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "Às(&R)...", ID_EXECUTE + MENUITEM "óü(&P)...", 102 + MENUITEM "ÖAt¯...", 103 + MENUITEM SEPARATOR + MENUITEM "fBNgðì¬(&E)...", 111 + MENUITEM "õ(&H)...", 104 + MENUITEM "t@CðIð(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "I¹(&X)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "I¹(&X)", ID_FILE_EXIT +#endif + } + + POPUP "fBXN(&D)" { + MENUITEM "fBXNðRs[(&C)...", 201 + MENUITEM "&Label Disk...", 202 + MENUITEM SEPARATOR + MENUITEM "fBXNðtH[}bg(&F)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Make System Disk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "lbg[NhCuÉÚ±(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "lbg[NhCuðØf(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Share as...", 254 + MENUITEM "&Remove Share...", 255 + MENUITEM SEPARATOR + MENUITEM "hCuðIð(&S)...", 251 + } + + POPUP "fBNg(&R)" { + MENUITEM "&Next Level\t+", 301 + MENUITEM "c[ðWJ(&T)\t*", 302 + MENUITEM "·×ÄðWJ(&A)\tStrg+*", 303 + MENUITEM "c[ðÜèôÞ(&T)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Mark Children", 505 + } + + POPUP "\\¦(&V)" { + MENUITEM "c[ÆfBNg(&R)", 413 + MENUITEM "c[ÌÝ(&E)", 411 + MENUITEM "fBNgÌÝ(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "ª(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "¼O(&N)", ID_VIEW_NAME + MENUITEM "·×ÄÌt@CÚ×(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "ªÚ×(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "¼OÅÀ×Ö¦(&S)", ID_VIEW_SORT_NAME + MENUITEM "íÞÅÀ×Ö¦(&B)", ID_VIEW_SORT_TYPE + MENUITEM "TCYÅÀ×Ö¦(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "útÅÀ×Ö¦(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filter by &...", ID_VIEW_FILTER + } + + POPUP "IvV(&O)" { + MENUITEM "mF(&C)...", 501 + MENUITEM "tHg(&F)...", ID_SELECT_FONT + MENUITEM "c[o[ðJX^}CY(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "c[o[(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Xe[^Xo[(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "SæÊ\\¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimize on run", 504 + MENUITEM "I¹ÉÝèðÛ¶(&S)", ID_VIEW_SAVESETTINGS + } + + + POPUP "ZLeB(&S)" { + MENUITEM "&Access...", 605 + MENUITEM "&Logging...", 606 + MENUITEM "&Owner...", 607 + } + + POPUP "EBhE(&W)" { + MENUITEM "VKEBhE(&W)", ID_WINDOW_NEW + MENUITEM "dËÄ\\¦\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "¶EÉÀ×Ä\\¦(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "XV(&R)\tF5", ID_REFRESH + } + + POPUP "wv(&H)" { + MENUITEM "wv gsbN(&H)\tF1", ID_HELP + MENUITEM "wvÌõ(&S)...\tF1", ID_HELP + MENUITEM "wvðg¤(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile ÉÂ¢Ä(&A)...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Às" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "R}h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "LZ", 2, 158, 23, 47, 14 + PUSHBUTTON "wv(&H)", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ú®æðIð" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "LZ", 2, 158, 23, 47, 14 + PUSHBUTTON "QÆ(&B)", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "By File Type" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Name:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "File Type",-1,7,23,87,56 + CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 + LTEXT "&File Name:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Full &Path:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Last Change:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Size:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributes",-1,7,79,158,46 + CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Version Information",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Applying font settings" + IDS_FONT_SEL_ERROR "Error while selecting new font." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine t@C}l[W" + IDS_ERROR "Error" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Desktop" + IDS_SHELL "VF" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "¢À" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "¼O" + IDS_COL_SIZE "TCY" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "N" + IDS_COL_ATTR "®«" + IDS_COL_SEC "ZLeB" + + IDS_FREE_SPACE_FMT "%s of %s free" +} Propchange: trunk/rosapps/applications/winfile/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/zh-CN.rc [iso-8859-1] Fri Sep 5 12:00:16 2008 @@ -1,8 +1,9 @@ /* * WineFile - * Simplified Chinese Language Support + * Simplified and Traditional Chinese Language Support * * Copyright 2002 liuspider <liuspider(a)yahoo.com> + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,140 +20,283 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "ÎÄ¼þ£¨&F£©" { - MENUITEM "´ò¿ª£¨&O£©\tEnter", ID_ACTIVATE - MENUITEM "ÒÆ¶¯£¨&M£©...\tF7", ID_FILE_MOVE - MENUITEM "¸´ÖÆ£¨&C£©...\tF8", ID_FILE_COPY - MENUITEM "Î»ÓÚ¼ôÌù°å£¨&I£©...\tF9", 118 - MENUITEM "É¾³ý£¨&D£©\tDel", ID_FILE_DELETE - MENUITEM "¸ÄÃû£¨&N£©...", 109 - MENUITEM "ÊôÐÔ£¨&I£©...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "Ñ¹Ëõ£¨&O£©...", 119 - MENUITEM "½âÑ¹Ëõ£¨&O£©...", 120 - MENUITEM SEPARATOR - MENUITEM "ÔËÐÐ£¨&R£©...", ID_EXECUTE - MENUITEM "´òÓ¡£¨&P£©...", 102 - MENUITEM "ÅäÖÃÎÄ¼þÏà¹Ø...", 103 - MENUITEM SEPARATOR - MENUITEM "½¨Á¢Ä¿Â¼£¨&E£©...", 111 - MENUITEM "²éÕÒ£¨&H£©...", 104 - MENUITEM "Ñ¡ÔñÎÄ¼þ£¨&S£©...", 116 - MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "ÍË³ö£¨&X£©\tAlt+X", ID_FILE_EXIT + POPUP "æä»¶(&F)" { + MENUITEM "æå¼(&O)\tEnter", ID_ACTIVATE + MENUITEM "ç§»å¨(&M)...\tF7", ID_FILE_MOVE + MENUITEM "å¤å¶(&C)...\tF8", ID_FILE_COPY + MENUITEM "ä½äºåªè´´æ¿(&I)...\tF9", 118 + MENUITEM "å é¤(&D)\tDel", ID_FILE_DELETE + MENUITEM "æ¹å(&N)...", 109 + MENUITEM "å±æ§(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "åç¼©(&O)...", 119 + MENUITEM "è§£åç¼©(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "è¿è¡(&R)...", ID_EXECUTE + MENUITEM "æå°(&P)...", 102 + MENUITEM "éç½®æä»¶ç¸å³...", 103 + MENUITEM SEPARATOR + MENUITEM "å»ºç«ç®å½(&E)...", 111 + MENUITEM "æ¥æ¾(&H)...", 104 + MENUITEM "éæ©æä»¶(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "éåº(&X)\tAlt+X", ID_FILE_EXIT #else - MENUITEM "ÍË³ö£¨&X£©", ID_FILE_EXIT -#endif - } - - POPUP "´ÅÅÌ£¨&D£©" { - MENUITEM "¸´ÖÆ£¨&C£©...", 201 - MENUITEM "ÃüÃû£¨&L£©...", 202 - MENUITEM SEPARATOR - MENUITEM "¸ñÊ½»¯£¨&£©...", ID_FORMAT_DISK + MENUITEM "éåº(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ç£ç(&D)" { + MENUITEM "å¤å¶(&C)...", 201 + MENUITEM "å½å(&L)...", 202 + MENUITEM SEPARATOR + MENUITEM "æ ¼å¼å(&)...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "½¨Á¢ÏµÍ³ÅÌ£¨&M£©...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Á¬½ÓÍøÂçÇý¶¯Æ÷£¨&N£©", ID_CONNECT_NETWORK_DRIVE - MENUITEM "¶Ï¿ªÍøÂçÇý¶¯Æ÷Á¬½Ó£¨&D£©", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "¹²ÏíÎª...", 254 - MENUITEM "É¾³ý¹²Ïí£¨&R£©...", 255 - MENUITEM SEPARATOR - MENUITEM "Ñ¡ÔñÇý¶¯Æ÷£¨&S£©...", 251 - } - - POPUP "Ä¿Â¼£¨&D£©" { - MENUITEM "ÏÂÒ»²ã£¨&N£©\t+", 301 - MENUITEM "Õ¹¿ª£¨&T£©\t*", 302 - MENUITEM "È«²¿Õ¹¿ª£¨&A£©\tStrg+*", 303 - MENUITEM "ÕÛµþ£¨&R£©\t-", 304 - MENUITEM SEPARATOR - MENUITEM "±ê¼Ç×ÓÄ¿Â¼£¨&M£©", 505 - } - - POPUP "ÊÓÍ¼£¨&V£©" { - MENUITEM "Ä¿Â¼Ê÷»úÆ÷ÄÚÈÝ£¨&R£©", 413 - MENUITEM "½öÏÔÊ¾Ä¿Â¼Ê÷£¨&E£©", 411 - MENUITEM "½öÏÔÊ¾Ä¿Â¼ÄÚÈÝ£¨&O£©", 412 - MENUITEM SEPARATOR - MENUITEM "·Ö¸î£¨&L£©", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "ÎÄ¼þÃûÃû£¨&N£©", ID_VIEW_NAME - MENUITEM "ÎÄ¼þÏêÏ¤ÁÐ±í£¨&A£©", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "²¿·ÖÊôÐÔ£¨&P£©...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "°´ÎÄ¼þÃûÅÅÐò£¨&S£©", ID_VIEW_SORT_NAME - MENUITEM "°´ÀàÐÍÅÅÐò£¨&B£©", ID_VIEW_SORT_TYPE - MENUITEM "°´´óÐ¡ÅÅÐò£¨&Z£©", ID_VIEW_SORT_SIZE - MENUITEM "°´ÈÕÆÚÅÅÐò£¨&D£©", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "¶¨ÖÆÅÅÐò...", ID_VIEW_FILTER - } - - POPUP "Ñ¡Ïî£¨&O£©" { - MENUITEM "È·¶¨·½Ê½£¨&C£©...", 501 - MENUITEM "×ÖÌå£¨&F£©...", ID_SELECT_FONT - MENUITEM "¶¨ÖÆ¹¤¾ßÌõ£¨&B£©...", 512 - MENUITEM SEPARATOR - MENUITEM "¹¤¾ßÌõ£¨&T£©", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Çý¶¯Æ÷ÁÐ±í£¨&D£©", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "×´Ì¬À¸£¨&S£©", ID_VIEW_STATUSBAR, CHECKED -#ifndef _NO_EXTENSIONS - MENUITEM "È«ÆÁ£¨&U£©\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 - } - - - POPUP "°²È«£¨&S£©" { - MENUITEM "·ÃÎÊ£¨&A£©...", 605 - MENUITEM "µÇÂ¼£¨&L£©...", 606 - MENUITEM "ËùÓÐÕß£¨&O£©...", 607 - } - - POPUP "´°¿Ú£¨&W£©" { - MENUITEM "ÐÂ½¨£¨&W)", ID_WINDOW_NEW - MENUITEM "²ãµþ\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ë®Æ½Æ½ÆÌ£¨&H£©", ID_WINDOW_TILE_HORZ - MENUITEM "´¹Ö±Æ½ÆÌ£¨&£©\tCtrl+F4", ID_WINDOW_TILE_VERT -#ifndef _NO_EXTENSIONS - MENUITEM "×Ô¶¯ÅÅÁÐ", ID_WINDOW_AUTOSORT -#endif - MENUITEM "×Ô¶¯ÅÅÁÐÍ¼±ê£¨&S£©", ID_WINDOW_ARRANGE - MENUITEM "Ë¢ÐÂ£¨&R£©\tF5", ID_REFRESH + MENUITEM "å»ºç«ç³»ç»ç(&M)...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "è¿æ¥ç½ç»é©±å¨å¨(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "æå¼ç½ç»é©±å¨å¨è¿æ¥(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "å±äº«ä¸º...", 254 + MENUITEM "å é¤å±äº«(&R)...", 255 + MENUITEM SEPARATOR + MENUITEM "éæ©é©±å¨å¨(&S)...", 251 + } + + POPUP "ç®å½(&D)" { + MENUITEM "ä¸ä¸å±(&N)\t+", 301 + MENUITEM "å±å¼(&T)\t*", 302 + MENUITEM "å¨é¨å±å¼(&A)\tStrg+*", 303 + MENUITEM "æå (&R)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "æ è®°åç®å½(&M)", 505 + } + + POPUP "è§å¾(&V)" { + MENUITEM "ç®å½æ æºå¨åå®¹(&R)", 413 + MENUITEM "ä»æ¾ç¤ºç®å½æ (&E)", 411 + MENUITEM "ä»æ¾ç¤ºç®å½åå®¹(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "åå²(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "æä»¶åç§°(&N)", ID_VIEW_NAME + MENUITEM "æä»¶è¯¦æåè¡¨(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "é¨åå±æ§(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "ææä»¶åæåº(&S)", ID_VIEW_SORT_NAME + MENUITEM "æç±»åæåº(&B)", ID_VIEW_SORT_TYPE + MENUITEM "æå¤§å°æåº(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "ææ¥ææåº(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "å®å¶æåº...", ID_VIEW_FILTER + } + + POPUP "éé¡¹(&O)" { + MENUITEM "ç¡®å®æ¹å¼(&C)...", 501 + MENUITEM "åä½(&F)...", ID_SELECT_FONT + MENUITEM "å®å¶å·¥å·æ¡(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "å·¥å·æ¡(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "é©±å¨å¨åè¡¨(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "ç¶ææ (&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "å¨å±(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "å¯å¨åæå°å(&M)", 504 + MENUITEM "éåºæ¶ä¿åè®¾ç½®(&S)", 511 + } + + + POPUP "å®å¨(&S)" { + MENUITEM "è®¿é®(&A)...", 605 + MENUITEM "ç»å½(&L)...", 606 + MENUITEM "ææè(&O)...", 607 + } + + POPUP "çªå£(&W)" { + MENUITEM "æ°å»º(&W)", ID_WINDOW_NEW + MENUITEM "å±å \tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "æ°´å¹³å¹³éº(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "åç´å¹³éº(&)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "èªå¨æå", ID_WINDOW_AUTOSORT +#endif + MENUITEM "èªå¨æåå¾æ (&S)", ID_WINDOW_ARRANGE + MENUITEM "å·æ°(&R)\tF5", ID_REFRESH } POPUP "&?" { - MENUITEM "°ïÖúÖ÷Ìâ£¨&H£©\tF1", ID_HELP - MENUITEM "ËÑË÷°ïÖú£¨&S£©...\tF1", ID_HELP - MENUITEM "Ê¹ÓÃ°ïÖú£¨&U£©\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&¹ØÓÚ Winefile...", ID_ABOUT + MENUITEM "å¸®å©ä¸»é¢(&H)\tF1", ID_HELP + MENUITEM "æç´¢å¸®å©(&S)...\tF1", ID_HELP + MENUITEM "ä½¿ç¨å¸®å©(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&å³äº Winefile...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÔËÐÐ" +CAPTION "è¿è¡" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "ÃüÁî£¨&C£©£º", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "å½ä»¤(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "×÷ÎªÁ¬½Ó£¨&S£©", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "È·¶¨", 1, 158, 6, 47, 14 - PUSHBUTTON "È¡Ïû", 2, 158, 23, 47, 14 - PUSHBUTTON "°ïÖú£¨&H£©", 254, 158, 43, 47, 14 + CONTROL "ä½ä¸ºè¿æ¥(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "ç¡®å®", 1, 158, 6, 47, 14 + PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 + PUSHBUTTON "å¸®å©(&H)", 254, 158, 43, 47, 14 } + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "æªæ¡(&F)" { + MENUITEM "éå(&O)\tEnter", ID_ACTIVATE + MENUITEM "ç§»å(&M)...\tF7", ID_FILE_MOVE + MENUITEM "è¤è£½(&C)...\tF8", ID_FILE_COPY + MENUITEM "ä½æ¼åªè²¼æ¿(&I)...\tF9", 118 + MENUITEM "åªé¤(&D)\tDel", ID_FILE_DELETE + MENUITEM "æ¹å(&N)...", 109 + MENUITEM "å±¬æ§(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "å£ç¸®(&O)...", 119 + MENUITEM "è§£å£ç¸®(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "å·è¡(&R)...", ID_EXECUTE + MENUITEM "åå°(&P)...", 102 + MENUITEM "éç½®æªæ¡ç¸é...", 103 + MENUITEM SEPARATOR + MENUITEM "å»ºç«ç®é(&E)...", 111 + MENUITEM "æ¥æ¾(&H)...", 104 + MENUITEM "é¸ææªæ¡(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "çµæ(&X)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "çµæ(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ç£ç¤(&D)" { + MENUITEM "è¤è£½(&C)...", 201 + MENUITEM "å½å(&L)...", 202 + MENUITEM SEPARATOR + MENUITEM "æ ¼å¼å(&)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "å»ºç«ç³»çµ±ç¤(&M)...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "é£æ¥ç¶²è·¯å²åæ§½(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "æ·éç¶²è·¯å²åæ§½é£æ¥(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "å±äº«çº...", 254 + MENUITEM "åªé¤å±äº«(&R)...", 255 + MENUITEM SEPARATOR + MENUITEM "é¸æå²åæ§½(&S)...", 251 + } + + POPUP "ç®é(&D)" { + MENUITEM "ä¸ä¸å±¤(&N)\t+", 301 + MENUITEM "å±é(&T)\t*", 302 + MENUITEM "å¨é¨å±é(&A)\tStrg+*", 303 + MENUITEM "æç(&R)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "æ¨è¨åç®é(&M)", 505 + } + + POPUP "æª¢è¦(&V)" { + MENUITEM "ç®éæ¨¹æ©å¨å§å®¹(&R)", 413 + MENUITEM "åé¡¯ç¤ºç®éæ¨¹(&E)", 411 + MENUITEM "åé¡¯ç¤ºç®éå§å®¹(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "åå²(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "æªæ¡åç¨±(&N)", ID_VIEW_NAME + MENUITEM "æªæ¡è©³æåè¡¨(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "é¨åå±¬æ§(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "ææªæ¡åæå(&S)", ID_VIEW_SORT_NAME + MENUITEM "æé¡åæå(&B)", ID_VIEW_SORT_TYPE + MENUITEM "æå¤§å°æå(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "ææ¥ææå(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "å®è£½æå...", ID_VIEW_FILTER + } + + POPUP "é¸é (&O)" { + MENUITEM "ç¢ºå®æ¹å¼(&C)...", 501 + MENUITEM "åå(&F)...", ID_SELECT_FONT + MENUITEM "å®è£½å·¥å·æ¢(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "å·¥å·æ¢(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "å²åæ§½åè¡¨(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "çææ¬(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "å¨å±(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "ååå¾æå°å(&M)", 504 + MENUITEM "çµææå²åè¨å®(&S)", 511 + } + + + POPUP "å®å¨(&S)" { + MENUITEM "è¨ªå(&A)...", 605 + MENUITEM "ç»é(&L)...", 606 + MENUITEM "ææè(&O)...", 607 + } + + POPUP "çªå£(&W)" { + MENUITEM "æ°å»º(&W)", ID_WINDOW_NEW + MENUITEM "å±¤ç\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "æ°´å¹³å¹³éª(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "åç´å¹³éª(&)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "èªåæå", ID_WINDOW_AUTOSORT +#endif + MENUITEM "èªåæååæ¨(&S)", ID_WINDOW_ARRANGE + MENUITEM "å·æ°(&R)\tF5", ID_REFRESH + } + + POPUP "&?" { + MENUITEM "å¹«å©ä¸»é¡(&H)\tF1", ID_HELP + MENUITEM "æç´¢å¹«å©(&S)...\tF1", ID_HELP + MENUITEM "ä½¿ç¨å¹«å©(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&éæ¼ Winefile...", ID_ABOUT + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "å·è¡" +FONT 8, "PMingLiu" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "æä»¤(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "ä½çºé£æ¥(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "ç¢ºå®", 1, 158, 6, 47, 14 + PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 + PUSHBUTTON "å¹«å©(&H)", 254, 158, 43, 47, 14 +} + +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Fri Sep 5 12:00:16 2008 @@ -63,6 +63,7 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Fri Sep 5 12:00:16 2008 @@ -867,20 +867,14 @@ static LPITEMIDLIST get_to_absolute_pidl(Entry* entry, HWND hwnd) { if (entry->up && entry->up->etype==ET_SHELL) { - IShellFolder* folder = entry->up->folder; - WCHAR buffer[MAX_PATH]; - - HRESULT hr = path_from_pidlW(folder, entry->pidl, buffer, MAX_PATH); - - if (SUCCEEDED(hr)) { - LPITEMIDLIST pidl; - ULONG len; - - hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); - - if (SUCCEEDED(hr)) - return pidl; + LPITEMIDLIST idl = NULL; + + while (entry->up) { + idl = ILCombine(ILClone(entry->pidl), idl); + entry = entry->up; } + + return idl; } else if (entry->etype == ET_WINDOWS) { TCHAR path[MAX_PATH]; @@ -2708,7 +2702,7 @@ SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); /* no change? */ - if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths))) + if (!anyway && !memcmp(orgWidths, pane->widths, sizeof(orgWidths))) return FALSE; /* don't move, if only collapsing an entry */ Modified: trunk/rosapps/applications/write/write.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/write.c… ============================================================================== --- trunk/rosapps/applications/write/write.c [iso-8859-1] (original) +++ trunk/rosapps/applications/write/write.c [iso-8859-1] Fri Sep 5 12:00:16 2008 @@ -40,7 +40,7 @@ lstrcatW(path, SZ_BACKSLASH); lstrcatW(path, SZ_WORDPAD); - stinf.cb = sizeof(STARTUPINFO); + stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) @@ -48,7 +48,7 @@ return 0; failed: - LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + LoadStringW(GetModuleHandleW(NULL), IDS_FAILED, path, MAX_PATH); MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); return 1; }

1 0

[dreimer] 35961: Sync winhlp32, wordpad and xcopy with wine.
by dreimer＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: dreimer Date: Fri Sep 5 11:34:20 2008 New Revision: 35961 URL: http://svn.reactos.org/svn/reactos?rev=35961&view=rev Log: Sync winhlp32, wordpad and xcopy with wine. Added: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc (with props) trunk/reactos/base/applications/wordpad/Ja.rc (with props) trunk/reactos/base/applications/wordpad/Zh.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/base/applications/winhlp32/hlpfile.h trunk/reactos/base/applications/winhlp32/lang/no-NO.rc trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -120,7 +120,7 @@ } /* Preinitialize flags based on COPYCMD */ - if (GetEnvironmentVariable(COPYCMD, copyCmd, MAXSTRING)) { + if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { if (wcsstr(copyCmd, PROMPTSTR1) != NULL || wcsstr(copyCmd, PROMPTSTR2) != NULL) { flags |= OPT_NOPROMPT; @@ -177,7 +177,7 @@ OPT_REMOVEARCH; break; /* E can be /E or /EXCLUDE */ - case 'E': if (CompareString (LOCALE_USER_DEFAULT, + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, &argvW[0][1], 8, EXCLUDE, -1) == 2) { @@ -221,10 +221,10 @@ /* Debug info: */ FileTimeToSystemTime (&dateRange, &st); - GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)); - GetTimeFormat (0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)); + GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, + sizeof(datestring)/sizeof(WCHAR)); + GetTimeFormatW(0, TIME_NOSECONDS, &st, + NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); WINE_TRACE("Date being used is: %s %s\n", wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); @@ -323,7 +323,7 @@ /* * Validate the source, expanding to full path ensuring it exists */ - if (GetFullPathName(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { + if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); return RC_INITERROR; } @@ -351,7 +351,7 @@ if (starPos || questPos) { attribs = 0x00; /* Ensures skips invalid or directory check below */ } else { - attribs = GetFileAttributes(actualsource); + attribs = GetFileAttributesW(actualsource); } if (attribs == INVALID_FILE_ATTRIBUTES) { @@ -393,7 +393,7 @@ lstrcpyW(spec, suppliedsource+2); } else { WCHAR curdir[MAXSTRING]; - GetCurrentDirectory (sizeof(curdir), curdir); + GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); stem[0] = curdir[0]; stem[1] = curdir[1]; stem[2] = 0x00; @@ -418,13 +418,13 @@ /* * Validate the source, expanding to full path ensuring it exists */ - if (GetFullPathName(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { + if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); return RC_INITERROR; } /* Destination is either a directory or a file */ - attribs = GetFileAttributes(actualdestination); + attribs = GetFileAttributesW(actualdestination); if (attribs == INVALID_FILE_ATTRIBUTES) { @@ -500,7 +500,7 @@ WCHAR *deststem, WCHAR *destspec, DWORD flags) { - WIN32_FIND_DATA *finddata; + WIN32_FIND_DATAW *finddata; HANDLE h; BOOL findres = TRUE; WCHAR *inputpath, *outputpath; @@ -510,7 +510,7 @@ int ret = 0; /* Allocate some working memory on heap to minimize footprint */ - finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); + finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATAW)); inputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); outputpath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); @@ -519,7 +519,7 @@ lstrcatW(inputpath, srcspec); /* Search 1 - Look for matching files */ - h = FindFirstFile(inputpath, finddata); + h = FindFirstFileW(inputpath, finddata); while (h != INVALID_HANDLE_VALUE && findres) { skipFile = FALSE; @@ -587,7 +587,7 @@ /* If just /D supplied, only overwrite if src newer than dest */ if (!skipFile && (flags & OPT_DATENEWER) && (destAttribs != INVALID_FILE_ATTRIBUTES)) { - HANDLE h = CreateFile(copyTo, GENERIC_READ, FILE_SHARE_READ, + HANDLE h = CreateFileW(copyTo, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h != INVALID_HANDLE_VALUE) { @@ -611,7 +611,7 @@ /* Uppercase source filename */ lstrcpyW(copyFromUpper, copyFrom); - CharUpperBuff(copyFromUpper, lstrlenW(copyFromUpper)); + CharUpperBuffW(copyFromUpper, lstrlenW(copyFromUpper)); /* Loop through testing each exclude line */ while (pos) { @@ -703,13 +703,13 @@ write protection */ if ((destAttribs & FILE_ATTRIBUTE_READONLY) && (flags & OPT_REPLACEREAD)) { - SetFileAttributes(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY); + SetFileAttributesW(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY); } copiedFile = TRUE; if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { /* Skip copy */ - } else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { + } else if (CopyFileW(copyFrom, copyTo, FALSE) == 0) { DWORD error = GetLastError(); XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPYFAIL), @@ -728,7 +728,7 @@ if (!skipFile) { if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && (flags & OPT_REMOVEARCH)) { - SetFileAttributes(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); } filesCopied++; } @@ -736,7 +736,7 @@ } /* Find next file */ - findres = FindNextFile(h, finddata); + findres = FindNextFileW(h, finddata); } FindClose(h); @@ -747,7 +747,7 @@ findres = TRUE; WINE_TRACE("Processing subdirs with spec: %s\n", wine_dbgstr_w(inputpath)); - h = FindFirstFile(inputpath, finddata); + h = FindFirstFileW(inputpath, finddata); while (h != INVALID_HANDLE_VALUE && findres) { /* Only looking for dirs */ @@ -778,7 +778,7 @@ } /* Find next one */ - findres = FindNextFile(h, finddata); + findres = FindNextFileW(h, finddata); } } @@ -809,7 +809,7 @@ while ((len = lstrlenW(new_path)) && new_path[len - 1] == '\\') new_path[len - 1] = 0; - while (!CreateDirectory(new_path,NULL)) + while (!CreateDirectoryW(new_path,NULL)) { WCHAR *slash; DWORD last_error = GetLastError(); @@ -899,7 +899,7 @@ } /* Process line by line */ - while (fgetws(buffer, sizeof(buffer), inFile) != NULL) { + while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); @@ -914,7 +914,7 @@ thisEntry->name = HeapAlloc(GetProcessHeap(), 0, (length * sizeof(WCHAR))+1); lstrcpyW(thisEntry->name, buffer); - CharUpperBuff(thisEntry->name, length); + CharUpperBuffW(thisEntry->name, length); WINE_TRACE("Read line : '%s'\n", wine_dbgstr_w(thisEntry->name)); } } @@ -940,7 +940,7 @@ static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; - if (!LoadString(GetModuleHandle(NULL), id, msg, sizeof(msg))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); lstrcpyW(msg, failedMsg); } @@ -955,10 +955,10 @@ LPWSTR lpMsgBuf; int status; - status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, - (LPTSTR) &lpMsgBuf, 0, NULL); + (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", err, GetLastError()); Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -63,6 +63,7 @@ static BOOL HLPFILE_GetContext(HLPFILE*); static BOOL HLPFILE_GetKeywords(HLPFILE*); static BOOL HLPFILE_GetMap(HLPFILE*); +static BOOL HLPFILE_GetTOMap(HLPFILE*); static BOOL HLPFILE_AddPage(HLPFILE*, const BYTE*, const BYTE*, unsigned, unsigned); static BOOL HLPFILE_SkipParagraph(HLPFILE*, const BYTE*, const BYTE*, unsigned*); static void HLPFILE_Uncompress2(HLPFILE*, const BYTE*, const BYTE*, BYTE*, const BYTE*); @@ -70,23 +71,6 @@ static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE* dst, unsigned dstsz); static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile); -/*********************************************************************** - * - * HLPFILE_PageByNumber - */ -static HLPFILE_PAGE *HLPFILE_PageByNumber(HLPFILE* hlpfile, UINT wNum) -{ - HLPFILE_PAGE *page; - UINT temp = wNum; - - WINE_TRACE("<%s>[%u]\n", hlpfile->lpszPath, wNum); - - for (page = hlpfile->first_page; page && temp; page = page->next) temp--; - if (!page) - WINE_ERR("Page of number %u not found in file %s\n", wNum, hlpfile->lpszPath); - return page; -} - /****************************************************************** * HLPFILE_PageByOffset * @@ -153,8 +137,8 @@ /* For win 3.0 files hash values are really page numbers */ if (hlpfile->version <= 16) { - *relative = 0; - return HLPFILE_PageByNumber(hlpfile, lHash); + if (lHash >= hlpfile->wTOMapLen) return NULL; + return HLPFILE_PageByOffset(hlpfile, hlpfile->TOMap[lHash], relative); } ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); @@ -282,7 +266,7 @@ OFSTRUCT ofs; BYTE* buf; DWORD ref = 0x0C; - unsigned index, old_index, offset, len, offs; + unsigned index, old_index, offset, len, offs, topicoffset; hFile = OpenFile(lpszPath, &ofs, OF_READ); if (hFile == HFILE_ERROR) return FALSE; @@ -292,6 +276,8 @@ if (!ret) return FALSE; if (!HLPFILE_SystemCommands(hlpfile)) return FALSE; + + if (hlpfile->version <= 16 && !HLPFILE_GetTOMap(hlpfile)) return FALSE; /* load phrases support */ if (!HLPFILE_UncompressLZ77_Phrases(hlpfile)) @@ -336,7 +322,11 @@ switch (buf[0x14]) { case 0x02: - if (!HLPFILE_AddPage(hlpfile, buf, end, ref, index * 0x8000L + offs)) return FALSE; + if (hlpfile->version <= 16) + topicoffset = ref + index * 12; + else + topicoffset = index * 0x8000 + offs; + if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; break; case 0x01: @@ -430,6 +420,19 @@ page->browse_bwd = GET_UINT(buf, 0x19); page->browse_fwd = GET_UINT(buf, 0x1D); + + if (hlpfile->version <= 16) + { + if (page->browse_bwd == 0xFFFF || page->browse_bwd == 0xFFFFFFFF) + page->browse_bwd = 0xFFFFFFFF; + else + page->browse_bwd = hlpfile->TOMap[page->browse_bwd]; + + if (page->browse_fwd == 0xFFFF || page->browse_fwd == 0xFFFFFFFF) + page->browse_fwd = 0xFFFFFFFF; + else + page->browse_fwd = hlpfile->TOMap[page->browse_fwd]; + } WINE_TRACE("Added page[%d]: title='%s' %08x << %08x >> %08x\n", page->wNumber, page->lpszTitle, @@ -1290,12 +1293,14 @@ WINE_TRACE("Changing font to %d\n", font); format += 3; + /* Font size in hlpfile is given in the same units as + rtf control word \fs uses (half-points). */ switch (rd->font_scale) { - case 0: fs = (4 * page->file->fonts[font].LogFont.lfHeight - 13) / 5; break; + case 0: fs = page->file->fonts[font].LogFont.lfHeight - 4; break; default: - case 1: fs = (4 * page->file->fonts[font].LogFont.lfHeight - 3) / 5; break; - case 2: fs = (4 * page->file->fonts[font].LogFont.lfHeight + 17) / 5; break; + case 1: fs = page->file->fonts[font].LogFont.lfHeight; break; + case 2: fs = page->file->fonts[font].LogFont.lfHeight + 4; break; } /* FIXME: missing at least colors, also bold attribute looses information */ @@ -1430,7 +1435,7 @@ case 0xE1: WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, - page->file->lpszPath, -1, GET_UINT(format, 1)-16, 1, -1); + page->file->lpszPath, -1, GET_UINT(format, 1), 1, -1); format += 5; @@ -2575,6 +2580,26 @@ /*********************************************************************** * + * HLPFILE_GetTOMap + */ +static BOOL HLPFILE_GetTOMap(HLPFILE *hlpfile) +{ + BYTE *cbuf, *cend; + unsigned clen; + + if (!HLPFILE_FindSubFile(hlpfile, "|TOMAP", &cbuf, &cend)) + {WINE_WARN("no tomap section\n"); return FALSE;} + + clen = cend - cbuf - 9; + hlpfile->TOMap = HeapAlloc(GetProcessHeap(), 0, clen); + if (!hlpfile->TOMap) return FALSE; + memcpy(hlpfile->TOMap, cbuf+9, clen); + hlpfile->wTOMapLen = clen/4; + return TRUE; +} + +/*********************************************************************** + * * DeleteMacro */ static void HLPFILE_DeleteMacro(HLPFILE_MACRO* macro) Modified: trunk/reactos/base/applications/winhlp32/hlpfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.h [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -100,6 +100,8 @@ BYTE* kwdata; unsigned wMapLen; HLPFILE_MAP* Map; + unsigned wTOMapLen; + unsigned* TOMap; unsigned long contents_start; struct tagHlpFileFile* prev; Added: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -1,0 +1,125 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Menu */ + +MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ + POPUP "t@C(&F)" { + MENUITEM "J(&O)", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "óü(&P)", MNID_FILE_PRINT + MENUITEM "v^ÌÝè(&S)...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", MNID_FILE_EXIT + } + POPUP "ÒW(&E)" { + MENUITEM "Rs[(&C)...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "Rg(&A)...", MNID_EDIT_ANNOTATE + } + POPUP "µ¨è(&B)" { + MENUITEM "è`(&D)...", MNID_BKMK_DEFINE + } + POPUP "IvV(&O)" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "ð", MNID_OPTS_HISTORY + POPUP "tHg" + BEGIN + MENUITEM "¬", MNID_OPTS_FONTS_SMALL + MENUITEM "W", MNID_OPTS_FONTS_NORMAL + MENUITEM "å", MNID_OPTS_FONTS_LARGE + END + MENUITEM "VXe J[ðg¤", MNID_OPTS_SYSTEM_COLORS + } + POPUP "wv(&H)" { + MENUITEM "wvÉÂ¢ÄÌwv(&O)", MNID_HELP_HELPON + MENUITEM "íÉèOÉ\\¦(&T)", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "îñ(&I)...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "WINE ÉÂ¢Ä(&A)", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "õø" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "õ" +{ + LTEXT "¢À", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ +STID_WINE_HELP, "WINE wv" +STID_WHERROR, "G[" +STID_WARNING, "x" +STID_INFO, "îñ" +STID_NOT_IMPLEMENTED, "ñÀ" +STID_HLPFILE_ERROR_s, "wvt@C `%s' ðÇÝñÅ¢éÆ«ÉG[" +STID_INDEX, "õø(&I)" +STID_CONTENTS, "Tv" +STID_BACK, "ßé(&B)" +STID_ALL_FILES, "·×ÄÌt@C (*.*)" +STID_HELP_FILES_HLP, "wv t@C (*.hlp)" +STID_FILE_NOT_FOUND_s "'%s' ª©Â©èÜ¹ñB©ªÅ±Ìt@CðTµÜ·©?" +STID_NO_RICHEDIT "b`GfBbgÀª©Â©èÜ¹ñ... I¹µÜ·" +STID_PSH_INDEX, "wv gsbN: " +} + +CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Rg...", MNID_CTXT_ANNOTATE + MENUITEM "Rs[", MNID_CTXT_COPY + MENUITEM "óü...", MNID_CTXT_PRINT + POPUP "tHg" + BEGIN + MENUITEM "¬", MNID_CTXT_FONTS_SMALL + MENUITEM "W", MNID_CTXT_FONTS_NORMAL + MENUITEM "å", MNID_CTXT_FONTS_LARGE + END + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE + MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "VXe J[ðg¤", MNID_CTXT_SYSTEM_COLORS + END +END Propchange: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhlp32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/no-NO.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -73,6 +73,14 @@ LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Søk" +{ + LTEXT "Ikke laget ennå", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL { Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -1,8 +1,9 @@ /* * Help Viewer - * Simplified Chinese Language Support + * Simplified and Traditional Chinese Language Support * * Copyright 2002 liuspider <liuspider(a)yahoo.com> + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,68 +20,143 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +MAIN_MENU MENU { - POPUP "ÎÄ¼þ£¨&F£©" { - MENUITEM "´ò¿ª£¨&O£©", MNID_FILE_OPEN + POPUP "æä»¶(&F)" { + MENUITEM "æå¼(&O)", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "´òÓ¡£¨&P£©", MNID_FILE_PRINT - MENUITEM "´òÓ¡»úÉèÖÃ£¨&S£©...", MNID_FILE_SETUP + MENUITEM "æå°(&P)", MNID_FILE_PRINT + MENUITEM "æå°æºè®¾ç½®(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "ÍË³ö£¨&E£©", MNID_FILE_EXIT + MENUITEM "éåº(&E)", MNID_FILE_EXIT } - POPUP "±à¼£¨&E£©" { - MENUITEM "¸´ÖÆ£¨&C£©...", MNID_EDIT_COPYDLG + POPUP "ç¼è¾(&E)" { + MENUITEM "å¤å¶(&C)...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "×¢ÊÍ£¨&A£©...", MNID_EDIT_ANNOTATE + MENUITEM "æ³¨é(&A)...", MNID_EDIT_ANNOTATE } - POPUP "ÊéÇ©£¨&B£©" { - MENUITEM "¶¨Òå£¨&D£©...", MNID_BKMK_DEFINE + POPUP "ä¹¦ç¾(&B)" { + MENUITEM "å®ä¹(&D)...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "éé¡¹(&O)" { + POPUP "æ¾ç¤ºå¸®å©" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "é»è®¤", MNID_OPTS_HELP_DEFAULT + MENUITEM "æ¾ç¤º", MNID_OPTS_HELP_VISIBLE + MENUITEM "ä¸æ¾ç¤º", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "åå²", MNID_OPTS_HISTORY + POPUP "åä½" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "å°å·", MNID_OPTS_FONTS_SMALL + MENUITEM "ä¸å·", MNID_OPTS_FONTS_NORMAL + MENUITEM "å¤§å·", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ä½¿ç¨ç³»ç»é¢è²", MNID_OPTS_SYSTEM_COLORS } - POPUP "°ïÖú£¨&H£©" { - MENUITEM "ÈçºÎÊ¹ÓÃ°ïÖú£¨&O£©", MNID_HELP_HELPON - MENUITEM "×ÜÊÇÔÚ×îÇ°Ãæ£¨&T£©", MNID_HELP_HELPTOP + POPUP "å¸®å©(&H)" { + MENUITEM "å¦ä½ä½¿ç¨å¸®å©(&O)", MNID_HELP_HELPON + MENUITEM "æ»æ¯å¨æåé¢(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "×ÊÁÏÐÅÏ¢£¨&I£©...", MNID_HELP_ABOUT + MENUITEM "èµæä¿¡æ¯(&I)...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "¹ØÓÚ WINE£¨&A£©", MNID_HELP_WINE + MENUITEM "å³äº WINE(&A)", MNID_HELP_WINE #endif } } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE °ïÖú" -STID_WHERROR, "´íÎó" -STID_WARNING, "¾¯¸æ" -STID_INFO, "ÐÅÏ¢" -STID_NOT_IMPLEMENTED, "Î´ÊµÏÖ" -STID_HLPFILE_ERROR_s, "¶ÁÈë°ïÖúÎÄ¼þ ¡®%s¡¯ Ê±·¢Éú´íÎó" -STID_INDEX, "ÄÚÈÝ£¨&C£©" -STID_CONTENTS, "Summary" -STID_BACK, "·µ»Ø£¨&B£©" -STID_ALL_FILES, "ËùÓÐÎÄ¼þ (*.*)" -STID_HELP_FILES_HLP, "°ïÖúÎÄ¼þ (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_WINE_HELP, "WINE å¸®å©" +STID_WHERROR, "éè¯¯" +STID_WARNING, "è¦å" +STID_INFO, "ä¿¡æ¯" +STID_NOT_IMPLEMENTED, "æªå®ç°" +STID_HLPFILE_ERROR_s, "è¯»å¥å¸®å©æä»¶ â%sâ æ¶åçéè¯¯" +STID_INDEX, "åå®¹(&C)" +STID_CONTENTS, "æ¦è¦" +STID_BACK, "è¿å(&B)" +STID_ALL_FILES, "æææä»¶ (*.*)" +STID_HELP_FILES_HLP, "å¸®å©æä»¶ (*.hlp)" +STID_FILE_NOT_FOUND_s "ä¸è½æå¼æä»¶ '%s'. ä½ æ³è¦èªå·±æ¾è¿ä¸ªæä»¶å?" +STID_NO_RICHEDIT "æ¾ä¸å° richedit... ç»æ¢" +STID_PSH_INDEX, "å¸®å©åå®¹: " } + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +/* Menu */ + +MAIN_MENU MENU +{ + POPUP "æªæ¡(&F)" { + MENUITEM "éå(&O)", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "åå°(&P)", MNID_FILE_PRINT + MENUITEM "å°è¡¨æ©è¨å®(&S)...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "çµæ(&E)", MNID_FILE_EXIT + } + POPUP "ç·¨è¼¯(&E)" { + MENUITEM "è¤è£½(&C)...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "è¨»é(&A)...", MNID_EDIT_ANNOTATE + } + POPUP "æ¸ç±¤(&B)" { + MENUITEM "å®ç¾©(&D)...", MNID_BKMK_DEFINE + } + POPUP "é¸é (&O)" { + POPUP "é¡¯ç¤ºå¹«å©" + BEGIN + MENUITEM "é»èª", MNID_OPTS_HELP_DEFAULT + MENUITEM "é¡¯ç¤º", MNID_OPTS_HELP_VISIBLE + MENUITEM "ä¸é¡¯ç¤º", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "æ·å²", MNID_OPTS_HISTORY + POPUP "åå" + BEGIN + MENUITEM "å°è", MNID_OPTS_FONTS_SMALL + MENUITEM "ä¸è", MNID_OPTS_FONTS_NORMAL + MENUITEM "å¤§è", MNID_OPTS_FONTS_LARGE + END + MENUITEM "ä½¿ç¨ç³»çµ±é¡è²", MNID_OPTS_SYSTEM_COLORS + } + POPUP "å¹«å©(&H)" { + MENUITEM "å¦ä½ä½¿ç¨å¹«å©(&O)", MNID_HELP_HELPON + MENUITEM "ç¸½æ¯å¨æä¸é¢(&T)", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "è³è¨(&I)...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "éæ¼ WINE(&A)", MNID_HELP_WINE +#endif + } +} + +/* Strings */ +STRINGTABLE DISCARDABLE +{ +STID_WINE_HELP, "WINE å¹«å©" +STID_WHERROR, "é¯èª¤" +STID_WARNING, "è¦å" +STID_INFO, "è³è¨" +STID_NOT_IMPLEMENTED, "æªå¯¦ç¾" +STID_HLPFILE_ERROR_s, "è®å¥å¹«å©æªæ¡ â%sâ æç¼çé¯èª¤" +STID_INDEX, "å§å®¹(&C)" +STID_CONTENTS, "æ¦è¦" +STID_BACK, "è¿å(&B)" +STID_ALL_FILES, "æææªæ¡ (*.*)" +STID_HELP_FILES_HLP, "å¹«å©æªæ¡ (*.hlp)" +STID_FILE_NOT_FOUND_s "ä¸è½éåæªæ¡ '%s'. ä½ æ³è¦èªå·±æ¾éåæªæ¡å?" +STID_NO_RICHEDIT "æ¾ä¸å° richedit... çµæ¢" +STID_PSH_INDEX, "å¹«å©å§å®¹: " +} + +#pragma code_page(default) Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -39,6 +39,7 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" // #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -64,7 +64,7 @@ BEGIN MENUITEM "&Barre d'outils", ID_TOGGLE_TOOLBAR MENUITEM "&Barre de format", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "&Règle", ID_TOGGLE_RULER MENUITEM "&Barre d'état", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Options...", ID_VIEWPROPERTIES @@ -75,7 +75,7 @@ END POPUP "Forma&t" BEGIN - MENUITEM "&Polive...", ID_FONTSETTINGS + MENUITEM "&Police...", ID_FONTSETTINGS MENUITEM "&Puces" ID_BULLET MENUITEM "&Paragraphe..." ID_PARAFORMAT MENUITEM "&Tabulations..." ID_TABSTOPS @@ -109,10 +109,10 @@ CAPTION "Date et heure" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Available formats",0,3,2,100,15 + LTEXT "Formats disponibles",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "&Cancel",IDCANCEL,87,26,40,12 + PUSHBUTTON "&Annuler",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 @@ -132,13 +132,13 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Indentation", 0, 10, 10, 120, 68 - LTEXT "Left", 0, 15, 22, 40, 13 + LTEXT "Gauche", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "Right", 0, 15, 40, 40, 13 + LTEXT "Droite", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "First line", 0, 15, 58, 40, 13 + LTEXT "Première ligne", 0, 15, 58, 40, 18 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "Alignment", 0, 15, 87, 40, 13 + LTEXT "Alignement", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 @@ -163,14 +163,14 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "Barres d'outils", 0, 150, 10, 120, 85 - CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "&Ruler", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 160, 74, 80, 15 + GROUPBOX "Enveloppement de ligne", 0, 10, 10, 170, 85 + RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre", IDC_PAGEFMT_WW, 18, 25, 145, 15 + RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM, 18, 45, 145, 15 + GROUPBOX "Barres d'outils", 0, 170, 10, 120, 85 + CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15 + CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15 + CHECKBOX "&Règle", IDC_PAGEFMT_RU, 180, 56, 80, 15 + CHECKBOX "Barre de &statut", IDC_PAGEFMT_SB, 180, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -213,8 +213,8 @@ STRING_PREVIEW_PRINT, "Imprimer" STRING_PREVIEW_NEXTPAGE, "Page suivante" STRING_PREVIEW_PREVPAGE, "Page précédente" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "Deux pages" + STRING_PREVIEW_ONEPAGE, "Une page" STRING_PREVIEW_CLOSE, "Fermer" END Added: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc (added) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -1,0 +1,241 @@ +/* + * Copyright 2008 by Katayama Hirofumi MZ + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "VKì¬(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "J(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "ã«Û¶(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "¼Oðt¯ÄÛ¶(&A)...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "óü(&P)...\tCtrl+P", ID_PRINT + MENUITEM "óüvr[(&W)...", ID_PREVIEW + MENUITEM "y[WÝè(&E)...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", ID_FILE_EXIT + END + POPUP "ÒW(&E)" + BEGIN + MENUITEM "³Éß·(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "âè¼µ(&E)\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Øèæè(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "Rs[(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "\\èt¯(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "NA(&C)\tDEL", ID_EDIT_CLEAR + MENUITEM "·×ÄIð(&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "õ(&F)...\tCrtl+F", ID_FIND + MENUITEM "ðõ(&N)\tF3", ID_FIND_NEXT + MENUITEM "u·(&R)...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "ÇÝæèêp(&O)", ID_EDIT_READONLY + MENUITEM "ÏX è(&M)", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtras" + BEGIN + MENUITEM "Selection &info", ID_EDIT_SELECTIONINFO + MENUITEM "Character &format", ID_EDIT_CHARFORMAT + MENUITEM "&Def. char format", ID_EDIT_DEFCHARFORMAT + MENUITEM "Paragrap&h format", ID_EDIT_PARAFORMAT + MENUITEM "&Get text", ID_EDIT_GETTEXT + END + END + POPUP "\\¦(&V)" + BEGIN + MENUITEM "c[o[(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "®o[(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "[[(&R)", ID_TOGGLE_RULER + MENUITEM "Xe[^X o[(&S)", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "IvV(&O)...", ID_VIEWPROPERTIES + END + POPUP "}ü(&I)" + BEGIN + MENUITEM "útÆ(&D)...", ID_DATETIME + END + POPUP "®(&O)" + BEGIN + MENUITEM "tHg(&F)...", ID_FONTSETTINGS + MENUITEM "Óð«(&B)" ID_BULLET + MENUITEM "i(&P)..." ID_PARAFORMAT + MENUITEM "^u(&T)..." ID_TABSTOPS + POPUP "wi(&D)" + BEGIN + MENUITEM "VXe(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 + END + END + POPUP "wv(&H)" + BEGIN + MENUITEM "Wine WordpadÉÂ¢Ä(&A)" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Øèæè(&T)", ID_EDIT_CUT + MENUITEM "Rs[(&C)", ID_EDIT_COPY + MENUITEM "\\èt¯(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "Óð«(&B)" ID_BULLET + MENUITEM "i(&P)..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "útÆ" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "pÅ«é`®",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "LZ(&C)",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "VKì¬" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Vµ¢¶`®",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "LZ(&C)",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "iÌÝè" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Cfg", 0, 10, 10, 120, 68 + LTEXT "¶(&L)", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "E(&R)", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "ÅÌs(&F)", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "®ñ(&A)", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "LZ(&C)", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "^uÌÝè" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "^uÌâ~Êu(&T)", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "ÇÁ(&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "í(&R)", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "LZ(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "·×Äí(&L)", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "sÌÜèÔµ", 0, 10, 10, 130, 85 + RADIOBUTTON "EBhEÌ«EÅÜèÔ·(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "}[WÅÜèÔ·(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "c[o[", 0, 150, 10, 120, 85 + CHECKBOX "c[o[(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "®o[(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "[[(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "Xe[^Xo[(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "b`eLXg`® (*.rtf)" + STRING_TEXT_FILES_TXT, "eLXg¶ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "UnicodeeLXg¶(*.txt)" + STRING_ALL_FILES, "·×ÄÌt@C (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "¶" + STRING_ALIGN_RIGHT, "E" + STRING_ALIGN_CENTER, "" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "b`eLXg¶" + STRING_NEWFILE_TXT, "eLXg¶" + STRING_NEWFILE_TXT_UNICODE, "UnicodeeLXg¶" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "v^t@C (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "IvV" + STRING_VIEWPROPS_TEXT, "eLXg" + STRING_VIEWPROPS_RICHTEXT, "b`eLXg" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "óü" + STRING_PREVIEW_NEXTPAGE, "Ìy[W" + STRING_PREVIEW_PREVPAGE, "OÌy[W" + STRING_PREVIEW_TWOPAGES, "2y[W" + STRING_PREVIEW_ONEPAGE, "1y[W" + STRING_PREVIEW_CLOSE, "Â¶é" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "¶" + STRING_PROMPT_SAVE_CHANGES, "'%s'ÖÌÏXðÛ¶µÜ·©?" + STRING_SEARCH_FINISHED, "¶Ìõð®¹B" + STRING_LOAD_RICHED_FAILED, "RichEditCuÌÇÝÝÉ¸sB" + STRING_SAVE_LOSEFORMATTING, "v[eLXg`®ÅÛ¶·éÆA" \ + "·×ÄÌ®ª¸íêÜ·B" \ + "»êÅàæ¢Å·©H" + STRING_INVALID_NUMBER, "Ì®ªs³" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLEXg[W¶ÍT|[g³êÄ¢Ü¹ñB" + STRING_WRITE_FAILED, "t@CðÛ¶Å«Ü¹ñB" + STRING_WRITE_ACCESS_DENIED, "t@CÉÛ¶·é Àª èÜ¹ñB" + STRING_OPEN_FAILED, "t@CðJ¯Ü¹ñB" + STRING_OPEN_ACCESS_DENIED, "t@CðJ Àª èÜ¹ñB" +END Propchange: trunk/reactos/base/applications/wordpad/Ja.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc (added) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -1,0 +1,472 @@ +/* + * wordpad (Simplified and Traditional Chinese Resource) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "æä»¶(&F)" + BEGIN + MENUITEM "æ°å»º(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "æå¼(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "ä¿å(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "å¦åä¸º(&A)...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "æå°(&P)...\tCtrl+P", ID_PRINT + MENUITEM "æå°é¢è§(&W)...", ID_PREVIEW + MENUITEM "é¡µé¢è®¾ç½®(&E)...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "éåº(&X)", ID_FILE_EXIT + END + POPUP "ç¼è¾(&E)" + BEGIN + MENUITEM "æ¤é(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "éå(&E)\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "åªå(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "å¤å¶(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "ç²è´´(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "å é¤(&D)\tDEL", ID_EDIT_CLEAR + MENUITEM "å¨é(&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "æ¥æ¾(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¾ä¸ä¸ä¸ª(&N)\tF3", ID_FIND_NEXT + MENUITEM "æ¿æ¢(&R)...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "åªè¯»(&0))", ID_EDIT_READONLY + MENUITEM "å·²æ¹å¨(M)", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "å¶ä»(&X)" + BEGIN + MENUITEM "éæ©ä¿¡æ¯(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "æåæ ¼å¼(&F)", ID_EDIT_CHARFORMAT + MENUITEM "é»è®¤æ ¼å¼(&D)", ID_EDIT_DEFCHARFORMAT + MENUITEM "æ®µè½æ ¼å¼(&H)", ID_EDIT_PARAFORMAT + MENUITEM "è·åæå(&G)", ID_EDIT_GETTEXT + END + END + POPUP "è§å¾(&V)" + BEGIN + MENUITEM "å·¥å·æ (&T)", ID_TOGGLE_TOOLBAR + MENUITEM "æ ¼å¼å·¥å·æ (&F)", ID_TOGGLE_FORMATBAR + MENUITEM "æ å°º(&R)", ID_TOGGLE_RULER + MENUITEM "ç¶ææ (&S)", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "éé¡¹(&O)...", ID_VIEWPROPERTIES + END + POPUP "æå¥(&I)" + BEGIN + MENUITEM "æ¥ææ¶é´(&D)...", ID_DATETIME + END + POPUP "æ ¼å¼(&O)" + BEGIN + MENUITEM "åä½(&F)..", ID_FONTSETTINGS + MENUITEM "åå¼¹ç¹(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT + MENUITEM "æ ç¾(&T)...", ID_TABSTOPS + POPUP "èæ¯(&D)" + BEGIN + MENUITEM "ç³»ç»(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "æ·¡é»è²(&P)\tCtrl+2", ID_BACK_2 + END + END + POPUP "å¸®å©(&H)" + BEGIN + MENUITEM "å³äº &Wine ååæ¿", ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "åªå(&T)", ID_EDIT_CUT + MENUITEM "å¤å¶(&C)", ID_EDIT_COPY + MENUITEM "ç²è´´(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "åå¼¹ç¹(&B)" ID_BULLET + MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "æ¥æåæ¶é´" +FONT 9, "MS Song" +BEGIN + LTEXT "å¯ç¨æ ¼å¼",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ç¡®å®(&O)",IDOK,87,12,40,12 + PUSHBUTTON "åæ¶(&C)",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "æ°å»º" +FONT 9, "MS Song" +BEGIN + LTEXT "æ°æä»¶ç±»å",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ç¡®å®(&O)",IDOK,97,12,40,12 + PUSHBUTTON "åæ¶(&C)",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "æ®µè½æ ¼å¼" +FONT 9, "MS Song" +BEGIN + GROUPBOX "ç¼©è¿", 0, 10, 10, 120, 68 + LTEXT "å·¦", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "å³", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "ç¬¬ä¸è¡", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "å¯¹é½", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "ç¡®å®(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "æ ç¾" +FONT 9, "MS Song" +BEGIN + GROUPBOX "æ ç¾åç¹", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "æ·»å (&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "å é¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "ç¡®å®(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "å¨é¨å é¤(&R)", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 9, "MS Song" +BEGIN + GROUPBOX "èªå¨æ¢è¡", 0, 10, 10, 130, 85 + RADIOBUTTON "æè§çªå®½åº¦(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "æçº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "å·¥å·æ ", 0, 150, 10, 120, 85 + CHECKBOX "å·¥å·æ (&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "æ ¼å¼å·¥å·æ (&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "æ å°º(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "ç¶ææ (&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "RTFä¸°å¯æ ¼å¼ (*.rtf)" + STRING_TEXT_FILES_TXT, "ææ¬æä»¶ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "ç»ä¸ç ææ¬æä»¶ (*.txt)" + STRING_ALL_FILES, "æææä»¶ (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "å·¦" + STRING_ALIGN_RIGHT, "å³" + STRING_ALIGN_CENTER, "ä¸" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "RTFä¸°å¯æ ¼å¼æä»¶" + STRING_NEWFILE_TXT, "ææ¬æä»¶ " + STRING_NEWFILE_TXT_UNICODE, "ç»ä¸ç ææ¬æä»¶" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "æå°æä»¶ (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "éé¡¹" + STRING_VIEWPROPS_TEXT, "ææ¬æå" + STRING_VIEWPROPS_RICHTEXT, "ä¸°å¯æ ¼å¼æå" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "æå°" + STRING_PREVIEW_NEXTPAGE, "ä¸ä¸é¡µ" + STRING_PREVIEW_PREVPAGE, "ä¸ä¸é¡µ" + STRING_PREVIEW_TWOPAGES, "åé¡µ" + STRING_PREVIEW_ONEPAGE, "åé¡µ" + STRING_PREVIEW_CLOSE, "å³é" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Document" + STRING_PROMPT_SAVE_CHANGES, "ä¿åæ¹å¨å° '%s'?" + STRING_SEARCH_FINISHED, "æä»¶æ¥æ¾ç»æ." + STRING_LOAD_RICHED_FAILED, "RichEdit è£è½½å¤±è´¥." + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç»éæ©ä¿åä¸ºææ¬æä»¶, " \ + "è¿å¯è½å¯¼è´æ ¼å¼ä¸¢å¤±. " \ + "ä½ ç¡®å®è¦è¿ä¹åå?" + STRING_INVALID_NUMBER, "æ°åæ ¼å¼æ æ" + STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æOLE å¨åæä»¶" + STRING_WRITE_FAILED, "ä¸è½ä¿åæä»¶." + STRING_WRITE_ACCESS_DENIED, "ä½ æ²¡æä¿åæä»¶çæå." + STRING_OPEN_FAILED, "ä¸è½æå¼æä»¶." + STRING_OPEN_ACCESS_DENIED, "ä½ æ²¡ææå¼æä»¶çæå." +END + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "æªæ¡(&F)" + BEGIN + MENUITEM "æ°å»º(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "éå(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "å²å(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "å¦åçº(&A)...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "åå°(&P)...\tCtrl+P", ID_PRINT + MENUITEM "åå°é è¦½(&W)...", ID_PREVIEW + MENUITEM "é é¢è¨å®(&E)...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "çµæ(&X)", ID_FILE_EXIT + END + POPUP "ç·¨è¼¯(&E)" + BEGIN + MENUITEM "å¾©å(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "éå(&E)\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "åªä¸(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "è¤è£½(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "è²¼ä¸(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "åªé¤(&D)\tDEL", ID_EDIT_CLEAR + MENUITEM "å¨é¸(&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "æ¥æ¾(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¾ä¸ä¸å(&N)\tF3", ID_FIND_NEXT + MENUITEM "æ¿æ(&R)...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "å¯è®(&0))", ID_EDIT_READONLY + MENUITEM "å·²æ¹å(M)", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "å¶ä»(&X)" + BEGIN + MENUITEM "é¸æè³è¨(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "æåæ ¼å¼(&F)", ID_EDIT_CHARFORMAT + MENUITEM "é»èªæ ¼å¼(&D)", ID_EDIT_DEFCHARFORMAT + MENUITEM "æ®µè½æ ¼å¼(&H)", ID_EDIT_PARAFORMAT + MENUITEM "ç²åæå(&G)", ID_EDIT_GETTEXT + END + END + POPUP "æª¢è¦(&V)" + BEGIN + MENUITEM "å·¥å·æ¬(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "æ ¼å¼å·¥å·æ¬(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "æ¨å°º(&R)", ID_TOGGLE_RULER + MENUITEM "çææ¬(&S)", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "é¸é (&O)...", ID_VIEWPROPERTIES + END + POPUP "æå¥(&I)" + BEGIN + MENUITEM "æ¥ææé(&D)...", ID_DATETIME + END + POPUP "æ ¼å¼(&O)" + BEGIN + MENUITEM "åå(&F)..", ID_FONTSETTINGS + MENUITEM "åå½é»(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT + MENUITEM "æ¨ç±¤(&T)...", ID_TABSTOPS + POPUP "èæ¯(&D)" + BEGIN + MENUITEM "ç³»çµ±(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "æ·¡é»è²(&P)\tCtrl+2", ID_BACK_2 + END + END + POPUP "å¹«å©(&H)" + BEGIN + MENUITEM "éæ¼ &Wine å¯«åæ¿", ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "åªä¸(&T)", ID_EDIT_CUT + MENUITEM "è¤è£½(&C)", ID_EDIT_COPY + MENUITEM "è²¼ä¸(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "åå½é»(&B)" ID_BULLET + MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "æ¥æåæé" +FONT 8, "PMingLiu" +BEGIN + LTEXT "å¯ç¨æ ¼å¼",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ç¢ºå®(&O)",IDOK,87,12,40,12 + PUSHBUTTON "åæ¶(&C)",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "æ°å»º" +FONT 8, "PMingLiu" +BEGIN + LTEXT "æ°æªæ¡é¡å",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ç¢ºå®(&O)",IDOK,97,12,40,12 + PUSHBUTTON "åæ¶(&C)",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "æ®µè½æ ¼å¼" +FONT 8, "PMingLiu" +BEGIN + GROUPBOX "ç¸®é²", 0, 10, 10, 120, 68 + LTEXT "å·¦", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "å³", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "ç¬¬ä¸è¡", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "å°é½", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "ç¢ºå®(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "æ¨ç±¤" +FONT 8, "PMingLiu" +BEGIN + GROUPBOX "æ¨ç±¤åé»", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "æ·»å (&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "åªé¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "ç¢ºå®(&O)", IDOK, 137, 15, 50, 15 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "å¨é¨åªé¤(&R)", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "PMingLiu" +BEGIN + GROUPBOX "èªåæè¡", 0, 10, 10, 130, 85 + RADIOBUTTON "æè¦çªå¯¬åº¦(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "æç´å¼µå¯¬åº¦(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "å·¥å·æ¬", 0, 150, 10, 120, 85 + CHECKBOX "å·¥å·æ¬(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "æ ¼å¼å·¥å·æ¬(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "æ¨å°º(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "çææ¬(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "RTFè±å¯æ ¼å¼ (*.rtf)" + STRING_TEXT_FILES_TXT, "ææ¬æªæ¡ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "çµ±ä¸ç¢¼ææ¬æªæ¡ (*.txt)" + STRING_ALL_FILES, "æææªæ¡ (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "å·¦" + STRING_ALIGN_RIGHT, "å³" + STRING_ALIGN_CENTER, "ä¸" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "RTFè±å¯æ ¼å¼æªæ¡" + STRING_NEWFILE_TXT, "ææ¬æªæ¡ " + STRING_NEWFILE_TXT_UNICODE, "çµ±ä¸ç¢¼ææ¬æªæ¡" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "åå°æªæ¡ (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "é¸é " + STRING_VIEWPROPS_TEXT, "ææ¬æå" + STRING_VIEWPROPS_RICHTEXT, "è±å¯æ ¼å¼æå" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "åå°" + STRING_PREVIEW_NEXTPAGE, "ä¸ä¸é " + STRING_PREVIEW_PREVPAGE, "ä¸ä¸é " + STRING_PREVIEW_TWOPAGES, "éé " + STRING_PREVIEW_ONEPAGE, "å®é " + STRING_PREVIEW_CLOSE, "éé" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Document" + STRING_PROMPT_SAVE_CHANGES, "å²åæ¹åå° '%s'?" + STRING_SEARCH_FINISHED, "æªæ¡æ¥æ¾çµæ." + STRING_LOAD_RICHED_FAILED, "RichEdit è£è¼å¤±æ." + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, " \ + "éå¯è½å°è´æ ¼å¼ä¸å¤±. " \ + "ä½ ç¢ºå®è¦ééº¼åå?" + STRING_INVALID_NUMBER, "æ¸åæ ¼å¼ç¡æ" + STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æ´OLE å²åæªæ¡" + STRING_WRITE_FAILED, "ä¸è½å²åæªæ¡." + STRING_WRITE_ACCESS_DENIED, "ä½ æ²æå²åæªæ¡çæ¬å." + STRING_OPEN_FAILED, "ä¸è½éåæªæ¡." + STRING_OPEN_ACCESS_DENIED, "ä½ æ²æéåæªæ¡çæ¬å." +END + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/wordpad/Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Fri Sep 5 11:34:20 2008 @@ -69,6 +69,7 @@ #include "En.rc" #include "Fr.rc" #include "Hu.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" @@ -76,3 +77,4 @@ #include "Ru.rc" #include "Si.rc" #include "Tr.rc" +#include "Zh.rc"

1 0

[cwittich] 35960: change parameter back to DWORD as it is in our headers
by cwittich＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cwittich Date: Fri Sep 5 08:28:12 2008 New Revision: 35960 URL: http://svn.reactos.org/svn/reactos?rev=35960&view=rev Log: change parameter back to DWORD as it is in our headers Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Fri Sep 5 08:28:12 2008 @@ -626,7 +626,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;

1 0

[cwittich] 35959: fix the advapi32 crypt winetest crash
by cwittich＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cwittich Date: Fri Sep 5 08:10:49 2008 New Revision: 35959 URL: http://svn.reactos.org/svn/reactos?rev=35959&view=rev Log: fix the advapi32 crypt winetest crash Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Fri Sep 5 08:10:49 2008 @@ -184,6 +184,8 @@ { char *wine_debug; DWORD dwLength; + /* GetEnvironmentVariableA will change LastError! */ + DWORD LastError = GetLastError(); if (nb_debug_options != -1) return; /* already initialized */ nb_debug_options = 0; @@ -199,6 +201,7 @@ free(wine_debug); } } + SetLastError(LastError); } /* varargs wrapper for funcs.dbg_vprintf */

1 0

[cwittich] 35958: fix some advapi32 lsa winetests
by cwittich＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cwittich Date: Fri Sep 5 06:32:15 2008 New Revision: 35958 URL: http://svn.reactos.org/svn/reactos?rev=35958&view=rev Log: fix some advapi32 lsa winetests Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Fri Sep 5 06:32:15 2008 @@ -433,92 +433,91 @@ */ NTSTATUS STDCALL LsaQueryInformationPolicy(LSA_HANDLE PolicyHandle, - POLICY_INFORMATION_CLASS pic, - PVOID *Buffer) -{ - FIXME("(%p,0x%08x,%p) stub\n", - PolicyHandle, pic, Buffer); - - if (!Buffer) - return FALSE; - - switch (pic) - { - case PolicyAuditEventsInformation: /* 2 */ - { - PPOLICY_AUDIT_EVENTS_INFO p = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POLICY_AUDIT_EVENTS_INFO)); - p->AuditingMode = FALSE; /* no auditing */ - *Buffer = p; - } - break; - case PolicyPrimaryDomainInformation: /* 3 */ - case PolicyAccountDomainInformation: /* 5 */ - { - struct di - { POLICY_PRIMARY_DOMAIN_INFO ppdi; - SID sid; - }; - SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; - - struct di * xdi = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); - HKEY key; - BOOL useDefault = TRUE; - LONG ret; - - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, - KEY_READ, &key)) == ERROR_SUCCESS) - { - DWORD size = 0; - WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; - - ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); - if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) - { - xdi->ppdi.Name.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, size); - if ((ret = RegQueryValueExW(key, wg, NULL, NULL, - (LPBYTE)xdi->ppdi.Name.Buffer, &size)) == ERROR_SUCCESS) - { - xdi->ppdi.Name.Length = (USHORT)size; - useDefault = FALSE; - } - else - { - RtlFreeHeap(RtlGetProcessHeap(), 0, xdi->ppdi.Name.Buffer); - xdi->ppdi.Name.Buffer = NULL; - } - } - RegCloseKey(key); - } - if (useDefault) - RtlCreateUnicodeStringFromAsciiz(&(xdi->ppdi.Name), "DOMAIN"); - TRACE("setting domain to \n"); - - xdi->ppdi.Sid = &(xdi->sid); - xdi->sid.Revision = SID_REVISION; - xdi->sid.SubAuthorityCount = 1; - xdi->sid.IdentifierAuthority = localSidAuthority; - xdi->sid.SubAuthority[0] = SECURITY_LOCAL_SYSTEM_RID; - *Buffer = xdi; - } - break; - case PolicyAuditLogInformation: - case PolicyPdAccountInformation: - case PolicyLsaServerRoleInformation: - case PolicyReplicaSourceInformation: - case PolicyDefaultQuotaInformation: - case PolicyModificationInformation: - case PolicyAuditFullSetInformation: - case PolicyAuditFullQueryInformation: - case PolicyDnsDomainInformation: - case PolicyEfsInformation: - { - FIXME("category not implemented\n"); - return FALSE; - } - } - return TRUE; + POLICY_INFORMATION_CLASS InformationClass, + PVOID *Buffer) +{ + TRACE("(%p,0x%08x,%p)\n", PolicyHandle, InformationClass, Buffer); + + if(!Buffer) return STATUS_INVALID_PARAMETER; + switch (InformationClass) + { + case PolicyAuditEventsInformation: /* 2 */ + { + PPOLICY_AUDIT_EVENTS_INFO p = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(POLICY_AUDIT_EVENTS_INFO)); + p->AuditingMode = FALSE; /* no auditing */ + *Buffer = p; + } + break; + case PolicyPrimaryDomainInformation: /* 3 */ + case PolicyAccountDomainInformation: /* 5 */ + { + struct di + { + POLICY_PRIMARY_DOMAIN_INFO ppdi; + SID sid; + }; + SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; + + struct di * xdi = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*xdi)); + HKEY key; + BOOL useDefault = TRUE; + LONG ret; + + if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\VxD\\VNETSUP", 0, + KEY_READ, &key)) == ERROR_SUCCESS) + { + DWORD size = 0; + WCHAR wg[] = { 'W','o','r','k','g','r','o','u','p',0 }; + + ret = RegQueryValueExW(key, wg, NULL, NULL, NULL, &size); + if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) + { + xdi->ppdi.Name.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, size); + if ((ret = RegQueryValueExW(key, wg, NULL, NULL, + (LPBYTE)xdi->ppdi.Name.Buffer, &size)) == ERROR_SUCCESS) + { + xdi->ppdi.Name.Length = (USHORT)size; + useDefault = FALSE; + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), 0, xdi->ppdi.Name.Buffer); + xdi->ppdi.Name.Buffer = NULL; + } + } + RegCloseKey(key); + } + if (useDefault) + RtlCreateUnicodeStringFromAsciiz(&(xdi->ppdi.Name), "DOMAIN"); + TRACE("setting domain to \n"); + + xdi->ppdi.Sid = &(xdi->sid); + xdi->sid.Revision = SID_REVISION; + xdi->sid.SubAuthorityCount = 1; + xdi->sid.IdentifierAuthority = localSidAuthority; + xdi->sid.SubAuthority[0] = SECURITY_LOCAL_SYSTEM_RID; + *Buffer = xdi; + } + break; + case PolicyAuditLogInformation: + case PolicyPdAccountInformation: + case PolicyLsaServerRoleInformation: + case PolicyReplicaSourceInformation: + case PolicyDefaultQuotaInformation: + case PolicyModificationInformation: + case PolicyAuditFullSetInformation: + case PolicyAuditFullQueryInformation: + case PolicyDnsDomainInformation: + case PolicyEfsInformation: + { + FIXME("category not implemented\n"); + return STATUS_UNSUCCESSFUL; + } + } + return STATUS_SUCCESS; } /*

1 0

[cfinck] 35957: Shashkov Maxim <bz00mmer@mail.ru>: - Russian translation for getbuilds
by cfinck＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cfinck Date: Fri Sep 5 02:12:42 2008 New Revision: 35957 URL: http://svn.reactos.org/svn/reactos?rev=35957&view=rev Log: Shashkov Maxim <bz00mmer(a)mail.ru>: - Russian translation for getbuilds Added: trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php (with props) Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php Added: trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php (added) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php [iso-8859-1] Fri Sep 5 02:12:42 2008 @@ -1,0 +1,55 @@ +<?php +/* + PROJECT: ReactOS Website + LICENSE: GPL v2 or any later version + FILE: web/reactos.org/htdocs/getbuilds/lang/en.inc.php + PURPOSE: Easily download prebuilt ReactOS Revisions + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Shashkov Maxim <bz00mmer(a)mail.ru> +*/ + + /**** Russian resources (charset=utf-8) ****/ + $getbuilds_langres["language"] = "Ð¯Ð·ÑÐº"; + + $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">ÐÐ»Ð°Ð²Ð½Ð°Ñ</a> > Ð¡Ð±Ð¾ÑÐºÐ¸ ÑÑÐ°Ð½ÐºÐ° SVN ReactOS'; + $getbuilds_langres["title"] = "Ð¡ÐºÐ°ÑÐ°ÑÑ ÑÐ±Ð¾ÑÐºÐ¸ ÑÑÐ°Ð½ÐºÐ° ReactOS"; + $getbuilds_langres["intro"] = 'ÐÐ´ÐµÑÑ ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐºÐ°ÑÐ°ÑÑ ÐºÐ°Ðº ÑÐ²ÐµÐ¶Ð¸Ðµ, ÑÐ°Ðº Ð¸ ÑÑÐ°ÑÑÐµ Ð²ÐµÑÑÐ¸Ð¸ ReactOS Ð´Ð»Ñ ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¾Ð·Ð´Ð°ÑÑÑÑ Ð½Ð°ÑÐ¸Ð¼ <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBot</a>.'; + + $getbuilds_langres["overview"] = "ÐÐ±Ð·Ð¾Ñ"; + $getbuilds_langres["latestrev"] = "ÐÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ ÑÐµÐ²Ð¸Ð·Ð¸Ñ ReactOS Ð½Ð° SVN-ÑÐµÑÐ²ÐµÑÐµ"; + $getbuilds_langres["browsesvn"] = "ÐÐ±Ð·Ð¾Ñ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ¾ÑÐ¸Ñ SVN"; + $getbuilds_langres["cia"] = "Ð¡Ð¼Ð¾ÑÑÐµÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð½Ð° CIA.vc"; + $getbuilds_langres["buildbot_status"] = "Ð¡ÑÐ°ÑÑÑ BuildBot"; + $getbuilds_langres["buildbot_web"] = "Ð¡Ð¼Ð¾ÑÑÐµÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ ÑÐµÑÐµÐ· Ð²ÐµÐ±-Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ BuildBot"; + $getbuilds_langres["browsebuilds"] = "ÐÐ±Ð·Ð¾Ñ Ð²ÑÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð½ÑÑ ÑÐ±Ð¾ÑÐ¾Ðº"; + + $getbuilds_langres["downloadrev"] = "Ð¡ÐºÐ°ÑÐ°ÑÑ ÑÐ¾Ð±ÑÐ°Ð½Ð½ÑÑ ÑÐµÐ²Ð¸Ð·Ð¸Ñ ReactOS"; + $getbuilds_langres["js_disclaimer"] = 'ÐÐ°Ð¼ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð²ÐºÐ»ÑÑÐ¸ÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ JavaScript Ð² Ð±ÑÐ¾ÑÐ·ÐµÑÐµ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ°Ð¹Ð»Ð¾Ð² ÑÐµÐ²Ð¸Ð·Ð¸Ð¹.<br>Ð¢Ð°ÐºÐ¶Ðµ, ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐºÐ°ÑÐ°ÑÑ Ð²ÑÐµ ÑÐ¾Ð±ÑÐ°Ð½Ð½ÑÐµ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸ <a href="%s">Ð·Ð´ÐµÑÑ</a>.'; + $getbuilds_langres["showrevfiles"] = "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð¹Ð»Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸"; + $getbuilds_langres["prevrev"] = "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ñ"; + $getbuilds_langres["nextrev"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ñ"; + $getbuilds_langres["showrev"] = "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ"; + $getbuilds_langres["gettinglist"] = "ÐÐ¾Ð»ÑÑÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ°Ð¹Ð»Ð¾Ð²"; + $getbuilds_langres["rangeinfo"] = "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²Ð²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸(Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s) Ð¸Ð»Ð¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð½Ð¾Ð¼ÐµÑÐ¾Ð² ÑÐµÐ²Ð¸Ð·Ð¸Ð¹ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s-%s)"; + $getbuilds_langres["isotype"] = "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ¸Ð¿Ñ Ð¾Ð±ÑÐ°Ð·Ð¾Ð² CD-Ð´Ð¸ÑÐºÐ¾Ð²"; + + $getbuilds_langres["foundfiles"] = "ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² - %s!"; + + $getbuilds_langres["firstpage_title"] = "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿ÐµÑÐ²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ"; + $getbuilds_langres["prevpage_title"] = "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°"; + $getbuilds_langres["prevpage"] = "ÐÐ°Ð·Ð°Ð´"; + $getbuilds_langres["page"] = "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"; + $getbuilds_langres["nextpage"] = "ÐÐ¿ÐµÑÑÐ´"; + $getbuilds_langres["nextpage_title"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°"; + $getbuilds_langres["lastpage_title"] = "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ"; + + $getbuilds_langres["filename"] = "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°"; + $getbuilds_langres["filesize"] = "Ð Ð°Ð·Ð¼ÐµÑ"; + $getbuilds_langres["filedate"] = "ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ"; + $getbuilds_langres["pleasewait"] = "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ"; + + $getbuilds_langres["nofiles"] = "Ð¡Ð¾Ð±ÑÐ°Ð½Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð´Ð»Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸ %s Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ!"; + $getbuilds_langres["invalidrev"] = "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸!"; + + $getbuilds_langres["rangelimitexceeded"] = "ÐÐ¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð½Ð¾Ð¼ÐµÑÐ¾Ð² ÑÐµÐ²Ð¸Ð·Ð¸Ð¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ %s!"; +?> Propchange: trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php [iso-8859-1] Fri Sep 5 02:12:42 2008 @@ -15,5 +15,6 @@ "fr" => "FranÃ§ais (French)", "it" => "Italiano (Italian)", "lt" => "LietuviÅ³ (Lithuanian)", + "ru" => "Ð ÑÑÑÐºÐ¸Ð¹ (Russian)", ); ?>

1 0

[cgutman] 35956: - Patch by Michael Martin (aka bugboy) <martinmnet at hotmail dot com> - changed dhcp to write nameserver to dhcpnameserver registry key vice nameserver - changed iphlpapi to return dhcpnameserver if nameserver is empty - set NameServer to empty string in nettcpip.inf - see bug 2392
by cgutman＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cgutman Date: Thu Sep 4 20:00:32 2008 New Revision: 35956 URL: http://svn.reactos.org/svn/reactos?rev=35956&view=rev Log: - Patch by Michael Martin (aka bugboy) <martinmnet at hotmail dot com> - changed dhcp to write nameserver to dhcpnameserver registry key vice nameserver - changed iphlpapi to return dhcpnameserver if nameserver is empty - set NameServer to empty string in nettcpip.inf - see bug 2392 Modified: trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Thu Sep 4 20:00:32 2008 @@ -476,15 +476,10 @@ if( i != addrs-1 ) strcat( nsbuf, "," ); } - DH_DbgPrint(MID_TRACE,("Setting Nameservers: %s\n", nsbuf)); - - /* XXX Fixme: I think this may be wrong and that we might have - * a problem somewhere else (in iphlpapi for example). - * - * Recheck the +1 below. - */ - RegSetValueEx( RegKey, "NameServer", 0, REG_SZ, - (LPBYTE)nsbuf, strlen(nsbuf) + 1 ); + DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf)); + + RegSetValueEx( RegKey, "DhcpNameServer", 0, REG_SZ, + (LPBYTE)nsbuf, strlen(nsbuf) + 1); free( nsbuf ); } @@ -2097,4 +2092,4 @@ dispatch_imsg(fd); } } -#endif +#endif Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Thu Sep 4 20:00:32 2008 @@ -224,6 +224,14 @@ } Str = QueryRegistryValueString( hKey, L"NameServer" ); + + /* If NameServer is empty */ + if (*Str == L'\0') + { + /* Then use DhcpNameServer */ + Str = QueryRegistryValueString( hKey, L"DhcpNameServer" ); + } + ExtraServer = Str ? 1 : 0; ServerCount += ExtraServer; @@ -283,4 +291,4 @@ VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); -} +} Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 35955: - Merge aicom-network-fixes up to r35946
by cgutman＠svn.reactos.org 05 Sep '08

05 Sep '08

Author: cgutman Date: Thu Sep 4 19:43:28 2008 New Revision: 35955 URL: http://svn.reactos.org/svn/reactos?rev=35955&view=rev Log: - Merge aicom-network-fixes up to r35946 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Sep 4 19:43:28 2008 @@ -521,9 +521,11 @@ ExFreePool(KeyInformation); - if(*Status != STATUS_SUCCESS) + if(*Status != STATUS_SUCCESS) { + ExFreePool(*ParameterValue); + *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - else + } else *Status = NDIS_STATUS_SUCCESS; return; @@ -567,6 +569,7 @@ if(!MiniportResource) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(RegData); ExFreePool(KeyInformation); ExFreePool(*ParameterValue); *ParameterValue = NULL; Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 4 19:43:28 2008 @@ -1623,7 +1623,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_SUCCESS) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status; Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Sep 4 19:43:28 2008 @@ -783,7 +783,7 @@ RtlInitUnicodeString(&ValueName, L"Bind"); NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL) + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) { NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n")); ZwClose(DriverKeyHandle); Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Sep 4 19:43:28 2008 @@ -331,10 +331,12 @@ ExFreePool ( FullFileName.Buffer ); FullFileName.Buffer = NULL; } - if ( !NT_SUCCESS(*Status) && FileHandleObject != NULL ) + if ( !NT_SUCCESS(*Status) ) { - ExFreePool ( FileHandleObject ); - FileHandleObject = NULL; + if( FileHandleObject ) { + ExFreePool ( FileHandleObject ); + FileHandleObject = NULL; + } *FileHandle = NULL; } else

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
75
Older →

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 September 2008