Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 69601: [CONFIGURE.SH] Modify the script to take into account that now, host-tools are no longer required. Because it needs RosBE 2.1.2 (update guys!) still provide a fallback method t...
by pschweitzer＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: pschweitzer Date: Sun Oct 18 15:47:20 2015 New Revision: 69601 URL: http://svn.reactos.org/svn/reactos?rev=69601&view=rev Log: [CONFIGURE.SH] Modify the script to take into account that now, host-tools are no longer required. Because it needs RosBE 2.1.2 (update guys!) still provide a fallback method to allow using old build method with host-tools. In case you need it, just call configure.sh with-host-tools Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=69601&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sun Oct 18 15:47:20 2015 @@ -9,6 +9,7 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH +USE_NEW_STYLE=1 usage() { echo Invalid parameter given. @@ -33,6 +34,9 @@ makefiles|Makefiles) CMAKE_GENERATOR="Unix Makefiles" ;; + with-host-tools) + USE_NEW_STYLE=0 + ;; *) usage esac @@ -46,19 +50,27 @@ cd "$REACTOS_OUTPUT_PATH" fi -mkdir -p host-tools reactos +mkdir -p reactos -echo Preparing host tools... -cd host-tools +EXTRA_ARGS="" +if [ $USE_NEW_STYLE -eq 0 ]; then + mkdir -p host-tools + echo Preparing host tools... + cd host-tools + rm -f CMakeCache.txt + + REACTOS_BUILD_TOOLS_DIR="$PWD" + cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" + + EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" + + cd .. +fi + +echo Preparing reactos... +cd reactos rm -f CMakeCache.txt -REACTOS_BUILD_TOOLS_DIR="$PWD" -cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" - -echo Preparing reactos... -cd ../reactos -rm -f CMakeCache.txt - -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DREACTOS_BUILD_TOOLS_DIR:PATH="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$.

1 0

[ekohl] 69600: USETUP: Do not ask to select language if just one language is available Patch by Carlo Bramini. Thanks a lot! CORE-10322 #resolve
by ekohl＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: ekohl Date: Sun Oct 18 13:52:51 2015 New Revision: 69600 URL: http://svn.reactos.org/svn/reactos?rev=69600&view=rev Log: USETUP: Do not ask to select language if just one language is available Patch by Carlo Bramini. Thanks a lot! CORE-10322 #resolve Modified: trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Sun Oct 18 13:52:51 2015 @@ -653,4 +653,17 @@ List->CurrentEntry = List->BackupEntry; } + +BOOL +GenericListHasSingleEntry( + PGENERIC_LIST List) +{ + if (!IsListEmpty(&List->ListHead) && List->ListHead.Flink == List->ListHead.Blink) + return TRUE; + + /* if both list head pointers (which normally point to the first and last list member, respectively) + point to the same entry then it means that there's just a single thing in there, otherwise... false! */ + return FALSE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sun Oct 18 13:52:51 2015 @@ -53,10 +53,6 @@ SHORT Top, SHORT Right, SHORT Bottom); - -VOID -DrawScrollBarGenericLis( - PGENERIC_LIST List); VOID ScrollDownGenericList( @@ -121,4 +117,8 @@ PGENERIC_LIST List, CHAR AsciChar); +BOOL +GenericListHasSingleEntry( + PGENERIC_LIST List); + /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Oct 18 13:52:51 2015 @@ -633,6 +633,12 @@ /* Load the font */ SelectedLanguageId = DefaultLanguage; SetConsoleCodePage(); + UpdateKBLayout(); + + /* If there's just a single language in the list skip + * the language selection process altogether! */ + if (GenericListHasSingleEntry(LanguageList)) + return INTRO_PAGE; DrawGenericList(LanguageList, 2,

1 0

[tfaber] 69599: [URLMON_WINETEST] - Cancel the test if a failure situation is detected that will lead to a timeout ROSTESTS-192 CORE-10360
by tfaber＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: tfaber Date: Sun Oct 18 13:13:44 2015 New Revision: 69599 URL: http://svn.reactos.org/svn/reactos?rev=69599&view=rev Log: [URLMON_WINETEST] - Cancel the test if a failure situation is detected that will lead to a timeout ROSTESTS-192 CORE-10360 Modified: trunk/rostests/winetests/urlmon/protocol.c Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sun Oct 18 13:13:44 2015 @@ -1084,6 +1084,12 @@ else ok(hrResult == expect_hrResult, "hrResult = %08x, expected: %08x\n", hrResult, expect_hrResult); +#ifdef __REACTOS__ + if(!winetest_interactive && tested_protocol != FTP_TEST && hrResult != expect_hrResult) { + skip("CORE-10360/ROSTESTS-192: Test might hang, skipping the rest!\n"); + exit(1); + } +#endif if(SUCCEEDED(hrResult) || tested_protocol == FTP_TEST || test_abort) ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else

1 0

[ekohl] 69598: [MSAFD] TranslateNtStatusError: Translate STATUS_ACCESS_DENIED. Patch by Jacob S. Preciado. Thanks a lot! CORE-10290 #resolve
by ekohl＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: ekohl Date: Sun Oct 18 12:45:49 2015 New Revision: 69598 URL: http://svn.reactos.org/svn/reactos?rev=69598&view=rev Log: [MSAFD] TranslateNtStatusError: Translate STATUS_ACCESS_DENIED. Patch by Jacob S. Preciado. Thanks a lot! CORE-10290 #resolve Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Oct 18 12:45:49 2015 @@ -372,6 +372,9 @@ case STATUS_ACCESS_VIOLATION: return WSAEFAULT; + + case STATUS_ACCESS_DENIED: + return WSAEACCES; default: ERR("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status);

1 0

[akhaldi] 69597: [CMAKE] Enable the new style build by default. CORE-10121
by akhaldi＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: akhaldi Date: Sun Oct 18 11:29:34 2015 New Revision: 69597 URL: http://svn.reactos.org/svn/reactos?rev=69597&view=rev Log: [CMAKE] Enable the new style build by default. CORE-10121 Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=69597&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Oct 18 11:29:34 2015 @@ -38,7 +38,7 @@ set(CMAKE_SKIP_INSTALL_RULES ON) if(NOT DEFINED NEW_STYLE_BUILD) - set(NEW_STYLE_BUILD FALSE) + set(NEW_STYLE_BUILD TRUE) endif() if(NOT ARCH)

1 0

[akhaldi] 69596: [CMAKE] We don't need this case anymore.
by akhaldi＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: akhaldi Date: Sun Oct 18 11:21:56 2015 New Revision: 69596 URL: http://svn.reactos.org/svn/reactos?rev=69596&view=rev Log: [CMAKE] We don't need this case anymore. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=69596&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Oct 18 11:21:56 2015 @@ -36,10 +36,6 @@ set(CMAKE_COLOR_MAKEFILE OFF) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) set(CMAKE_SKIP_INSTALL_RULES ON) - -if(NOT CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") - set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE) -endif() if(NOT DEFINED NEW_STYLE_BUILD) set(NEW_STYLE_BUILD FALSE)

1 0

[akhaldi] 69595: [TRANSLATIONS] Traditional Chinese (zh-TW) translation update by Henry Tang Ih. CORE-10001
by akhaldi＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: akhaldi Date: Sun Oct 18 11:19:05 2015 New Revision: 69595 URL: http://svn.reactos.org/svn/reactos?rev=69595&view=rev Log: [TRANSLATIONS] Traditional Chinese (zh-TW) translation update by Henry Tang Ih. CORE-10001 Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc trunk/reactos/base/applications/fontview/lang/zh-TW.rc trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc trunk/reactos/base/applications/mmc/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mspaint/lang/zh-TW.rc trunk/reactos/base/applications/mstsc/lang/zh-TW.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/shutdown/lang/zh-TW.rc trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -50,7 +50,7 @@ EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED + CHECKBOX "WHQL æ¸ä½ç°½ç« æª¢æ¥", IDC_WHQL_SIGN_CHECK, 15, 170, 135, 10, WS_DISABLED END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 @@ -145,17 +145,17 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN - RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 + RTEXT "å¸¸è¦ MIDI DLS éåï¼", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85 - GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70 - LTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 17 + GROUPBOX "é³æ¨å ", IDC_STATIC, 5, 10, 452, 85 + GROUPBOX "ReactX åè½", IDC_STATIC, 5, 97, 452, 70 + LTEXT "é è¨å å é:", IDC_STATIC, 15, 120, 95, 17 LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10 - PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED - LTEXT "Test using this port:", IDC_STATIC, 180, 105, 100, 10 + PUSHBUTTON "ç¦ç¨", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED + LTEXT "æ¸¬è©¦ä½¿ç¨æ¤å :", IDC_STATIC, 180, 105, 100, 10 LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED - GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 + PUSHBUTTON "æ¸¬è©¦ DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED + GROUPBOX "åè¨»", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -178,11 +178,11 @@ BEGIN GROUPBOX "å·²è¨»åç DirectPlay æåæä¾èï¼", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 - GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55 - GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35 - PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED - PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED - GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50 + GROUPBOX "è¨»å Lobbyable DirectPlay æç¨ç¨å¼", IDC_STATIC, 5, 77, 452, 55 + GROUPBOX "ReactX åè½", IDC_STATIC, 5, 133, 452, 35 + PUSHBUTTON "DirectPlay èªé³é¸é ", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED + PUSHBUTTON "æ¸¬è©¦ DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED + GROUPBOX "åè¨»", IDC_STATIC, 5, 170, 452, 50 EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP END @@ -190,11 +190,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" BEGIN - LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 - PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED - LTEXT "Displays additional system information", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED - LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 43, 300, 10 + LTEXT "ä»ç¶æ¾ä¸å°ä½ è¦æ¾çè³è¨åï¼ ä¸é¢æ¯ä¸äºå¶ä»çäºæä½ å¯ä»¥åï¼", IDC_STATIC, 5, 0, 300, 10 + PUSHBUTTON "ç³»çµ±è³è¨", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED + LTEXT "é¡¯ç¤ºéå çç³»çµ±è³è¨", IDC_STATIC, 90, 23, 300, 10 + PUSHBUTTON "å·æ°çéå¯«", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + LTEXT "éå¯« DirectDraw çå·æ°ç", IDC_STATIC, 90, 43, 300, 10 END STRINGTABLE @@ -251,12 +251,12 @@ IDS_D3DTEST_DESCRIPTION "éå°åå Direct3D çé¢æ¸¬è©¦ãè¦ç¹¼çºï¼" IDS_D3DTEST_D3Dx "æ¤æ¸¬è©¦å°ä½¿ç¨ç¡¬é«å éç Direct3D %u çé¢ã" IDS_OS_VERSION "%s %s (%d.%d, Build %d)" - IDS_DMUSIC_DESC "Description" - IDS_DMUSIC_TYPE "Type" - IDS_DMUSIC_KERNEL "Kernel Mode" - IDS_DMUSIC_IO "In/Out" - IDS_DMUSIC_DLS "Supports DLS" - IDS_DMUSIC_EXT "External" - IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" -END + IDS_DMUSIC_DESC "æè¿°" + IDS_DMUSIC_TYPE "é¡å" + IDS_DMUSIC_KERNEL "æ ¸å¿æ¨¡å¼" + IDS_DMUSIC_IO "è¼¸å¥/è¼¸åº" + IDS_DMUSIC_DLS "æ¯æ´ DLS" + IDS_DMUSIC_EXT "å¤é¨" + IDS_DMUSIC_PORT "é è¨å " + IDS_DDDISABLE_MSG "éå°ç¦ç¨ DirectDraw ææçé¡¯ç¤ºè£ç½®ä¸çææç¡¬é«å é\n.æ¨è¦ç¹¼çºå?\n" +END Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -10,17 +10,17 @@ STRINGTABLE BEGIN - IDS_INSTALL "Install" + IDS_INSTALL "å®è£" IDS_PRINT "åå°" IDS_STRING "ReactOS çµ¦ææäººä¸åèªç±çæä½ç³»çµ±ï¼ 1234567890" - IDS_OPEN "Open Font..." + IDS_OPEN "æéåé«..." IDS_ERROR "é¯èª¤" IDS_ERROR_NOMEM "æ²æè¶³å¤ çè¨æ¶é«ä¾å®ææä½ã" IDS_ERROR_NOFONT "%1 ä¸æ¯ä¸åææçåé«æªæ¡ã" IDS_ERROR_NOCLASS "çªå£ç¡æ³åå§åã" - IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ -TrueType Font (*.ttf)\0*.ttf\0\ -OpenType Font (*.otf)\0*.otf\0\ -Font File (*.fon)\0*.fon\0\ -All Files (*.*)\0*.*\0" + IDS_FILTER_LIST "æææ¯æ´çåé« (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType åé« (*.ttf)\0*.ttf\0\ +OpenType åé« (*.otf)\0*.otf\0\ +åé«æª (*.fon)\0*.fon\0\ +æææª (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -18,13 +18,13 @@ GROUPBOX "ç¼ç", -1, 7, 7, 90, 40 AUTORADIOBUTTON "ç¼ä¸å¼µç(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "ç¼ä¸å¼µç(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - GROUPBOX "Scoring", -1, 100, 7, 75, 53 - AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 - AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10 + GROUPBOX "å¾å", -1, 100, 7, 75, 53 + AUTORADIOBUTTON "æ¨æº(&S)", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "ç¶å æ¯(&V)", IDC_OPT_VEGAS, 107, 32, 60, 10 + AUTORADIOBUTTON "ç¡(&N)", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "è¨æ(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP AUTOCHECKBOX "çæå(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + AUTOCHECKBOX "ä¿çå¾å(&K)", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP DEFPUSHBUTTON "ç¢ºå®", IDOK, 35, 97, 50, 14 PUSHBUTTON "åæ¶", IDCANCEL, 101, 97, 50, 14 END Modified: trunk/reactos/base/applications/mmc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -12,7 +12,7 @@ BEGIN POPUP "æªæ¡(&F)" BEGIN - MENUITEM "New\tCtrl+N", IDM_FILE_NEW + MENUITEM "æ°å»º\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT END @@ -26,13 +26,13 @@ BEGIN POPUP "æªæ¡(&F)" BEGIN - MENUITEM "New\tCtrl+N", IDM_FILE_NEW + MENUITEM "æ°å»º\tCtrl+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT END - POPUP "&Windows" + POPUP "è¦çª(&W)" BEGIN - MENUITEM "List", IDM_WINDOWS_LIST + MENUITEM "æ¸å®", IDM_WINDOWS_LIST END POPUP "èªªæ(&H)" BEGIN Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -52,14 +52,14 @@ STRINGTABLE BEGIN - IDS_MODE_UNKNOWN "Unknown" - IDS_MODE_OPEN "Opened" - IDS_MODE_STOP "Stopped" - IDS_MODE_PLAY "Playing" - IDS_MODE_PAUSE "Paused" - IDS_MODE_RECORD "Recording" - IDS_MODE_SEEK "Seeking" - IDS_MODE_NOT_READY "Not ready" + IDS_MODE_UNKNOWN "æªç¥" + IDS_MODE_OPEN "å·²æé" + IDS_MODE_STOP "å·²åæ¢" + IDS_MODE_PLAY "ææ¾ä¸" + IDS_MODE_PAUSE "å·²æ«å" + IDS_MODE_RECORD "éé³ä¸" + IDS_MODE_SEEK "å°æ¾ä¸" + IDS_MODE_NOT_READY "æªæºåå¥½" IDS_ALL_TYPES_FILTER "æææ¯æ´æ ¼å¼" IDS_TOOLTIP_PLAY "ææ¾" IDS_TOOLTIP_STOP "åæ¢" Modified: trunk/reactos/base/applications/mspaint/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -17,9 +17,9 @@ MENUITEM "å²å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "å¦åçº... (&A)", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "Page View", IDM_FILEPAGEVIEW - MENUITEM "Page Setup...", IDM_FILEPAGESETUP - MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT + MENUITEM "é é¢æª¢è¦", IDM_FILEPAGEVIEW + MENUITEM "é é¢è¨å®...", IDM_FILEPAGESETUP + MENUITEM "åå°...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "å²åçºå£ç´ (æ®é)", IDM_FILEASWALLPAPERPLANE MENUITEM "å²åçºå£ç´ (å±ä¸)", IDM_FILEASWALLPAPERCENTERED @@ -70,7 +70,7 @@ POPUP "åå(&I)" BEGIN MENUITEM "æè½/ç¿»è½...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "æä¼¸/å¾æ...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "åªè£", IDM_IMAGECROP MENUITEM "é¡è²åè½\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "å§å®¹...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -81,8 +81,8 @@ BEGIN MENUITEM "ç·¨è¼¯è²å½©...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "æ°èª¿è²æ¿", IDM_COLORSMODERNPALETTE + MENUITEM "èèª¿è²æ¿", IDM_COLORSOLDPALETTE END POPUP "èªªæ(&?)" BEGIN @@ -161,9 +161,9 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "æä¼¸åå¾æåç" +BEGIN + GROUPBOX "æä¼¸", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -172,15 +172,15 @@ LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "å¾æ", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "ç¢ºå®", IDOK, 170, 8, 48, 14 PUSHBUTTON "åæ¶", IDCANCEL, 170, 24, 48, 14 END @@ -214,9 +214,9 @@ IDS_SAVEFILTER "24 ä½åé»é£å (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d ä½åçµ" IDS_PRINTRES "%d x %d åç´ æ¯ç±³" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." - IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the bitmap.\nWould you like the bitmap enlarged?" -END + IDS_INTNUMBERS "è«è¼¸å¥æ´æ¸åª!" + IDS_PERCENTAGE "æå ç¾åæ¯å¿é ä»æ¼ 1 å 500 ä¹éã" + IDS_ANGLE "è§åº¦å¿é -89 å 89 ä¹éã" + IDS_LOADERRORTEXT "ç¡æ³è¼å¥æª %sã" + IDS_ENLARGEPROMPTTEXT "åªè²¼ç°¿ä¸çååæ¯é»é£åå¤§ã\nä½ æ³æ´å¤§é»é£åå?" +END Modified: trunk/reactos/base/applications/mstsc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -62,7 +62,7 @@ IDS_HIGHCOLOR15 "32,768 è² (15 ä½å)" IDS_HIGHCOLOR16 "65,536 è² (16 ä½å)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ä½å)" - IDS_HIGHCOLOR32 "Highest Quality (32 bit)" + IDS_HIGHCOLOR32 "æé«åè³ª (32 bit)" IDS_PIXEL "%lux%lu åç´ " IDS_FULLSCREEN "å¨å±å¹" IDS_BROWSESERVER "<çè¦½æ´å¤...>" Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -68,12 +68,12 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "ä»£ç", -1, 4, 116, 240, 76 + CONTROL "ç³»çµ±ä»£çè¨ç½®", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "ç´æ¥ (ç¡ä»£ç)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ä»£ç", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "æ²æä»£ç", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "ç¢ºå®", IDOK, 116, 195, 60, 14 @@ -197,9 +197,9 @@ IDS_CHOOSE_FOLDER_ERROR "æ¨é¸æçè³æå¤¾ä¸åå¨ãåµå»ºåï¼" IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" IDS_INFORMATION "è³è¨" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "ç¡æ³ä¸è¼å!æ¾ä¸å°çä½å!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." - IDS_INTEG_CHECK_TITLE "Verifying package integrity..." - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." -END + IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" + IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." + IDS_INTEG_CHECK_FAIL "åæ²æééå®æ´æ§æª¢æ¥ï¼å®å¯è½å·²æå£ï¼æèå¨ä¸è¼éç¨ä¸ç¯¡æ¹ãå»ºè°æ¨ä¸è¦éè¡è©²è»é«ã" +END Modified: trunk/reactos/base/applications/shutdown/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -3,101 +3,101 @@ /* Dialog */ IDD_GUI DIALOGEX 0, 0, 240, 255 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remote Shutdown" +CAPTION "é ç«¯éæ©" FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&OK", IDC_OK, 125, 232, 50, 14 - PUSHBUTTON "&Cancel", IDC_CANCEL, 178, 232, 50, 14 - LTEXT "Co&mputers:", IDC_STATIC, 9, 9, 35, 36 + DEFPUSHBUTTON "ç¢ºå®(&O)", IDC_OK, 125, 232, 50, 14 + PUSHBUTTON "åæ¶(&C)", IDC_CANCEL, 178, 232, 50, 14 + LTEXT "é»è¦:(&M)", IDC_STATIC, 9, 9, 35, 36 LISTBOX IDC_COMPUTER_LIST, 8, 19, 162, 55 - PUSHBUTTON "&Add...", IDC_ADD_SYSTEM, 179, 19, 50, 14 - PUSHBUTTON "&Remove", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED - PUSHBUTTON "&Browse...", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 - LTEXT "Action", IDC_ACTION, 11, 81, 20, 14 + PUSHBUTTON "æ·»å ...(&A)", IDC_ADD_SYSTEM, 179, 19, 50, 14 + PUSHBUTTON "åªé¤(&R)", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED + PUSHBUTTON "æµè¦½...(&B)", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 + LTEXT "è¡å", IDC_ACTION, 11, 81, 20, 14 COMBOBOX IDC_ACTION_TYPE, 37, 79, 129, 14, WS_TABSTOP | CBS_DROPDOWN - CHECKBOX "Warn users", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Display warning for", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 + CHECKBOX "è¦åä½¿ç¨è", IDC_WARN_USERS, 175, 79, 55, 14, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "é¡¯ç¤ºè¦å", IDC_SHOW_WARN_ONE, 11, 99, 65, 14 EDITTEXT IDC_SHOW_WARN, 78, 97, 41, 14 - LTEXT "second(s)", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 - GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 5, 114, 224, 114 - LTEXT "Reason:", IDC_STATIC, 16, 130, 27, 8 - CHECKBOX "Planned", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "ç§", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 + GROUPBOX "ééäºä»¶è·è¹¤ç¨å¼", IDC_STATIC, 5, 114, 224, 114 + LTEXT "åå :", IDC_STATIC, 16, 130, 27, 8 + CHECKBOX "è¨ç«", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN - LTEXT "Comm&ent:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 + LTEXT "è©è«:(&E)", IDC_COMMENT_CAPTION, 16, 159, 38, 8 EDITTEXT IDC_COMMENT_TEXT, 17, 171, 198, 50, WS_VSCROLL END /* Information and error messages */ STRINGTABLE BEGIN - IDS_USAGE "ReactOS Shutdown Utility\n\ + IDS_USAGE "é»è¦éæ©å¬ç¨ç¨å¼\n\ \n\ -Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ +ä½¿ç¨æ¹æ³: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\ \n\ - No arguments or /? Display this help.\n\ - /i Show the graphical user interface (GUI). This option must be the\n\ - first one.\n\ - /l Log off on the local system only. Cannot be used with /m or /d.\n\ - /s Shutdown the computer.\n\ - /r Restart the computer.\n\ - /g Restart the computer and restart all the registered applications.\n\ - /a Cancel a delayed shutdown. Can only be used during the delay\n\ - period.\n\ - /p Shutdown the local computer without any timeout or warning. Can be\n\ - used with /d or /f.\n\ - /h Hibernate the local computer. Usable with /f.\n\ - /e Document the reason for the unexpected computer shutdown.\n\ - /m \\\\computer Specify the target computer (UNC/IP address).\n\ - /t xxx Set the timeout period to xxx seconds before shutting down.\n\ - The valid range starts from 0 to 315360000 (10 years),\n\ - 30 being the default value.\n\ - /c ""comment"" Comment on the reason for shutdown or restart.\n\ - 512 characters maximum allowed.\n\ - /f Force running applications to close without warning users. If you\n\ - do not specify any other parameter, this option will also log off.\n\ - /d [p|u:]xx:yy Give the reason code for the shutdown or the restart.\n\ - p indicates that the shutdown or the restart is planned.\n\ - u indicates that the reason is defined by the user.\n\ - If neither p nor u are specified, the shutdown or the restart are\n\ - not planned.\n\ - xx is the major reason code (positive integer smaller than 256).\n\ - yy is the minor reason code (positive integer smaller than 65536).\n" + æ²æåæ¸æ /? é¡¯ç¤ºæ¤èª¬æã\n\ + /i é¡¯ç¤ºåå½¢åä½¿ç¨èä»é¢ (GUI)ãæ¤é¸é å¿é æ¯\n\ + ç¬¬ä¸åã\n\ + /l åªå¨æ¬å°ç³»çµ±ä¸ç»åºãä¸è½ä½¿ç¨è /m æ /dã\n\ + /s ééé»è¦ã\n\ + /r éæ°éæ©é»è¦ã\n\ + /g éæ°éæ©é»è¦ä¸¦éæ°ååææå·²è¨»åçæç¨ç¨å¼ã\n\ + /a åæ¶å»¶é²ééé»æºãåªæå¨å»¶é²é±æ\n\ + å§ä½¿ç¨ã\n\ + /p ééæ¬å°é»è¦æ²æä»»ä½è¶ææè¦åã å¯ä»¥\n\ + ç¨ /d æ /fã\n\ + /h ä¼ç æ¬å°é»è¦ãå¯ç¨è /fã\n\ + /e è¨éé»è¦æå¤çéæ©çåå ã\n\ + /m \\\\computer æå®ç®çé»è¦ (UNC æ IP ä½å)ã\n\ + /t xxx å°è¶ææéè¨ç½®çº xxx ç§å¾ééã\n\ + ææç¯åå¾ 0 éå§å° 315360000 (10 å¹´)ï¼\n\ + 30 çé è¨å¼ã\n\ + /c ""comment"" ééåå ç¼è¡¨è©è«ï¼æéæ°éæ©ã\n\ + 512 åååæå¤§åè¨±ã\n\ + /f å¼·å¶éè¡æ²æè¦åä½¿ç¨èééæç¨ç¨å¼ãå¦ææ¨\n\ + ä¸æå®ä»»ä½å¶ä»åæ¸ï¼æ¤é¸é å°ä¹ç»åºã\n\ + /d [p|u:]xx:yy çµ¦éæ©æéæ°éæ©çåå ä»£ç¢¼ã\n\ + p æç¤ºéæ©æéæ°éæ©è¨ç«ã\n\ + u è¡¨ç¤ºåå ç±ä½¿ç¨èå®ç¾©ã\n\ + å¦ææå®äºæ¢ä¸æ¯ p ä¹ä¸æ¯ä½ ï¼ä¸æè¨ç«éæ©æ\n\ + éæ°éæ©ã\n\ + xx æ¯ä¸»è¦åå ä»£ç¢¼ (æ£æ´æ¸å°æ¼ 256)ã\n\ + yy æ¯æ¬¡è¦åå ä»£ç¢¼ (å°æ¼ 65536 æ£æ´æ¸)ã\n" - IDS_ERROR_SHUTDOWN_REBOOT "ERROR: Unable to shutdown and restart at the same time.\n" - IDS_ERROR_TIMEOUT "ERROR: Timeout value of %u is out of bounds (0-315360000).\n" - IDS_ERROR_ABORT "ERROR: Unable to abort the shutdown of the system.\n" - IDS_ERROR_LOGOFF "ERROR: Unable to logoff the system.\n" - IDS_ERROR_SHUTDOWN "ERROR: Unable to shutdown the system.\n" - IDS_ERROR_RESTART "ERROR: Unable to restart the system.\n" - IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: Comment length exceeds maximum character limit set by the system.\n" - IDS_ERROR_HIBERNATE "ERROR: Unable to send system into hibernation mode.\n" - IDS_ERROR_HIBERNATE_LOCAL "ERROR: Hibernation mode cannot be started remotely.\n" - IDS_ERROR_HIBERNATE_ENABLED "ERROR: Hibernation mode is not enabled.\n" - IDS_ERROR_DIALOG_CAPTION "Remote Shutdown" - IDS_ERROR_DIALOG_INIT "Unable to display the graphical user interface." + IDS_ERROR_SHUTDOWN_REBOOT "é¯èª¤: å¨åä¸æéç¡æ³éæ©åéæ°éæ©ã\n" + IDS_ERROR_TIMEOUT "é¯èª¤: %u çè¶æå¼çº (0-315360000) åºçã\n" + IDS_ERROR_ABORT "é¯èª¤: ç¡æ³ä¸æ¢çç³»çµ±ééã\n" + IDS_ERROR_LOGOFF "é¯èª¤: ç¡æ³ç»åºç³»çµ±ã\n" + IDS_ERROR_SHUTDOWN "é¯èª¤: ç¡æ³ééç³»çµ±ã\n" + IDS_ERROR_RESTART "é¯èª¤: ç¡æ³éæ°éæ©ç³»çµ±ã\n" + IDS_ERROR_MAX_COMMENT_LENGTH "é¯èª¤: è©è«é·åº¦è¶åºç±ç³»çµ±è¨ç½®çæå¤§ååæ¸éå¶ã\n" + IDS_ERROR_HIBERNATE "é¯èª¤: ç¡æ³ç¼éç³»çµ±é²å¥ç¡ç æ¨¡å¼ã\n" + IDS_ERROR_HIBERNATE_LOCAL "é¯èª¤: ç¡æ³é ç«¯ååç¡ç æ¨¡å¼ã\n" + IDS_ERROR_HIBERNATE_ENABLED "é¯èª¤: æ²æåç¨ç¡ç æ¨¡å¼ã\n" + IDS_ERROR_DIALOG_CAPTION "é ç«¯éæ©" + IDS_ERROR_DIALOG_INIT "ç¡æ³é¡¯ç¤ºåå½¢åä½¿ç¨èä»é¢ã" END /* Remote shutdown action strings */ STRINGTABLE BEGIN - IDS_ACTION_SHUTDOWN "Shutdown the system" - IDS_ACTION_RESTART "Restart the system" - IDS_ACTION_UNEXPECTED_SHUTDOWN "Annotate the unexpected shutdown" + IDS_ACTION_SHUTDOWN "ééç³»çµ±" + IDS_ACTION_RESTART "éæ°éæ©ç³»çµ±" + IDS_ACTION_UNEXPECTED_SHUTDOWN "æ³¨éæå¤çéé" END /* Remote shutdown reason strings */ STRINGTABLE BEGIN - IDS_REASON_OTHER "Other" - IDS_REASON_HARDWARE_MAINTENANCE "Hardware: Maintenance" - IDS_REASON_HARDWARE_INSTALL "Hardware: Installation" - IDS_REASON_OS_RECOVER "Operating System: Recovery" - IDS_REASON_OS_RECONFIGURE "Operating System: Reconfigure" - IDS_REASON_APP_MAINTENANCE "Application: Maintenance" - IDS_REASON_APP_INSTALL "Application: Installation" - IDS_REASON_APP_UNRESPONSIVE "Application: Unresponsive" - IDS_REASON_APP_UNSTABLE "Application: Unstable" - IDS_REASON_SECURITY "Security Issue" - IDS_REASON_NETWORK "Loss of network connectivity" + IDS_REASON_OTHER "å¶ä»" + IDS_REASON_HARDWARE_MAINTENANCE "ç¡¬é«: ç¶è·" + IDS_REASON_HARDWARE_INSTALL "ç¡¬é«: å®è£" + IDS_REASON_OS_RECOVER "ä½æ¥ç³»çµ±: æ¢å¾©" + IDS_REASON_OS_RECONFIGURE "ä½æ¥ç³»çµ±: éæ°éç½®" + IDS_REASON_APP_MAINTENANCE "æç¨ç¨å¼: ç¶è·" + IDS_REASON_APP_INSTALL "æç¨ç¨å¼: å®è£" + IDS_REASON_APP_UNRESPONSIVE "æç¨ç¨å¼: æ²æåæ" + IDS_REASON_APP_UNSTABLE "æç¨ç¨å¼: ä¸ç©©å®" + IDS_REASON_SECURITY "å®å¨åé¡" + IDS_REASON_NETWORK "ç¶²è·¯é£æ¥ä¸å¤±" END Modified: trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -33,35 +33,35 @@ MENUITEM "éå...", ID_FILE_OPEN MENUITEM "å²å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åçº...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "éå...", ID_FILE_RESTORE, GRAYED + MENUITEM "å±¬æ§", ID_FILE_PROPERTIES MENUITEM SEPARATOR MENUITEM "çµæ", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "ç·¨è¼¯(&E)" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "è¤è£½(&C)", ID_EDIT_COPY + MENUITEM "ç²è²¼æå¥(&P)", ID_EDIT_PASTE, GRAYED + MENUITEM "ç²è²¼æ··å(&X)", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "æå¥æª...(&I)", ID_EDIT_INSERTFILE + MENUITEM "èæªæ··å...(&M)", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "åªé¤ç¶åä½ç½®ä¹å(&B)",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "åªé¤ç¶åä½ç½®ä¹å¾(&A)",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "é³è¨å±¬æ§(&U)", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "ææ(&S)" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "èª¿é«é³é (25%)(&I)", ID_EFFECTS_INCVOL + MENUITEM "æ¸å°é³é(&D)", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "å¢å éåº¦ (100%)(&I)", ID_EFFECTS_INCSPD + MENUITEM "éä½éåº¦(&D)", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "æ·»å åé³(&A)", ID_EFFECTS_ECHO + MENUITEM "åå(&R)", ID_EFFECTS_REVERSE END POPUP "èªªæ" BEGIN Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] Sun Oct 18 11:19:05 2015 @@ -54,17 +54,17 @@ MENUITEM "å±¤ç(&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" - BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + POPUP "éé(&U)" + BEGIN + MENUITEM "å¾æ©(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "ä¼ç (&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "ééé»æº(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "éæ°éæ©(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "ç»åº %s (&L)", ID_SHUTDOWN_LOGOFF + MENUITEM "åæä½¿ç¨è(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "éå®é»è¦(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "æ·éé£æ¥(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "å½åºé»è¦(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "èªªæ(&H)" BEGIN @@ -240,7 +240,7 @@ IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Debug Channels" +CAPTION "èª¿è©¦é »é" FONT 9, "MS Shell Dlg" BEGIN CONTROL "List2", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | @@ -323,7 +323,7 @@ CONTROL "I/O å¯«å¥ä½åçµ", IDC_IOWRITEBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 127, 65, 10 CONTROL "å¶ä» I/O", IDC_IOOTHER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 138, 46, 10 CONTROL "å¶ä» I/O ä½åçµ", IDC_IOOTHERBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 149, 65, 10 - CONTROL "Command &Line", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 + CONTROL "å½ä»¤å(&L)", IDC_COMMANDLINE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 160, 65, 10 END /* String Tables */ @@ -332,19 +332,19 @@ BEGIN IDS_APP_TITLE "å·¥ä½ç®¡çå¡" IDC_TASKMGR "å·¥ä½ç®¡çå¡" - IDS_IDLE_PROCESS "System Idle Process" + IDS_IDLE_PROCESS "ç³»çµ±ç©ºéé²ç¨" END STRINGTABLE BEGIN ID_FILE_NEW "æ°ç¨åº" - ID_OPTIONS_ALWAYSONTOP "Task Manager remains in front of all other windows unless minimized" - ID_OPTIONS_MINIMIZEONUSE "Task Manager is minimized when a SwitchTo operation is performed" - ID_OPTIONS_HIDEWHENMINIMIZED "Hide the Task Manager when it is minimized" - ID_VIEW_REFRESH "Force Task Manager to update now, regardless of Update Speed setting" - ID_VIEW_LARGE "Displays tasks by using large icons" - ID_VIEW_SMALL "Displays tasks by using small icons" - ID_VIEW_DETAILS "Displays information about each task" + ID_OPTIONS_ALWAYSONTOP "å·¥ä½ç®¡çå¡ä»ç¶æ¯ææå¶ä»è¦çªçåé¢ï¼é¤éæå°å" + ID_OPTIONS_MINIMIZEONUSE "å·¥ä½ç®¡çå¡æå°åå·è¡ SwitchTo æä½æ" + ID_OPTIONS_HIDEWHENMINIMIZED "é±èå·¥ä½ç®¡çå¡ç¶å®æå°åæ" + ID_VIEW_REFRESH "å¼·å¶å·¥ä½ç®¡çå¡ç«å³æ´æ°ï¼å¿½ç¥æ´æ°éåº¦è¨ç½®" + ID_VIEW_LARGE "ç¨å¤§åç¤ºé¡¯ç¤ºä»»å" + ID_VIEW_SMALL "ç¨å°åç¤ºé¡¯ç¤ºä»»å" + ID_VIEW_DETAILS "é¡¯ç¤ºæéæ¯åä»»åçè³è¨" ID_VIEW_UPDATESPEED_HIGH "æ¯ç§æ´æ°å©æ¬¡" ID_VIEW_UPDATESPEED_NORMAL "æ¯å©ç§æ´æ°ä¸æ¬¡" ID_VIEW_UPDATESPEED_LOW "æ¯åç§æ´æ°ä¸æ¬¡" @@ -352,32 +352,32 @@ STRINGTABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "Does not automatically update" - ID_WINDOWS_TILEHORIZONTALLY "Tiles the windows horizontally on the desktop" - ID_WINDOWS_TILEVERTICALLY "Tiles the windows vertically on the desktop" - ID_WINDOWS_MINIMIZE "Minimizes the windows" - ID_WINDOWS_MAXIMIZE "Maximizes the windows" - ID_WINDOWS_CASCADE "Cascades the windows diagonally on the desktop" - ID_WINDOWS_BRINGTOFRONT "Brings the window front, but does not switch to it" - ID_HELP_TOPICS "Displays Task Manager help topics" - ID_HELP_ABOUT "Displays program information, version number, and copyright" - ID_FILE_EXIT "Exits the Task Manager application" - ID_OPTIONS_SHOW16BITTASKS "Shows 16-bit tasks under the associated ntvdm.exe" - ID_VIEW_SELECTCOLUMNS "Select which columns will be visible on the Process page" - ID_VIEW_SHOWKERNELTIMES "Displays kernel time in the performance graphs" - ID_VIEW_CPUHISTORY_ONEGRAPHALL "A single history graph shows total CPU usage" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Each CPU has its own history graph" - ID_APPLICATION_PAGE_SWITCHTO "Brings a task to the foreground, switch focus to that task" + ID_VIEW_UPDATESPEED_PAUSED "ä¸èªåæ´æ°" + ID_WINDOWS_TILEHORIZONTALLY "è¦çªå¨æ¡é¢ä¸æ°´æºå¹³éª" + ID_WINDOWS_TILEVERTICALLY "è¦çªå¨æ¡é¢ä¸åç´å¹³éª" + ID_WINDOWS_MINIMIZE "æå°åè¦çª" + ID_WINDOWS_MAXIMIZE "æå¤§åè¦çª" + ID_WINDOWS_CASCADE "å±¤çå°è§æ¡é¢ä¸çè¦çª" + ID_WINDOWS_BRINGTOFRONT "å°è¦çªåç½®ï¼ä½ä¸è½åæå°å®" + ID_HELP_TOPICS "é¡¯ç¤ºå·¥ä½ç®¡çå¡èªªæä¸»é¡" + ID_HELP_ABOUT "é¡¯ç¤ºç¨å¼è³è¨ã çæ¬èåçæ¬è³è¨" + ID_FILE_EXIT "éåºå·¥ä½ç®¡çå¡æç¨ç¨å¼" + ID_OPTIONS_SHOW16BITTASKS "é¡¯ç¤ºéè¯ ntvdm.exe ä¸ç 16 ä½ä»»å" + ID_VIEW_SELECTCOLUMNS "é¸æåªä¸åå°å¯è¦çé²ç¨é " + ID_VIEW_SHOWKERNELTIMES "å¨ç¸¾æåä¸é¡¯ç¤ºæ ¸å¿ç¨å¼çæé" + ID_VIEW_CPUHISTORY_ONEGRAPHALL "å®ä¸æ·å²è¨éåè¡¨é¡¯ç¤ºåºç¸½ç CPU ä½¿ç¨ç" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "æ¯å CPU é½æå¶èªèº«çæ·å²å" + ID_APPLICATION_PAGE_SWITCHTO "å¸¶ä¾çåæ¯ï¼å°ç¦é»åæå°è©²ä»»åçä»»å" END STRINGTABLE BEGIN - ID_ENDTASK "Tells the selected tasks to close" - ID_GOTOPROCESS "Switches the focus to the process of the selected task" - ID_RESTORE "Restores the Task Manager from its hidden state" - ID_PROCESS_PAGE_ENDPROCESS "Removes the process from the system" - ID_PROCESS_PAGE_ENDPROCESSTREE "Removes this process and all descendants from the system" - ID_PROCESS_PAGE_DEBUG "Attaches the debugger to this process" + ID_ENDTASK "åè¨´è¦ééæé¸çä»»å" + ID_GOTOPROCESS "å°ç¦é»åæå°æé¸ä»»åçéç¨" + ID_RESTORE "å¾å¶é±èçææ¢å¾©å·¥ä½ç®¡çå¨" + ID_PROCESS_PAGE_ENDPROCESS "å¾ç³»çµ±ä¸åªé¤çéç¨" + ID_PROCESS_PAGE_ENDPROCESSTREE "å¾ç³»çµ±ä¸åªé¤æ¤é²ç¨åå¶ææåé«" + ID_PROCESS_PAGE_DEBUG "å°èª¿è©¦å¨éå å°è©²é²ç¨" ID_PROCESS_PAGE_SETAFFINITY "æ§å¶ç¨åºåè¨±å¨åªåèçå¨éè¡" ID_PROCESS_PAGE_SETPRIORITY_REALTIME "è¨å®ç¨åºåªåé åºçºå³æ" ID_PROCESS_PAGE_SETPRIORITY_HIGH "è¨å®ç¨åºåªåé åºçºé«" @@ -419,7 +419,7 @@ IDS_TAB_IOREADBYTES "I/O è®åä½åçµ" IDS_TAB_IOWRITESBYTES "I/O å¯«å¥ä½åçµ" IDS_TAB_IOOTHERBYTES "å¶ä» I/O ä½åçµ" - IDS_TAB_COMMANDLINE "Command Line" + IDS_TAB_COMMANDLINE "å½ä»¤å" IDS_MENU_SELECTCOLUMNS "é¸æå(&S)..." IDS_MENU_16BITTASK "é¡¯ç¤º 16 ä½å·¥ä½(&S)" IDS_MENU_WINDOWS "çªå£(&W)" @@ -440,7 +440,7 @@ IDS_MSG_TASKMGRWARNING "å·¥ä½ç®¡çå¡è¦å" IDS_MSG_WARNINGTERMINATING "è¦å: çµæç¨åºå¯è½å°æ¿è³æéºå¤±æç³»çµ±ä¸ç©©å®ã\nç¨åºå¨çµææå°ä¸è½å²åä»»ä½è³æã\nä½ æ¯å¦ç¢ºå®è¦ç¹¼çºï¼" IDS_MSG_UNABLETERMINATEPRO "ç¡æ³çµæèçç¨åº" - IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." + IDS_MSG_CLOSESYSTEMPROCESS "éæ¯ä¸åééµçç³»çµ±éç¨ãå·¥ä½ç®¡çå¡ä¸æçµæéä¸é²ç¨ã" IDS_MSG_UNABLECHANGEPRIORITY "ç¡æ³æ´æ¹åªåé åº" IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: æ´æ¹æ¤ç¨åºçåªåé åºå¯è½å°è´ç³»çµ±ä¸ç©©å®ã\nä½ æ¯å¦ç¢ºå®è¦æ´æ¹åªåé åºï¼" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ææ³: %d%%"

1 0

[tfaber] 69594: [WINE] - Make some test.h functions usable in apitests aka fix build
by tfaber＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: tfaber Date: Sun Oct 18 10:51:47 2015 New Revision: 69594 URL: http://svn.reactos.org/svn/reactos?rev=69594&view=rev Log: [WINE] - Make some test.h functions usable in apitests aka fix build Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Oct 18 10:51:47 2015 @@ -493,13 +493,13 @@ { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, (unsigned)exit_code ); InterlockedIncrement( &failures ); } else { fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + current_test->name, (unsigned)exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -630,10 +630,10 @@ /*if (winetest_debug)*/ { fprintf( stdout, "\n%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, + test->name, (int)(successes + failures + todo_successes + todo_failures), + (int)todo_successes, (int)(failures + todo_failures), (failures + todo_failures != 1) ? "failures" : "failure", - skipped ); + (int)skipped ); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status;

1 0

[tfaber] 69593: [ATL] - Add CComHeapPtr implementation and tests. Patch by Mark Jansen. CORE-10344 #resolve
by tfaber＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: tfaber Date: Sun Oct 18 10:46:11 2015 New Revision: 69593 URL: http://svn.reactos.org/svn/reactos?rev=69593&view=rev Log: [ATL] - Add CComHeapPtr implementation and tests. Patch by Mark Jansen. CORE-10344 #resolve Added: trunk/rostests/apitests/atl/ trunk/rostests/apitests/atl/CComHeapPtr.cpp (with props) trunk/rostests/apitests/atl/CMakeLists.txt (with props) trunk/rostests/apitests/atl/testlist.c (with props) Modified: trunk/reactos/lib/atl/atlbase.h trunk/rostests/apitests/CMakeLists.txt Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=6959… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Sun Oct 18 10:46:11 2015 @@ -836,6 +836,94 @@ } }; + +// TODO: When someone needs it, make the allocator a template, so you can use it for both +// CoTask* allocations, and CRT-like allocations (malloc, realloc, free) +template<class T> +class CComHeapPtr +{ +public: + CComHeapPtr() : + m_Data(NULL) + { + } + + explicit CComHeapPtr(T *lp) : + m_Data(lp) + { + } + + explicit CComHeapPtr(CComHeapPtr<T> &lp) + { + m_Data = lp.Detach(); + } + + ~CComHeapPtr() + { + Release(); + } + + T *operator = (CComHeapPtr<T> &lp) + { + if (lp.m_Data != m_Data) + Attach(lp.Detach()); + return *this; + } + + bool Allocate(size_t nElements = 1) + { + ATLASSERT(m_Data == NULL); + m_Data = static_cast<T*>(::CoTaskMemAlloc(nElements * sizeof(T))); + return m_Data != NULL; + } + + bool Reallocate(_In_ size_t nElements) + { + T* newData = static_cast<T*>(::CoTaskMemRealloc(m_Data, nElements * sizeof(T))); + if (newData == NULL) + return false; + m_Data = newData; + return true; + } + + void Release() + { + if (m_Data) + { + ::CoTaskMemFree(m_Data); + m_Data = NULL; + } + } + + void Attach(T *lp) + { + Release(); + m_Data = lp; + } + + T *Detach() + { + T *saveP = m_Data; + m_Data = NULL; + return saveP; + } + + T **operator &() + { + ATLASSERT(m_Data == NULL); + return &m_Data; + } + + operator T* () const + { + return m_Data; + } + +protected: + T *m_Data; +}; + + class CComBSTR { public: Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun Oct 18 10:46:11 2015 @@ -4,6 +4,7 @@ add_dependencies(apitest xdk) add_subdirectory(advapi32) +add_subdirectory(atl) add_subdirectory(browseui) add_subdirectory(com) add_subdirectory(crt) Added: trunk/rostests/apitests/atl/CComHeapPtr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CComHeapPtr.… ============================================================================== --- trunk/rostests/apitests/atl/CComHeapPtr.cpp (added) +++ trunk/rostests/apitests/atl/CComHeapPtr.cpp [iso-8859-1] Sun Oct 18 10:46:11 2015 @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CComHeapPtr + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> +#include <atlbase.h> +#include <atlcom.h> + +static PDWORD test_Alloc(DWORD value) +{ + PDWORD ptr = (PDWORD)::CoTaskMemAlloc(sizeof(DWORD)); + *ptr = value; + return ptr; +} + + +static LONG g_OpenAllocations = 0; +static LONG g_Reallocations = 0; + +struct CMallocSpy : public IMallocSpy +{ + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObject) + { + if (IsEqualGUID(riid, IID_IMallocSpy)) + { + *ppvObject = this; + } + return S_OK; + } + + virtual ULONG STDMETHODCALLTYPE AddRef() { return 1; } + virtual ULONG STDMETHODCALLTYPE Release() { return 1; } + virtual ULONG STDMETHODCALLTYPE PreAlloc(ULONG cbRequest) { return cbRequest; } + virtual LPVOID STDMETHODCALLTYPE PostAlloc(LPVOID pActual) + { + InterlockedIncrement(&g_OpenAllocations); + return pActual; + } + virtual LPVOID STDMETHODCALLTYPE PreFree(LPVOID pRequest, BOOL) { return pRequest; } + virtual void STDMETHODCALLTYPE PostFree(BOOL fSpyed) + { + if (fSpyed) + InterlockedDecrement(&g_OpenAllocations); + } + virtual ULONG STDMETHODCALLTYPE PreRealloc(LPVOID pRequest, ULONG cbRequest, LPVOID *ppNewRequest, BOOL) + { + *ppNewRequest = pRequest; + return cbRequest; + } + virtual LPVOID STDMETHODCALLTYPE PostRealloc(LPVOID pActual, BOOL fSpyed) + { + if (fSpyed) + InterlockedIncrement(&g_Reallocations); + return pActual; + } + virtual LPVOID STDMETHODCALLTYPE PreGetSize(LPVOID pRequest, BOOL) { return pRequest; } + virtual ULONG STDMETHODCALLTYPE PostGetSize(ULONG cbActual, BOOL) { return cbActual; } + virtual LPVOID STDMETHODCALLTYPE PreDidAlloc(LPVOID pRequest, BOOL) { return pRequest; } + virtual int STDMETHODCALLTYPE PostDidAlloc(LPVOID, BOOL, int fActual) { return fActual; } + virtual void STDMETHODCALLTYPE PreHeapMinimize() {} + virtual void STDMETHODCALLTYPE PostHeapMinimize() {} +}; + +static CMallocSpy g_Spy; + + +START_TEST(CComHeapPtr) +{ + HRESULT hr = CoRegisterMallocSpy(&g_Spy); + ok(SUCCEEDED(hr), "Expected CoRegisterMallocSpy to succeed, but it failed: 0x%lx\n", hr); + + { + ok(g_OpenAllocations == 0, "Expected there to be 0 allocations, was: %ld\n", g_OpenAllocations); + CComHeapPtr<DWORD> heapPtr1; + ok(g_OpenAllocations == 0, "Expected there to be 0 allocations, was: %ld\n", g_OpenAllocations); + CComHeapPtr<DWORD> heapPtr2(test_Alloc(0x11111111)); + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + + ok((PDWORD)heapPtr1 == NULL, "Expected heapPtr1 to be NULL, was: 0x%p\n", (PDWORD)heapPtr1); + ok((PDWORD)heapPtr2 != NULL, "Expected heapPtr2 to not be NULL\n"); + ok(*heapPtr2 == 0x11111111, "Expected *heapPtr2 to be 0x11111111, but was: 0x%lx\n", *heapPtr2); + + { + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + CComHeapPtr<DWORD> heapPtrSteal1(heapPtr1); + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + ok((PDWORD)heapPtr1 == NULL, "Expected heapPtr1 to be NULL, was: 0x%p\n", (PDWORD)heapPtr1); + ok((PDWORD)heapPtrSteal1 == NULL, "Expected heapPtrSteal1 to be NULL, was: 0x%p\n", (PDWORD)heapPtrSteal1); + CComHeapPtr<DWORD> heapPtrSteal2(heapPtr2); + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + ok((PDWORD)heapPtr2 == NULL, "Expected heapPtr2 to be NULL, was: 0x%p\n", (PDWORD)heapPtr2); + ok((PDWORD)heapPtrSteal2 != NULL, "Expected heapPtrSteal2 to not be NULL\n"); + ok(*heapPtrSteal2 == 0x11111111, "Expected *heapPtrSteal2 to be 0x11111111, but was: 0x%lx\n", *heapPtrSteal2); + } + ok(g_OpenAllocations == 0, "Expected there to be 0 allocations, was: %ld\n", g_OpenAllocations); + + ok(heapPtr1.Allocate(1), "Expected Allocate to succeed\n"); + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + ok(g_Reallocations == 0, "Expected there to be 0 reallocations, was: %ld\n", g_Reallocations); + + *heapPtr1 = 0x22222222; + ok(*heapPtr1 == 0x22222222, "Expected *heapPtr1 to be 0x22222222, but was: 0x%lx\n", *heapPtr1); + + ok(heapPtr1.Reallocate(2), "Expected Reallocate to succeed\n"); + heapPtr1[1] = 0x33333333; + ok(*heapPtr1 == 0x22222222, "Expected *heapPtr1 to be 0x22222222, but was: 0x%lx\n", *heapPtr1); + ok(g_Reallocations == 1, "Expected there to be 1 reallocations, was: %ld\n", g_Reallocations); + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + + heapPtr2 = heapPtr1; + ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); + ok(*heapPtr2 == 0x22222222, "Expected *heapPtr2 to be 0x33333333, but was: 0x%lx\n", *heapPtr2); + ok(heapPtr2[1] == 0x33333333, "Expected heapPtr2[1] to be 0x33333333, but was: 0x%lx\n", heapPtr2[1]); + ok((PDWORD)heapPtr1 == NULL, "Expected heapPtr1 to be NULL, was: 0x%p\n", (PDWORD)heapPtr1); + } + ok(g_OpenAllocations == 0, "Expected there to be 0 allocations, was: %ld\n", g_OpenAllocations); + + hr = CoRevokeMallocSpy(); + ok(SUCCEEDED(hr), "Expected CoRevokeMallocSpy to succeed, but it failed: 0x%lx\n", hr); +} Propchange: trunk/rostests/apitests/atl/CComHeapPtr.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/atl/CMakeLists.txt (added) +++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Sun Oct 18 10:46:11 2015 @@ -0,0 +1,12 @@ + +set_cpp(WITH_RUNTIME) + +include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +add_executable(atl_apitest + CComHeapPtr.cpp + testlist.c) +target_link_libraries(atl_apitest wine uuid) +set_module_type(atl_apitest win32cui) +add_importlibs(atl_apitest ole32 oleaut32 msvcrt kernel32) +add_cd_file(TARGET atl_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/atl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/atl/testlist.c (added) +++ trunk/rostests/apitests/atl/testlist.c [iso-8859-1] Sun Oct 18 10:46:11 2015 @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_CComHeapPtr(void); + +const struct test winetest_testlist[] = +{ + { "CComHeapPtr", func_CComHeapPtr }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/atl/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 69592: [BOOTLIB] - Correctly check ConsoleRemoteConstruct return value in ConsoleCreateRemoteConsole. Patch by Kudratov Olimjon. CORE-10357 #resolve
by tfaber＠svn.reactos.org 18 Oct '15

18 Oct '15

Author: tfaber Date: Sun Oct 18 10:20:56 2015 New Revision: 69592 URL: http://svn.reactos.org/svn/reactos?rev=69592&view=rev Log: [BOOTLIB] - Correctly check ConsoleRemoteConstruct return value in ConsoleCreateRemoteConsole. Patch by Kudratov Olimjon. CORE-10357 #resolve Modified: trunk/reactos/boot/environ/lib/io/display/emscons.c Modified: trunk/reactos/boot/environ/lib/io/display/emscons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/emscons.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/emscons.c [iso-8859-1] Sun Oct 18 10:20:56 2015 @@ -44,7 +44,7 @@ /* Construct it */ Status = ConsoleRemoteConstruct(RemoteConsole); - if (!NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) { /* Failed to construct it, delete it */ BlMmFreeHeap(RemoteConsole);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs