Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[gadamopoulos] 58561: [newdev] - Dialog procs should return FALSE instead of calling DefWindowProc. Fixes mouse activation of the window when the user clicks in the client area

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 20 21:23:19 2013 New Revision: 58561 URL: http://svn.reactos.org/svn/reactos?rev=58561&view=rev Log: [newdev] - Dialog procs should return FALSE instead of calling DefWindowProc. Fixes mouse activation of the window when the user clicks in the client area Modified: trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Wed Mar 20 21:23:19 2013 @@ -493,7 +493,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static void @@ -656,7 +656,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -751,7 +751,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -857,7 +857,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -972,7 +972,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1051,7 +1051,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1130,7 +1130,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1209,7 +1209,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static HFONT

11 years, 9 months

[ekohl] 58560: [SAMSRV] Calculate PasswordCanChange and PasswordMustChange time for SamQueryInformationUser.UserLogonInformation and SamQueryInformationUser.UserAllInformation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Mar 20 20:52:59 2013 New Revision: 58560 URL: http://svn.reactos.org/svn/reactos?rev=58560&view=rev Log: [SAMSRV] Calculate PasswordCanChange and PasswordMustChange time for SamQueryInformationUser.UserLogonInformation and SamQueryInformationUser.UserAllInformation. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Mar 20 20:52:59 2013 @@ -61,6 +61,22 @@ /* FUNCTIONS *****************************************************************/ + +static +LARGE_INTEGER +SampAddRelativeTimeToTime(IN LARGE_INTEGER AbsoluteTime, + IN LARGE_INTEGER RelativeTime) +{ + LARGE_INTEGER NewTime; + + NewTime.QuadPart = AbsoluteTime.QuadPart - RelativeTime.QuadPart; + + if (NewTime.QuadPart < 0) + NewTime.QuadPart = 0; + + return NewTime; +} + VOID SampStartRpcServer(VOID) @@ -5269,7 +5285,10 @@ PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA DomainFixedData; SAM_USER_FIXED_DATA FixedData; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; ULONG Length = 0; NTSTATUS Status; @@ -5279,6 +5298,17 @@ if (InfoBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Get the fixed size domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + (PVOID)&DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); Status = SampGetObjectAttribute(UserObject, L"F", @@ -5300,8 +5330,15 @@ InfoBuffer->Logon.LogonCount = FixedData.LogonCount; InfoBuffer->Logon.UserAccountControl = FixedData.UserAccountControl; -// OLD_LARGE_INTEGER PasswordCanChange; -// OLD_LARGE_INTEGER PasswordMustChange; + PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MinPasswordAge); + InfoBuffer->Logon.PasswordCanChange.LowPart = PasswordCanChange.LowPart; + InfoBuffer->Logon.PasswordCanChange.HighPart = PasswordCanChange.HighPart; + + PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MaxPasswordAge); + InfoBuffer->Logon.PasswordMustChange.LowPart = PasswordMustChange.LowPart; + InfoBuffer->Logon.PasswordMustChange.HighPart = PasswordMustChange.HighPart; /* Get the Name string */ Status = SampGetObjectAttributeString(UserObject, @@ -6184,7 +6221,10 @@ PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA DomainFixedData; SAM_USER_FIXED_DATA FixedData; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; ULONG Length = 0; NTSTATUS Status; @@ -6194,6 +6234,17 @@ if (InfoBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Get the fixed size domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + (PVOID)&DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); Status = SampGetObjectAttribute(UserObject, L"F", @@ -6324,8 +6375,15 @@ InfoBuffer->All.LogonCount = FixedData.LogonCount; -// USER_ALL_PASSWORDCANCHANGE -// USER_ALL_PASSWORDMUSTCHANGE + PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MinPasswordAge); + InfoBuffer->All.PasswordCanChange.LowPart = PasswordCanChange.LowPart; + InfoBuffer->All.PasswordCanChange.HighPart = PasswordCanChange.HighPart; + + PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MaxPasswordAge); + InfoBuffer->All.PasswordMustChange.LowPart = PasswordMustChange.LowPart; + InfoBuffer->All.PasswordMustChange.HighPart = PasswordMustChange.HighPart; InfoBuffer->All. WhichFields |= /* USER_ALL_READ_LOGON_MASK; */ USER_ALL_HOMEDIRECTORY | @@ -6338,8 +6396,8 @@ // USER_ALL_LOGONHOURS | USER_ALL_BADPASSWORDCOUNT | USER_ALL_LOGONCOUNT; -// USER_ALL_PASSWORDCANCHANGE | -// USER_ALL_PASSWORDMUSTCHANGE; + USER_ALL_PASSWORDCANCHANGE | + USER_ALL_PASSWORDMUSTCHANGE; } if (UserObject->Access & USER_READ_ACCOUNT)

11 years, 9 months

[dgorbachev] 58559: [UUID] Remove IID_IDeskBarClient. It is already in shlguid.h.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Mar 20 15:50:52 2013 New Revision: 58559 URL: http://svn.reactos.org/svn/reactos?rev=58559&view=rev Log: [UUID] Remove IID_IDeskBarClient. It is already in shlguid.h. Modified: trunk/reactos/lib/sdk/uuid/otherguids.c Modified: trunk/reactos/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/otherguids.c?… ============================================================================== --- trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] Wed Mar 20 15:50:52 2013 @@ -48,7 +48,6 @@ DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); -DEFINE_GUID(IID_IDeskBarClient, 0xEB0FE175, 0x1A3A, 0x11D0, 0x89,0xB3, 0x00,0xA0,0xC9,0x0A,0x90,0xAC); DEFINE_GUID(CLSID_StdPicture, 0x0BE35204, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51);

11 years, 9 months

[dgorbachev] 58558: [TRANSLATION] Remove extra space characters produced by replacing backslash with space for Shift_JIS backslash problem. Patch by me, reviewed by Katayama Hirofumi MZ. Fixes bug ...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Mar 20 14:28:34 2013 New Revision: 58558 URL: http://svn.reactos.org/svn/reactos?rev=58558&view=rev Log: [TRANSLATION] Remove extra space characters produced by replacing backslash with space for Shift_JIS backslash problem. Patch by me, reviewed by Katayama Hirofumi MZ. Fixes bug CORE-6990. Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/spider/lang/ja-JP.rc trunk/reactos/base/applications/logoff/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/system/regsvr32/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netid/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -3,7 +3,7 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "ãã¡ã¤ã«ã®ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã(ACL) ãè¡¨ ç¤ºã¾ãã¯å¤æ´ãã¾ããn\n\ +IDS_HELP, "ãã¡ã¤ã«ã®ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã(ACL) ãè¡¨ç¤ºã¾ãã¯å¤æ´ãã¾ãã\n\n\ CACLS ãã¡ã¤ã«å [/T] [/E] [/C] [/G ã¦ã¼ã¶ã¼å:ã¢ã¯ã»ã¹æ¨©]\n\ [/R ã¦ã¼ã¶ã¼å [...]] [/P ã¦ã¼ã¶ã¼å:ã¢ã¯ã»ã¹æ¨© [...]]\n\ [/D ã¦ã¼ã¶ã¼å [...]]\n\ Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -19,8 +19,8 @@ AUTORADIOBUTTON "1 æãã¤åã(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "3 æãã¤åã(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - AUTOCHECKBOX "æéãè¡¨ ç¤ºãã(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "ã¹ãã¼ã¿ã¹ãã¼ãè¡¨ ç¤ºãã(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "æéãè¡¨ç¤ºãã(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "ã¹ãã¼ã¿ã¹ãã¼ãè¡¨ç¤ºãã(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 101, 97, 50, 14 @@ -53,8 +53,8 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "ã½ ãªãã£ã¢" - IDS_SOL_ABOUT "J Brown ã«ããã½ ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0ã" + IDS_SOL_NAME "ã½ãªãã£ã¢" + IDS_SOL_ABOUT "J Brown ã«ããã½ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0ã" IDS_SOL_QUIT "ç¾å¨ã®ã²ã¼ã ãçµäºãã¾ãã?" IDS_SOL_WIN "ããã§ã¨ããããªãã®åã¡ã§ã!" IDS_SOL_DEAL "ããä¸åº¦ã«ã¼ããéãã¾ãã?" Modified: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -49,7 +49,7 @@ STRINGTABLE BEGIN IDS_SPI_NAME "ã¹ãã¤ã" - IDS_SPI_ABOUT "Gregor Schneider ã«ããã¹ãã¤ã ã½ ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0" + IDS_SPI_ABOUT "Gregor Schneider ã«ããã¹ãã¤ã ã½ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0" IDS_SPI_QUIT "ç¾å¨ã®ã²ã¼ã ãçµäºãã¾ãã?" IDS_SPI_WIN "ããã§ã¨ããããªãã®åã¡ã§ã!" IDS_SPI_DEAL "ããä¸åº¦ã«ã¼ããéãã¾ãã?" Modified: trunk/reactos/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -4,8 +4,8 @@ BEGIN IDS_USAGE, "ã»ãã·ã§ã³ãçµäºãã¾ãã\n\n\ - /v\t\tå®è¡ä¸ã«è©³ç´°æå ±ãè¡¨ ç¤ºãã¾ãã\n\ - /?\t\tãã®æå ±ãè¡¨ ç¤ºãã¾ãã\n\n" + /v\t\tå®è¡ä¸ã«è©³ç´°æå ±ãè¡¨ç¤ºãã¾ãã\n\ + /?\t\tãã®æå ±ãè¡¨ç¤ºãã¾ãã\n\n" IDS_LOGOFF_REMOTE, "ãªã¢ã¼ã ãã·ã³ã®ã»ãã·ã§ã³ãçµäºãã¦ãã¾ãã" IDS_LOGOFF_LOCAL, "ãã®ãã·ã³ã®ç¾å¨ã®ã»ãã·ã§ã³ãçµäºãã¦ãã¾ãã" Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN @@ -14,12 +14,12 @@ MENUITEM SEPARATOR MENUITEM "ãã«ã", IDC_PROGHELP, GRAYED END - POPUP "è¡¨ ç¤º" + POPUP "è¡¨ç¤º" BEGIN MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN - MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED - MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED + MENUITEM "ãªã½ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED + MENUITEM "ãªã½ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END @@ -72,8 +72,8 @@ IDS_HINT_EXIT " ãã®ããã°ã©ã ãçµäºãã¾ãã" IDS_HINT_REFRESH " ãµã¼ãã¹ã®ãªã¹ããæ´æ°ãã¾ãã" IDS_HINT_PROP " ç¾å¨é¸æããã¦ããã·ã¼ãã®ããããã£ãéãã¾ãã" - IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ ç¤ºãã¾ãã" - IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ ç¤ºãã¾ãã" + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ç¤ºãã¾ãã" IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -18,7 +18,7 @@ MENUITEM SEPARATOR MENUITEM "çµäº(&X)", IDM_EXIT END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "æ´æ°(&R)", IDM_REFRESH END @@ -78,7 +78,7 @@ LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 LTEXT "ã¤ãã³ãID:",IDC_STATIC,133,15,36,8 LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "ã½ ã¼ã¹:",IDC_STATIC,133,28,36,8 + LTEXT "ã½ã¼ã¹:",IDC_STATIC,133,28,36,8 LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 LTEXT "ç¨®é¡:",IDC_STATIC,133,42,36,8 LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 @@ -93,7 +93,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ã¤ãã³ã ãã¥ã¼ã¢" - IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½ æ§ãããã¾ãã" + IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã" IDS_EVENTLOG_ERROR_TYPE "ã¨ã©ã¼" IDS_EVENTLOG_WARNING_TYPE "è¦å" IDS_EVENTLOG_INFORMATION_TYPE "æå ±" Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -26,7 +26,7 @@ MENUITEM SEPARATOR MENUITEM "ããããã£...", ID_PROP, GRAYED END - POPUP "è¡¨ ç¤º" + POPUP "è¡¨ç¤º" BEGIN MENUITEM "å¤§ããã¢ã¤ã³ã³", ID_VIEW_LARGE MENUITEM "å°ããã¢ã¤ã³ã³", ID_VIEW_SMALL @@ -89,7 +89,7 @@ PUSHBUTTON "ä¸æåæ¢", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED PUSHBUTTON "åé", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED LTEXT "ãµã¼ãã¹å:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "è¡¨ ç¤ºå:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "è¡¨ç¤ºå:", IDC_STATIC, 4, 29, 53, 11 LTEXT "èª¬æ:", IDC_STATIC, 4, 51, 53, 11 LTEXT "å®è¡ãã¡ã¤ã«ã®ãã¹:", IDC_STATIC, 6, 73, 82, 9 LTEXT "ã¹ã¿ã¼ãã¢ããã®ç¨®é¡:", IDC_STATIC, 6, 108, 53, 11 @@ -124,7 +124,7 @@ EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE LTEXT "*ãµã¼ãã¹å :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*è¡¨ ç¤ºå :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*è¡¨ç¤ºå :", IDC_STATIC, 12, 33, 54, 9 LTEXT "*å®è¡ãã¡ã¤ã«ã®ãã¹ :", IDC_STATIC, 10, 51, 68, 9 LTEXT "èª¬æ :", IDC_STATIC, 12, 86, 44, 9 PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 @@ -258,14 +258,14 @@ IDS_HINT_DELETE " é¸æãããµã¼ãã¹ãåé¤ãã¾ãã" IDS_HINT_PROP " ç¾å¨é¸æããã¦ããé ç®ã®ããããã£ ã·ã¼ããéãã¾ãã" - IDS_HINT_LARGE " ã¢ã¤ãã ãå¤§ããã¢ã¤ã³ã³ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_SMALL " ã¢ã¤ãã ãå°ããã¢ã¤ã³ã³ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_LIST " ã¢ã¤ãã ãä¸è¦§ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_DETAILS " åã¢ã¤ãã ã®æå ±ãã¦ã£ã³ãã¦ã«è¡¨ ç¤ºãã¾ãã" - IDS_HINT_CUST " è¡¨ ç¤ºãã«ã¹ã¿ãã¤ãºãã¾ãã" - - IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ ç¤ºãã¾ãã" - IDS_HINT_ABOUT " ReactOS ãµã¼ãã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ ç¤ºãã¾ãã" + IDS_HINT_LARGE " ã¢ã¤ãã ãå¤§ããã¢ã¤ã³ã³ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_SMALL " ã¢ã¤ãã ãå°ããã¢ã¤ã³ã³ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_LIST " ã¢ã¤ãã ãä¸è¦§ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_DETAILS " åã¢ã¤ãã ã®æå ±ãã¦ã£ã³ãã¦ã«è¡¨ç¤ºãã¾ãã" + IDS_HINT_CUST " è¡¨ç¤ºãã«ã¹ã¿ãã¤ãºãã¾ãã" + + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ãµã¼ãã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ç¤ºãã¾ãã" IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -17,8 +17,8 @@ MENUITEM "ä¸æ¸ãä¿å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "ååãä»ãã¦ä¿å(&A)...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "èæ¯ã«è¨å® (ä¸¦ã¹ã¦è¡¨ ç¤º)", IDM_FILEASWALLPAPERPLANE - MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ ç¤º)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "èæ¯ã«è¨å® (ä¸¦ã¹ã¦è¡¨ç¤º)", IDM_FILEASWALLPAPERPLANE + MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ç¤º)", IDM_FILEASWALLPAPERCENTERED MENUITEM "èæ¯ã«è¨å® (æ¡å¤§)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "ãã¤ã³ãã®çµäº(&Q)\tAlt+F4", IDM_FILEEXIT @@ -31,16 +31,16 @@ MENUITEM SEPARATOR MENUITEM "åãåã\tCtrl+X", IDM_EDITCUT MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDITCOPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDITPASTE + MENUITEM "è²¼ãä»ã\tCtrl+V", IDM_EDITPASTE MENUITEM "é¸æç¯å²ã®åé¤\tDel", IDM_EDITDELETESELECTION MENUITEM "é¸æç¯å²ã®æ¿å¥", IDM_EDITINVERTSELECTION MENUITEM "ãã¹ã¦é¸æ\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "ãã¡ã¤ã«ã¸ã³ãã¼", IDM_EDITCOPYTO - MENUITEM "ãã¡ã¤ã«ããè²¼ ãä»ã", IDM_EDITPASTEFROM - END - - POPUP "è¡¨ ç¤º(&V)" + MENUITEM "ãã¡ã¤ã«ããè²¼ãä»ã", IDM_EDITPASTEFROM + END + + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ãã¼ã« ããã¯ã¹\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED MENUITEM "ã«ã©ã¼ ãã¬ãã\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED @@ -60,10 +60,10 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "ã°ãªãããè¡¨ ç¤º\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "å®å¯¸è¡¨ ç¤º", IDM_VIEWSHOWMINIATURE + MENUITEM "ã°ãªãããè¡¨ç¤º\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "å®å¯¸è¡¨ç¤º", IDM_VIEWSHOWMINIATURE END - MENUITEM "å¨ç»é¢è¡¨ ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "å¨ç»é¢è¡¨ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN END POPUP "ç»å(&I)" @@ -179,7 +179,7 @@ IDS_PROGRAMNAME, "ãã¤ã³ã" IDS_WINDOWTITLE, "%s - ãã¤ã³ã" IDS_INFOTITLE, "ReactOS ãã¤ã³ã" - IDS_INFOTEXT, "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ ã§ãã" + IDS_INFOTEXT, "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ã§ãã" IDS_SAVEPROMPTTEXT, "%s ã®å¤æ´åå®¹ãä¿åãã¾ãã?" IDS_DEFAULTFILENAME, "ç¡é¡.bmp" IDS_MINIATURETITLE, "ç¸®å°å³" Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -27,11 +27,11 @@ GROUPBOX "è²",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ãã ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ ç¤ºã«ãªãã¾ã",IDC_STATIC,53,22,175,21 + LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ãã ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ç¤ºã«ãªãã¾ã",IDC_STATIC,53,22,175,21 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "æ³¨æ: ãã®è¨å®ã¯ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ã®è¨å®ã§ä¸æ¸ããããå¯è½ æ§ãããã¾ãã",IDC_STATIC,56,143,165,18 + LTEXT "æ³¨æ: ãã®è¨å®ã¯ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ã®è¨å®ã§ä¸æ¸ããããå¯è½æ§ãããã¾ãã",IDC_STATIC,56,143,165,18 LTEXT "å°",IDC_STATIC,35,42,15,8 LTEXT "å¤§",IDC_STATIC,189,42,17,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER @@ -57,7 +57,7 @@ IDS_HIGHCOLOR16 "65,536 è² (16 ããã)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ããã)" IDS_PIXEL "%lu x %lu ãã¯ã»ã«" - IDS_FULLSCREEN "å¨ç»é¢è¡¨ ç¤º" + IDS_FULLSCREEN "å¨ç»é¢è¡¨ç¤º" IDS_BROWSESERVER "<åç§...>" IDS_HEADERTEXT1 "ãªã¢ã¼ã ãã¹ã¯ããã" IDS_HEADERTEXT2 "æ¥ç¶" Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -61,7 +61,7 @@ MENUITEM SEPARATOR MENUITEM "åãåã(&T)\tCtrl+X", CMD_CUT MENUITEM "ã³ãã¼(&C)\tCtrl+C", CMD_COPY - MENUITEM "è²¼ ãä»ã(&P)\tCtrl+V", CMD_PASTE + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", CMD_PASTE MENUITEM "åé¤(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "æ¤ç´¢(&F)...\tCtrl+F", CMD_SEARCH @@ -77,7 +77,7 @@ MENUITEM "å³ç«¯ã§æãè¿ã(&W)", CMD_WRAP MENUITEM "ãã©ã³ã(&F)...", CMD_FONT END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼(&B)", CMD_STATUSBAR END Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -164,7 +164,7 @@ BEGIN MENUITEM "åãåã(&C)", ID_HEXEDIT_CUT MENUITEM "ã³ãã¼(&C)", ID_HEXEDIT_COPY - MENUITEM "è²¼ ãä»ã(&P)", ID_HEXEDIT_PASTE + MENUITEM "è²¼ãä»ã(&P)", ID_HEXEDIT_PASTE MENUITEM "åé¤(&D)", ID_HEXEDIT_DELETE MENUITEM SEPARATOR MENUITEM "ãã¹ã¦é¸æ(&A)", ID_HEXEDIT_SELECT_ALL Modified: trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -35,7 +35,7 @@ PUSHBUTTON "é²é³(&R)", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "ãã®ä»(&O):", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "è¡¨ ç¤ºããã³ã³ããã¼ã«:", IDC_LABELCONTROLS, 7, 109, 162, 8 + LTEXT "è¡¨ç¤ºããã³ã³ããã¼ã«:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -10,16 +10,16 @@ END POPUP "ãªãã·ã§ã³(&O)" BEGIN - MENUITEM "å¸¸ã«æåã«è¡¨ ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED MENUITEM "æªä½¿ç¨æã«æå°å(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED MENUITEM "æå°åæã«é ã(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 ããã ã¿ã¹ã¯ã®è¡¨ ç¤º(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 ããã ã¿ã¹ã¯ã®è¡¨ç¤º(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ææ°ã®ç¶æã«æ´æ°(&R)", ID_VIEW_REFRESH POPUP "æ´æ°ã®é »åº¦(&U)" @@ -43,16 +43,16 @@ MENUITEM "CPU ãã¨ã« 1 ã°ã©ã(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "ã«ã¼ãã«æéãè¡¨ ç¤ºãã(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "ã«ã¼ãã«æéãè¡¨ç¤ºãã(&S)", ID_VIEW_SHOWKERNELTIMES END POPUP "ã¦ã£ã³ãã¦(&W)" BEGIN - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT END POPUP "ãã«ã(&H)" BEGIN @@ -64,12 +64,12 @@ IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE @@ -89,16 +89,16 @@ POPUP "DUMMY" BEGIN MENUITEM "åãæ¿ã(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "ã¿ã¹ã¯ã®çµäº(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "ããã»ã¹ã®è¡¨ ç¤º(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "ããã»ã¹ã®è¡¨ç¤º(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -110,7 +110,7 @@ MENUITEM "åã®ãµã¤ãºã«æ»ã(&R)", ID_RESTORE MENUITEM "éãã(&C)", ID_FILE_EXIT MENUITEM SEPARATOR - MENUITEM "å¸¸ã«æåã«è¡¨ ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -180,7 +180,7 @@ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "ããã»ã¹ã®çµäº(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "å¨ã¦ã¼ã¶ã¼ã®ããã»ã¹ãè¡¨ ç¤ºãã(&S)",IDC_SHOWALLPROCESSES, + CONTROL "å¨ã¦ã¼ã¶ã¼ã®ããã»ã¹ãè¡¨ç¤ºãã(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -233,8 +233,8 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU ä½¿ç¨çã®è¡¨ ç¤º",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®è¡¨ ç¤º",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU ä½¿ç¨çã®è¡¨ç¤º",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®è¡¨ç¤º",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, @@ -334,7 +334,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,138,178,50,14 - LTEXT "ã¿ã¹ã¯ ããã¼ã¸ã£ã® [ããã»ã¹] ãã¼ã¸ã«è¡¨ ç¤ºããåãé¸æãã¾ãã", + LTEXT "ã¿ã¹ã¯ ããã¼ã¸ã£ã® [ããã»ã¹] ãã¼ã¸ã«è¡¨ç¤ºããåãé¸æãã¾ãã", IDC_STATIC,7,7,181,17 CONTROL "ã¤ã¡ã¼ã¸å(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 @@ -517,41 +517,41 @@ STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "æ°ããããã°ã©ã ãå®è¡ãã¾ã" - ID_OPTIONS_ALWAYSONTOP "æå°åãããªãéããå¸¸ã«ã¿ã¹ã¯ ããã¼ã¸ã£ãã»ãã®ãã¹ã¦ã®ã¦ã£ã³ãã¦ãããæåã«è¡¨ ç¤ºããã¾ã" + ID_OPTIONS_ALWAYSONTOP "æå°åãããªãéããå¸¸ã«ã¿ã¹ã¯ ããã¼ã¸ã£ãã»ãã®ãã¹ã¦ã®ã¦ã£ã³ãã¦ãããæåã«è¡¨ç¤ºããã¾ã" ID_OPTIONS_MINIMIZEONUSE "[åãæ¿ã] æä½ãå®è¡ããã¨ãã¿ã¹ã¯ ããã¼ã¸ã£ãæå°åããã¾ã" ID_OPTIONS_HIDEWHENMINIMIZED "æå°åãããã¨ãã«ãã¿ã¹ã¯ ããã¼ã¸ã£ãé ãã¾ã" ID_VIEW_REFRESH "[æ´æ°ã®é »åº¦] ã®è¨å®ã«ããããããä»ããã¿ã¹ã¯ ããã¼ã¸ã£ãæ´æ°ãã¾ã" - ID_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_SMALL "å°ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_DETAILS "åã¿ã¹ã¯ã®æå ±ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_UPDATESPEED_HIGH "æ¯ç§ 2 åè¡¨ ç¤ºãæ´æ°ãã¾ã" - ID_VIEW_UPDATESPEED_NORMAL "2 ç§ã« 1 åè¡¨ ç¤ºãæ´æ°ãã¾ã" - ID_VIEW_UPDATESPEED_LOW "4 ç§ã« 1 åè¡¨ ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ç¤ºãã¾ã" + ID_VIEW_SMALL "å°ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ç¤ºãã¾ã" + ID_VIEW_DETAILS "åã¿ã¹ã¯ã®æå ±ãè¡¨ç¤ºãã¾ã" + ID_VIEW_UPDATESPEED_HIGH "æ¯ç§ 2 åè¡¨ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_NORMAL "2 ç§ã« 1 åè¡¨ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_LOW "4 ç§ã« 1 åè¡¨ç¤ºãæ´æ°ãã¾ã" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "è¡¨ ç¤ºãèªåçã«æ´æ°ãã¾ãã" + ID_VIEW_UPDATESPEED_PAUSED "è¡¨ç¤ºãèªåçã«æ´æ°ãã¾ãã" ID_WINDOWS_TILEHORIZONTALLY - "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤ºãã¾ã" - ID_WINDOWS_TILEVERTICALLY "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤ºãã¾ã" + "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤ºãã¾ã" + ID_WINDOWS_TILEVERTICALLY "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤ºãã¾ã" ID_WINDOWS_MINIMIZE "ã¦ã£ã³ãã¦ãæå°åãã¾ã" ID_WINDOWS_MAXIMIZE "ã¦ã£ã³ãã¦ãæå¤§åãã¾ã" - ID_WINDOWS_CASCADE "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãã¦è¡¨ ç¤ºãã¾ã" - ID_WINDOWS_BRINGTOFRONT "ã¦ã£ã³ãã¦ãæåã«è¡¨ ç¤ºãã¾ãããåãæ¿ãã¾ããã" - ID_HELP_TOPICS "ã¿ã¹ã¯ ããã¼ã¸ã£ã®ãã«ã ãããã¯ãè¡¨ ç¤ºãã¾ã" - ID_HELP_ABOUT "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨ ç¤ºãã¾ã" + ID_WINDOWS_CASCADE "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãã¦è¡¨ç¤ºãã¾ã" + ID_WINDOWS_BRINGTOFRONT "ã¦ã£ã³ãã¦ãæåã«è¡¨ç¤ºãã¾ãããåãæ¿ãã¾ããã" + ID_HELP_TOPICS "ã¿ã¹ã¯ ããã¼ã¸ã£ã®ãã«ã ãããã¯ãè¡¨ç¤ºãã¾ã" + ID_HELP_ABOUT "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨ç¤ºãã¾ã" ID_FILE_EXIT "ã¿ã¹ã¯ ããã¼ã¸ã£ ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ã" ID_OPTIONS_SHOW16BITTASKS - "16 ããã ã¿ã¹ã¯ããé¢é£ä»ãããã ntvdm.exe ã®ä¸ã«è¡¨ ç¤ºãã¾ã" - ID_VIEW_SELECTCOLUMNS "[ããã»ã¹] ãã¼ã¸ã«è¡¨ ç¤ºããåãé¸æãã¾ã" - ID_VIEW_SHOWKERNELTIMES "ã«ã¼ãã«æéãããã©ã¼ãã³ã¹ ã°ã©ãä¸ã«è¡¨ ç¤ºãã¾ã" + "16 ããã ã¿ã¹ã¯ããé¢é£ä»ãããã ntvdm.exe ã®ä¸ã«è¡¨ç¤ºãã¾ã" + ID_VIEW_SELECTCOLUMNS "[ããã»ã¹] ãã¼ã¸ã«è¡¨ç¤ºããåãé¸æãã¾ã" + ID_VIEW_SHOWKERNELTIMES "ã«ã¼ãã«æéãããã©ã¼ãã³ã¹ ã°ã©ãä¸ã«è¡¨ç¤ºãã¾ã" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 ã¤ã®å±¥æ´ã°ã©ãã§ CPU ä½¿ç¨çã®åè¨ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU ä½¿ç¨çã®å±¥æ´ã CPU ãã¨ã«ã°ã©ãã§è¡¨ ç¤ºãã¾ã" + "1 ã¤ã®å±¥æ´ã°ã©ãã§ CPU ä½¿ç¨çã®åè¨ãè¡¨ç¤ºãã¾ã" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU ä½¿ç¨çã®å±¥æ´ã CPU ãã¨ã«ã°ã©ãã§è¡¨ç¤ºãã¾ã" ID_APPLICATION_PAGE_SWITCHTO - "ã¿ã¹ã¯ãæåã«è¡¨ ç¤ºãããã©ã¼ã«ã¹ãåãæ¿ãã¾ã" + "ã¿ã¹ã¯ãæåã«è¡¨ç¤ºãããã©ã¼ã«ã¹ãåãæ¿ãã¾ã" END STRINGTABLE DISCARDABLE @@ -611,7 +611,7 @@ IDS_TAB_IOWRITESBYTES "I/O æ¸ãè¾¼ã¿ãã¤ãæ°" IDS_TAB_IOOTHERBYTES "I/O ãã®ä»ã®ãã¤ãæ°" IDS_MENU_SELECTCOLUMNS "åã®é¸æ(&S)..." - IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨ ç¤º(&S)" + IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨ç¤º(&S)" IDS_MENU_WINDOWS "ã¦ã£ã³ãã¦(&W)" IDS_MENU_LARGEICONS "å¤§ããã¢ã¤ã³ã³(&G)" IDS_MENU_SMALLICONS "å°ããã¢ã¤ã³ã³(&M)" @@ -619,19 +619,19 @@ IDS_MENU_ONEGRAPHALLCPUS "ãã¹ã¦ã® CPU ã§ 1 ã°ã©ã(&O)" IDS_MENU_ONEGRAPHPERCPU "CPU ãã¨ã« 1 ã°ã©ã(&P)" IDS_MENU_CPUHISTORY "CPU å±¥æ´(&C)" - IDS_MENU_SHOWKERNELTIMES "ã«ã¼ãã«æéãè¡¨ ç¤ºãã(&S)" + IDS_MENU_SHOWKERNELTIMES "ã«ã¼ãã«æéãè¡¨ç¤ºãã(&S)" IDS_CREATENEWTASK "æ°ããã¿ã¹ã¯ã®ä½æ" - IDS_CREATENEWTASK_DESC "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããããã¥ã¡ã³ãåãã¤ã³ã¿ã¼ããã ãªã½ ã¼ã¹åãå¥åãã¦ãã ããã" + IDS_CREATENEWTASK_DESC "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããããã¥ã¡ã³ãåãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã" IDS_MSG_ACCESSPROCESSAFF "ããã»ã¹ã®é¢ä¿ã¸ã®ã¢ã¯ã»ã¹ã¾ãã¯è¨å®ãã§ãã¾ãã" IDS_MSG_PROCESSONEPRO "ããã»ã¹ã¯ãå°ãªãã¨ã 1 ã¤ã®ããã»ããµã¨é¢ä¿ãæããªããã°ãªãã¾ããã" IDS_MSG_INVALIDOPTION "ç¡å¹ãªãªãã·ã§ã³" IDS_MSG_UNABLEDEBUGPROCESS "ãããã¬ãæ·»ä»ã§ãã¾ãã" - IDS_MSG_WARNINGDEBUG "è¦å: ãã®ããã»ã¹ããããã°ããã¨ããã¼ã¿ãå¤±ãããå¯è½ æ§ãããã¾ãã\nãããã¬ãæ·»ä»ãã¾ãã?" + IDS_MSG_WARNINGDEBUG "è¦å: ãã®ããã»ã¹ããããã°ããã¨ããã¼ã¿ãå¤±ãããå¯è½æ§ãããã¾ãã\nãããã¬ãæ·»ä»ãã¾ãã?" IDS_MSG_TASKMGRWARNING "ã¿ã¹ã¯ ããã¼ã¸ã£ã®è¦å" - IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäº æããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨ ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" + IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" IDS_MSG_UNABLETERMINATEPRO "ããã»ã¹ãçµäºã§ãã¾ãã" IDS_MSG_UNABLECHANGEPRIORITY "åªååº¦ãå¤æ´ã§ãã¾ãã" - IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäº æããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" + IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ç: %d%%" IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %dKB / %dKB" IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨ç: %3d%%" Modified: trunk/reactos/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -4,9 +4,9 @@ IDS_UsageMessage, "%s\n\nä½¿ç¨æ³: regsvr32 [/u] [/s] [/c] [/n] [/i[:ã³ãã³ã ã©ã¤ã³]] DLLå\n\ /u - ãµã¼ãã¼ãç»é²è§£é¤ãã\n\ -/s - ãµã¤ã¬ã³ã; ã¡ãã»ã¼ã¸ ããã¯ã¹ãè¡¨ ç¤ºããªã\n\ -/c - ã³ã³ã½ ã¼ã«åºå\n\ -/i - çç¥å¯è½ ãª [ã³ãã³ã ã©ã¤ã³] ãå¼æ°ã¨ãã¦ DllInstall ãå¼ã³åºã; /u ã¨ä½µç¨ããå ´åã¯ dll uninstall ãå¼ã³åºã\n\ +/s - ãµã¤ã¬ã³ã; ã¡ãã»ã¼ã¸ ããã¯ã¹ãè¡¨ç¤ºããªã\n\ +/c - ã³ã³ã½ã¼ã«åºå\n\ +/i - çç¥å¯è½ãª [ã³ãã³ã ã©ã¤ã³] ãå¼æ°ã¨ãã¦ DllInstall ãå¼ã³åºã; /u ã¨ä½µç¨ããå ´åã¯ dll uninstall ãå¼ã³åºã\n\ /n - DllRegisterServer ãå¼ã³åºããªã; ãã®ãªãã·ã§ã³ã¯ /i ã¨ä½µç¨ããå¿è¦ããã" IDS_NoDllSpecified, "DLL åãæå®ããã¦ãã¾ããã" @@ -18,7 +18,7 @@ IDS_DllNotLoaded, "LoadLibrary('%s') ã«å¤±æãã¾ããã\nGetLastError ã¯ 0x%08x ãè¿ãã¾ããã" IDS_MissingEntry, "%s ãèªã¿è¾¼ã¿ã¾ãããã%s ã¨ã³ããª ãã¤ã³ããè¦ã¤ããã¾ããã§ããã\n\n\ -%s ã¯ã¨ã¯ã¹ãã¼ãããã¦ããªããã%s ã®ä¸æ£ãªãã¼ã¸ã§ã³ãã¡ã¢ãªä¸ã«ããå¯è½ æ§ãããã¾ããæ¤åºãåé¤ããããããPView ã®ä½¿ç¨ãæ¤è¨ãã¦ãã ããã" +%s ã¯ã¨ã¯ã¹ãã¼ãããã¦ããªããã%s ã®ä¸æ£ãªãã¼ã¸ã§ã³ãã¡ã¢ãªä¸ã«ããå¯è½æ§ãããã¾ããæ¤åºãåé¤ããããããPView ã®ä½¿ç¨ãæ¤è¨ãã¦ãã ããã" IDS_FailureMessage, "%s (%s ã®) ã«å¤±æãã¾ããã\nè¿ã£ã¦ããã³ã¼ã: 0x%08x" Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -7,21 +7,21 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "åºå®ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "åºå®ãã¼æ©è½ ãä½¿ãã¨ããã¼ãåæã«æ¼ããªãã¦ããShiftãCtrlãAlt ãã¼ã®æ©è½ ãä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "åºå®ãã¼æ©è½ ãä½¿ã(&U)",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "åºå®ãã¼æ©è½ãä½¿ãã¨ããã¼ãåæã«æ¼ããªãã¦ããShiftãCtrlãAlt ãã¼ã®æ©è½ãä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "åºå®ãã¼æ©è½ãä½¿ã(&U)",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "ãã£ã«ã¿ ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "ãã£ã«ã¿ ãã¼æ©è½ ãä½¿ãã¨ãéããã¼å¥åãç¹°ãè¿ããããã¼å¥åãç¡è¦ããããç¹°ãè¿ãå¥åã®ééãé·ãããããããã¨ãã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "ãã£ã«ã¿ ãã¼æ©è½ ãä½¿ã(&F)",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "ãã£ã«ã¿ ãã¼æ©è½ãä½¿ãã¨ãéããã¼å¥åãç¹°ãè¿ããããã¼å¥åãç¡è¦ããããç¹°ãè¿ãå¥åã®ééãé·ãããããããã¨ãã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "ãã£ã«ã¿ ãã¼æ©è½ãä½¿ã(&F)",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&E)",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "åãæ¿ããã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "åãæ¿ããã¼æ©è½ ãä½¿ãã¨ãCapsLockãNumLockãScrollLock ãã¼ãæ¼ããã¨ãã«é³ãé³´ããã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "åãæ¿ããã¼æ©è½ ãä½¿ã(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "åãæ¿ããã¼æ©è½ãä½¿ãã¨ãCapsLockãNumLockãScrollLock ãã¼ãæ¼ããã¨ãã«é³ãé³´ããã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "åãæ¿ããã¼æ©è½ãä½¿ã(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 - AUTOCHECKBOX "ããã°ã©ã ã§è¿½å ã®ãã¼ãã¼ã ãã«ããè¡¨ ç¤ºãã(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 + AUTOCHECKBOX "ããã°ã©ã ã§è¿½å ã®ãã¼ãã¼ã ãã«ããè¡¨ç¤ºãã(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -37,7 +37,7 @@ COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "ãµã¦ã³ãè§£èª¬",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "ããã°ã©ã ãé³ãé³´ããã¨ããé³´ããé³ã«ã¤ãã¦è§£èª¬ãè¡¨ ç¤ºãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "ããã°ã©ã ãé³ãé³´ããã¨ããé³´ããé³ã«ã¤ãã¦è§£èª¬ãè¡¨ç¤ºãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "ãµã¦ã³ãè§£èª¬(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END @@ -48,7 +48,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ãã¤ã³ã³ãã©ã¹ã",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "ãã®æ©è½ ãä½¿ãã¨ãç»é¢è¡¨ ç¤ºã«èªã¿ãããéè²ã¨ãã©ã³ããä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "ãã®æ©è½ãä½¿ãã¨ãç»é¢è¡¨ç¤ºã«èªã¿ãããéè²ã¨ãã©ã³ããä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "ãã¤ã³ã³ãã©ã¹ããä½¿ã(&U)",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 @@ -72,8 +72,8 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ãã¦ã¹ ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "ãã¦ã¹ ãã¼æ©è½ ãä½¿ãã¨ããã³ãã¼ãä½¿ã£ã¦ãã¦ã¹ ãã¤ã³ã¿ãæä½ã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "ãã¦ã¹ ãã¼æ©è½ (&M)",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "ãã¦ã¹ ãã¼æ©è½ãä½¿ãã¨ããã³ãã¼ãä½¿ã£ã¦ãã¦ã¹ ãã¤ã³ã¿ãæä½ã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "ãã¦ã¹ ãã¼æ©è½(&M)",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -292,7 +292,7 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "ã¦ã¼ã¶ã¼è£å©" - IDS_CPLSYSTEMDESCRIPTION "è¦è¦ãè´è¦ãåè¢ã®ç¶æã«åããã¦ãã¦ã¼ã¶ã¼ãè£å©ããæ©è½ ãèª¿æ´ãã¾ãã" + IDS_CPLSYSTEMDESCRIPTION "è¦è¦ãè´è¦ãåè¢ã®ç¶æã«åããã¦ãã¦ã¼ã¶ã¼ãè£å©ããæ©è½ãèª¿æ´ãã¾ãã" IDS_SENTRY_NONE "[None]" IDS_SENTRY_TITLE "Flash the titlebar" Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -18,7 +18,7 @@ LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS ãã¼ã ãã¼ã¸</A>ã¸è¡ã", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 - PUSHBUTTON "ã©ã¤ã»ã³ã¹ãè¡¨ ç¤º(&L)...", IDC_LICENCE, 170, 199, 78, 13 + PUSHBUTTON "ã©ã¤ã»ã³ã¹ãè¡¨ç¤º(&L)...", IDC_LICENCE, 170, 199, 78, 13 END @@ -29,7 +29,7 @@ BEGIN GROUPBOX "ããã¤ã¹ ããã¼ã¸ã£", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON - LTEXT "ããã¤ã¹ããã¼ã¸ã£ã¯ã³ã³ãã¥ã¼ã¿ã«è£çããã¦ãããã¹ã¦ã®ãã¼ãã¦ã§ã¢ãè¡¨ ç¤º ãã¾ããåããã¤ã¹ã®ããããã£ãå¤æ´ããã«ã¯ããã¤ã¹ããã¼ã¸ã£ãä½¿ç¨ ãã¦ãã ããã", IDC_STATIC, 42, 18, 204, 24 + LTEXT "ããã¤ã¹ããã¼ã¸ã£ã¯ã³ã³ãã¥ã¼ã¿ã«è£çããã¦ãããã¹ã¦ã®ãã¼ãã¦ã§ã¢ãè¡¨ç¤º ãã¾ããåããã¤ã¹ã®ããããã£ãå¤æ´ããã«ã¯ããã¤ã¹ããã¼ã¸ã£ãä½¿ç¨ ãã¦ãã ããã", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "ããã¤ã¹ ããã¼ã¸ã£(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "ãã¼ãã¦ã§ã¢ ã¦ã£ã¶ã¼ã", IDC_STATIC, 6, 79, 244, 61 @@ -39,7 +39,7 @@ GROUPBOX "ãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON - LTEXT "ãã¼ãã¦ã§ã¢ãããã¡ã¤ã«ã¯å¥ã®ãã¼ãã¦ã§ã¢ã®æ§ æãè¨å®ããæ ¼ç´ããæ¹æ³ã æä¾ãã¾ãã", IDC_STATIC, 42, 160, 204, 24 + LTEXT "ãã¼ãã¦ã§ã¢ãããã¡ã¤ã«ã¯å¥ã®ãã¼ãã¦ã§ã¢ã®æ§æãè¨å®ããæ ¼ç´ããæ¹æ³ã æä¾ãã¾ãã", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "ãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END @@ -86,8 +86,8 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "ç°ãªããã¼ãã¦ã§ã¢æ§ æã«åããããã¼ãã¦ã§ã¢ ãããã¡ã¤ã«ãã»ããã¢ããã§ãã¾ãã èµ·åæã«ä½¿ç¨ãããããã¡ã¤ã«ãé¸æã§ãã¾ãã", IDC_STATIC, 46, 11, 188, 25 - LTEXT "å©ç¨å¯è½ ãªãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«:", IDC_STATIC, 8, 41, 120, 8 + LTEXT "ç°ãªããã¼ãã¦ã§ã¢æ§æã«åããããã¼ãã¦ã§ã¢ ãããã¡ã¤ã«ãã»ããã¢ããã§ãã¾ãã èµ·åæã«ä½¿ç¨ãããããã¡ã¤ã«ãé¸æã§ãã¾ãã", IDC_STATIC, 46, 11, 188, 25 + LTEXT "å©ç¨å¯è½ãªãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED @@ -169,11 +169,11 @@ GROUPBOX "ã·ã¹ãã ã®èµ·å", IDC_STATIC, 7, 12, 238, 95 LTEXT "æ¢å®ã®ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã (&S):", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST - AUTOCHECKBOX "ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã ã®ä¸è¦§ãè¡¨ ç¤ºããæé(&T):", IDC_STRECLIST, 14, 56, 160, 8 + AUTOCHECKBOX "ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã ã®ä¸è¦§ãè¡¨ç¤ºããæé(&T):", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ç§", IDC_STATIC, 223, 56, 18, 8 - AUTOCHECKBOX "å¿è¦ãªã¨ãã«ä¿®å¾©ãªãã·ã§ã³ãè¡¨ ç¤ºããæé(&D):", IDC_STRRECREC, 14, 70, 170, 8 + AUTOCHECKBOX "å¿è¦ãªã¨ãã«ä¿®å¾©ãªãã·ã§ã³ãè¡¨ç¤ºããæé(&D):", IDC_STRRECREC, 14, 70, 170, 8 EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ç§", IDC_STATIC, 223, 70, 18, 8 Modified: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -3,5 +3,5 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "é»è©±ã¨ã¢ãã ã®ãªãã·ã§ã³" - IDS_CPLSYSTEMDESCRIPTION "é»è©±ã®ãã¤ã¤ã«æå ±ã¨ã¢ãã ã®ããããã£ãæ§ æãã¾ãã" + IDS_CPLSYSTEMDESCRIPTION "é»è©±ã®ãã¤ã¤ã«æå ±ã¨ã¢ãã ã®ããããã£ãæ§æãã¾ãã" END Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -5,7 +5,7 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ãããã¯ã¼ã¯ã§ãã®æ©è½ ããµãã¼ãããã¦ããå ´åã¯ãIP è¨å®ãèªåçã«åå¾ãããã¨ãã§ãã¾ãããµãã¼ãããã¦ããªãå ´åã¯ããããã¯ã¼ã¯ç®¡çèã«é©åãª IP è¨å®ãåãåããã¦ãã ããã", -1, 9, 9, 228, 27 + LTEXT "ãããã¯ã¼ã¯ã§ãã®æ©è½ããµãã¼ãããã¦ããå ´åã¯ãIP è¨å®ãèªåçã«åå¾ãããã¨ãã§ãã¾ãããµãã¼ãããã¦ããªãå ´åã¯ããããã¯ã¼ã¯ç®¡çèã«é©åãª IP è¨å®ãåãåããã¦ãã ããã", -1, 9, 9, 228, 27 CONTROL "IP ã¢ãã¬ã¹ãèªåçã«åå¾ãã", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX CONTROL "æ¬¡ã® IP ã¢ãã¬ã¹ãä½¿ã(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 Modified: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -67,7 +67,7 @@ 22 "%1 ã¯ã¼ã¯ã°ã«ã¼ãã¸ããããã" 23 "%1 ãã¡ã¤ã³ã¸ããããã" 24 "å¤æ´ãæå¹ã«ããã«ã¯ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã¦ãã ããã" - 25 "ãã®ã³ã³ãã¥ã¼ã¿ã®ååã¨ã¡ã³ãã·ãããå¤æ´ã§ãã¾ããå¤æ´ããã¨ãããã¯ã¼ã¯ ãªã½ ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«å½±é¿ããå¯è½ æ§ãããã¾ãã" + 25 "ãã®ã³ã³ãã¥ã¼ã¿ã®ååã¨ã¡ã³ãã·ãããå¤æ´ã§ãã¾ããå¤æ´ããã¨ãããã¯ã¼ã¯ ãªã½ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«å½±é¿ããå¯è½æ§ãããã¾ãã" 1021 "æ³¨æ: ãã®ã³ã³ãã¥ã¼ã¿ã® ID ãå¤æ´ã§ããã®ã¯ç®¡çèã®ã¿ã§ãã" 1022 "æ³¨æ: æ¬¡ã®çç±ã«ããããã®ã³ã³ãã¥ã¼ã¿ã® ID ãå¤æ´ã§ãã¾ãã:" 1030 "æ°ããã³ã³ãã¥ã¼ã¿å ""%s"" ã«ã¯ãä½¿ç¨ã§ããªããªæåãå«ã¾ãã¦ãã¾ããä½¿ç¨ã§ããªãæåã¯ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ? ã§ãã" Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -11,7 +11,7 @@ IDC_STATIC,120,21,195,30 LTEXT "ç¶è¡ããã«ã¯ã[æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã",IDC_STATIC,120,169,195,17 LTEXT "ä¸æãªããã¤ã¹",IDC_DEVICE,134,52,164,11 - LTEXT "è¦å! ã«ã¹ã¿ã ããã¤ã¹ãã¤ã³ã¹ãã¼ã«ããã¨ãã³ã³ãã¥ã¼ã¿ãããªã¼ãºããããèµ·åä¸è½ ã«ãªãå¯è½ æ§ãããã¾ã!",IDC_STATIC,120,67,195,34 + LTEXT "è¦å! ã«ã¹ã¿ã ããã¤ã¹ãã¤ã³ã¹ãã¼ã«ããã¨ãã³ã³ãã¥ã¼ã¿ãããªã¼ãºããããèµ·åä¸è½ã«ãªãå¯è½æ§ãããã¾ã!",IDC_STATIC,120,67,195,34 CONTROL "ãã©ã¤ããèªåçã«ã¤ã³ã¹ãã¼ã«ãã",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "ãã©ã¤ããç¹å®ã®å ´æããã¤ã³ã¹ãã¼ã«ãã",IDC_RADIO_MANUAL, @@ -29,7 +29,7 @@ IDC_STATIC,120,40,195,19 LTEXT "ãã©ã¤ãã®ãã£ã¹ã¯ãæã£ã¦ãããããã©ã¤ãã¸ã®ãã¹ãç¥ã£ã¦ããå ´åã¯ã[æ»ã] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC,120,98,181,24 - CONTROL "ãã®ãã¤ã¢ãã°ãä»å¾è¡¨ ç¤ºããªã",IDC_DONOTSHOWDLG,"Button", + CONTROL "ãã®ãã¤ã¢ãã°ãä»å¾è¡¨ç¤ºããªã",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END @@ -40,7 +40,7 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "ã¤ã³ã¹ãã¼ã«å¤±æ",IDC_FINISHTITLE,120,8,195,24 - LTEXT "äº æãã¬ã¨ã©ã¼ãçºçãããããããã¤ã¹ã¯ã¤ã³ã¹ãã¼ã«ããã¾ããã§ããã", + LTEXT "äºæãã¬ã¨ã©ã¼ãçºçãããããããã¤ã¹ã¯ã¤ã³ã¹ãã¼ã«ããã¾ããã§ããã", IDC_STATIC,120,40,195,19 LTEXT "ä¸æãªããã¤ã¹",IDC_DEVICE,134,55,164,11 END Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -36,13 +36,13 @@ CAPTION "ReactOS ã»ããã¢ãã" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨ æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", + LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOSã¯GPLã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯GPLã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC,15,110,227,19 - PUSHBUTTON "GPLãè¡¨ ç¤º(&V)...",IDC_VIEWGPL,251,110,50,19 + PUSHBUTTON "GPLãè¡¨ç¤º(&V)...",IDC_VIEWGPL,251,110,50,19 LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã",IDC_STATIC,15,136, 195,17 END @@ -91,7 +91,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ãã±ã¼ã«è¨å®å¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 @@ -172,7 +172,7 @@ BEGIN IDS_ACKTITLE "æ¿èª" IDS_ACKSUBTITLE "ReactOS ãå©ç¨ãã¦ããããã¸ã§ã¯ãã¨ã©ã¤ã»ã³ã¹ã«é¢ããæå ±" - IDS_OWNERTITLE "ã½ ããã¦ã§ã¢ã®åäººç¨è¨å®" + IDS_OWNERTITLE "ã½ããã¦ã§ã¢ã®åäººç¨è¨å®" IDS_OWNERSUBTITLE "ãã®æå ±ã¯ãReactOS ã®åäººç¨è¨å®ã«ç¨ãããã¾ãã" IDS_COMPUTERTITLE "ã³ã³ãã¥ã¼ã¿åã¨ Administrator ãã¹ã¯ã¼ã" IDS_COMPUTERSUBTITLE "ã³ã³ãã¥ã¼ã¿åã¨ Administrator ãã¹ã¯ã¼ããå¥åããå¿è¦ãããã¾ãã" @@ -197,7 +197,7 @@ IDS_CMT_DEVMGMT "ããã¤ã¹ ããã¼ã¸ã£ãèµ·åãã¾ã" IDS_CMT_EVENTVIEW "ã¤ãã³ã ãã¥ã¼ã¢ãèµ·åãã¾ã" IDS_CMT_EXPLORER "ã¨ã¯ã¹ããã¼ã©ãèµ·åãã¾ã" - IDS_CMT_MSCONFIG "ã·ã¹ãã ã®æ§ æããã°ã©ã ãéãã¾ã" + IDS_CMT_MSCONFIG "ã·ã¹ãã ã®æ§æããã°ã©ã ãéãã¾ã" IDS_CMT_NOTEPAD "ããã¹ãã¨ãã£ã¿ãèµ·åãã¾ã" IDS_CMT_RDESKTOP "ãªã¢ã¼ã ãã¹ã¯ããããèµ·åãã¾ã" IDS_CMT_REGEDIT "ã¬ã¸ã¹ããª ã¨ãã£ã¿ãèµ·åãã¾ã" @@ -210,9 +210,9 @@ STRINGTABLE BEGIN IDS_GAMES "ã²ã¼ã " - IDS_CMT_SOLITAIRE "ã½ ãªãã£ã¢" + IDS_CMT_SOLITAIRE "ã½ãªãã£ã¢" IDS_CMT_WINEMINE "WineMine" - IDS_CMT_SPIDER "ã¹ãã¤ã ã½ ãªãã£ã¢" + IDS_CMT_SPIDER "ã¹ãã¤ã ã½ãªãã£ã¢" END STRINGTABLE @@ -253,7 +253,7 @@ STRINGTABLE BEGIN IDS_SHORT_CALC "é»å.lnk" - IDS_SHORT_CHARMAP "æåã³ã¼ãè¡¨ .lnk" + IDS_SHORT_CHARMAP "æåã³ã¼ãè¡¨.lnk" IDS_SHORT_CMD "ã³ãã³ã ããã³ãã.lnk" IDS_SHORT_DEVICE "ããã¤ã¹ ããã¼ã¸ã£.lnk" IDS_SHORT_DOWNLOADER "ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£.lnk" @@ -263,7 +263,7 @@ IDS_SHORT_KBSWITCH "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ã åæ¿å¨.lnk" IDS_SHORT_MAGNIFY "æ¡å¤§é¡.lnk" IDS_SHORT_MPLAY32 "ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤.lnk" - IDS_SHORT_MSCONFIG "ã·ã¹ãã ã®æ§ æ.lnk" + IDS_SHORT_MSCONFIG "ã·ã¹ãã ã®æ§æ.lnk" IDS_SHORT_NOTEPAD "ã¡ã¢å¸³.lnk" IDS_SHORT_RDESKTOP "ãªã¢ã¼ã ãã¹ã¯ãããæ¥ç¶.lnk" IDS_SHORT_REGEDIT "ã¬ã¸ã¹ããª ã¨ãã£ã¿.lnk" @@ -271,11 +271,11 @@ IDS_SHORT_SNAP "ã¹ãããã·ã§ãã.lnk" IDS_SHORT_SNDVOL32 "ããªã¥ã¼ã ã³ã³ããã¼ã«.lnk" IDS_SHORT_SNDREC32 "ãªã¼ãã£ãªã¬ã³ã¼ã.lnk" - IDS_SHORT_SOLITAIRE "ã½ ãªãã£ã¢.lnk" + IDS_SHORT_SOLITAIRE "ã½ãªãã£ã¢.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "ã¯ã¼ãããã.lnk" IDS_SHORT_PAINT "ãã¤ã³ã.lnk" - IDS_SHORT_SPIDER "ã¹ãã¤ã ã½ ãªãã£ã¢.lnk" + IDS_SHORT_SPIDER "ã¹ãã¤ã ã½ãªãã£ã¢.lnk" END STRINGTABLE

11 years, 9 months

[hbelusca] 58557: [CONSRV] Fix what I broke in revision r58447, namely at which process the terminal window belongs to.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 20 00:41:47 2013 New Revision: 58557 URL: http://svn.reactos.org/svn/reactos?rev=58557&view=rev Log: [CONSRV] Fix what I broke in revision r58447, namely at which process the terminal window belongs to. Modified: branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -106,6 +106,7 @@ DWORD ShiftState, UINT VirtualKeyCode, BOOL Down); + VOID (WINAPI *RefreshInternalInfo)(struct _CONSOLE* Console); /* * External interface (functions corresponding to the Console API) @@ -132,6 +133,10 @@ #define ConioResizeBuffer(Console, Buff, Size) (Console)->TermIFace.Vtbl->ResizeBuffer((Console), (Buff), (Size)) #define ConioProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ (Console)->TermIFace.Vtbl->ProcessKeyCallback((Console), (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) +#define ConioGetConsoleWindowHandle(Console) \ + (Console)->TermIFace.Vtbl->GetConsoleWindowHandle((Console)) +#define ConioRefreshInternalInfo(Console) \ + (Console)->TermIFace.Vtbl->RefreshInternalInfo((Console)) typedef struct _TERMINAL_IFACE { @@ -194,25 +199,6 @@ COLORREF Colors[16]; /* Colour palette */ } CONSOLE, *PCONSOLE; - -/**************************************************************\ -\** Define the Console Leader Process for the console window **/ -#define GWLP_CONSOLEWND_ALLOC (2 * sizeof(LONG_PTR)) -#define GWLP_CONSOLE_LEADER_PID 0 -#define GWLP_CONSOLE_LEADER_TID 4 - -#define SetConsoleWndConsoleLeaderCID(GuiData) \ -do { \ - PCONSOLE_PROCESS_DATA ProcessData; \ - CLIENT_ID ConsoleLeaderCID; \ - ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ - CONSOLE_PROCESS_DATA, \ - ConsoleLink); \ - ConsoleLeaderCID = ProcessData->Process->ClientId; \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ - SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ -} while(0) -/**************************************************************/ /* CONSOLE_SELECTION_INFO dwFlags values */ #define CONSOLE_NO_SELECTION 0x0 Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -1034,7 +1034,7 @@ Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - GetWindowRequest->WindowHandle = Console->TermIFace.Vtbl->GetConsoleWindowHandle(Console); + GetWindowRequest->WindowHandle = ConioGetConsoleWindowHandle(Console); ConSrvReleaseConsole(Console, TRUE); return STATUS_SUCCESS; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -64,6 +64,27 @@ PCONSOLE Console; /* Pointer to the owned console */ GUI_CONSOLE_INFO GuiInfo; /* GUI terminal settings */ } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; + + +/**************************************************************\ +\** Define the Console Leader Process for the console window **/ +#define GWLP_CONSOLEWND_ALLOC (2 * sizeof(LONG_PTR)) +#define GWLP_CONSOLE_LEADER_PID 0 +#define GWLP_CONSOLE_LEADER_TID 4 + +#define SetConsoleWndConsoleLeaderCID(GuiData) \ +do { \ + PCONSOLE_PROCESS_DATA ProcessData; \ + CLIENT_ID ConsoleLeaderCID; \ + ProcessData = CONTAINING_RECORD((GuiData)->Console->ProcessList.Blink, \ + CONSOLE_PROCESS_DATA, \ + ConsoleLink); \ + ConsoleLeaderCID = ProcessData->Process->ClientId; \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_PID, (LONG_PTR)(ConsoleLeaderCID.UniqueProcess)); \ + SetWindowLongPtrW((GuiData)->hWindow, GWLP_CONSOLE_LEADER_TID, (LONG_PTR)(ConsoleLeaderCID.UniqueThread )); \ +} while(0) +/**************************************************************/ + static BOOL ConsInitialized = FALSE; static HICON ghDefaultIcon = NULL; @@ -1619,8 +1640,6 @@ WindowCount++; SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); - // SetConsoleWndConsoleLeaderCID(Console); - DPRINT1("Set icons via PM_CREATE_CONSOLE\n"); if (GuiData->hIcon == NULL) { @@ -2066,6 +2085,15 @@ } static VOID WINAPI +GuiRefreshInternalInfo(PCONSOLE Console) +{ + PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; + + /* Update the console leader information held by the window */ + SetConsoleWndConsoleLeaderCID(GuiData); +} + +static VOID WINAPI GuiChangeTitle(PCONSOLE Console) { PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; @@ -2133,6 +2161,7 @@ GuiUpdateScreenInfo, GuiResizeBuffer, GuiProcessKeyCallback, + GuiRefreshInternalInfo, GuiChangeTitle, GuiChangeIcon, GuiGetConsoleWindowHandle Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Wed Mar 20 00:41:47 2013 @@ -449,6 +449,9 @@ /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(ProcessData->Console); + return STATUS_SUCCESS; } @@ -501,6 +504,9 @@ /* Add a reference count because the process is tied to the console */ _InterlockedIncrement(&ProcessData->Console->ReferenceCount); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(ProcessData->Console); + return STATUS_SUCCESS; } @@ -528,8 +534,8 @@ /* Remove ourselves from the console's list of processes */ RemoveEntryList(&ProcessData->ConsoleLink); - /* Update the console leader process */ - // SetConsoleWndConsoleLeaderCID(Console); + /* Update the internal info of the terminal */ + ConioRefreshInternalInfo(Console); /* Release the console */ ConSrvReleaseConsole(Console, TRUE);

11 years, 9 months

[hbelusca] 58556: [CONSRV] Use a new helper function ConSrvConsoleProcessCtrlEvent to send control events to processes belonging to a given console.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 19 23:40:20 2013 New Revision: 58556 URL: http://svn.reactos.org/svn/reactos?rev=58556&view=rev Log: [CONSRV] Use a new helper function ConSrvConsoleProcessCtrlEvent to send control events to processes belonging to a given console. Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -227,18 +227,9 @@ (er.Event.KeyEvent.wVirtualKeyCode == 'C')) && (er.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyState[VK_CONTROL] & 0x80)) { - PCONSOLE_PROCESS_DATA current; - PLIST_ENTRY current_entry; - DPRINT1("Console_Api Ctrl-C\n"); - - current_entry = Console->ProcessList.Flink; - while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - current_entry = current_entry->Flink; - ConSrvConsoleCtrlEvent(CTRL_C_EVENT, current); - } + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); + if (Console->LineBuffer && !Console->LineComplete) { /* Line input is in progress; end it */ Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -238,10 +238,9 @@ IN PCSR_PROCESS ConsoleLeaderProcess); VOID FASTCALL ConioPause(PCONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCONSOLE Console, UINT Flags); -VOID FASTCALL ConSrvConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData); -VOID FASTCALL ConSrvConsoleCtrlEventTimeout(DWORD Event, - PCONSOLE_PROCESS_DATA ProcessData, - DWORD Timeout); +ULONG FASTCALL ConSrvConsoleProcessCtrlEvent(PCONSOLE Console, + ULONG ProcessGroupId, + DWORD Event); /* coninput.c */ #define ConSrvGetInputBuffer(ProcessData, Handle, Ptr, Access, LockConsole) \ Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -28,17 +28,20 @@ /* PRIVATE FUNCTIONS **********************************************************/ -BOOL FASTCALL +#ifdef TUI_CONSOLE +static BOOL DtbgIsDesktopVisible(VOID) { return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); } - -VOID FASTCALL +#endif + +static ULONG ConSrvConsoleCtrlEventTimeout(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData, DWORD Timeout) { + ULONG Status = ERROR_SUCCESS; HANDLE Thread; DPRINT("ConSrvConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->Process->ClientId.UniqueProcess); @@ -50,20 +53,59 @@ UlongToPtr(Event), 0, NULL); if (NULL == Thread) { - DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); - return; - } - - DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); - WaitForSingleObject(Thread, Timeout); - CloseHandle(Thread); - } -} - -VOID FASTCALL -ConSrvConsoleCtrlEvent(DWORD Event, PCONSOLE_PROCESS_DATA ProcessData) -{ - ConSrvConsoleCtrlEventTimeout(Event, ProcessData, 0); + Status = GetLastError(); + DPRINT1("Failed thread creation (Error: 0x%x)\n", Status); + } + else + { + DPRINT("We succeeded at creating ProcessData->CtrlDispatcher remote thread, ProcessId = %x, Process = 0x%p\n", ProcessData->Process->ClientId.UniqueProcess, ProcessData->Process); + WaitForSingleObject(Thread, Timeout); + CloseHandle(Thread); + } + } + + return Status; +} + +static ULONG +ConSrvConsoleCtrlEvent(DWORD Event, + PCONSOLE_PROCESS_DATA ProcessData) +{ + return ConSrvConsoleCtrlEventTimeout(Event, ProcessData, 0); +} + +ULONG FASTCALL +ConSrvConsoleProcessCtrlEvent(PCONSOLE Console, + ULONG ProcessGroupId, + DWORD Event) +{ + ULONG Status = ERROR_SUCCESS; + PLIST_ENTRY current_entry; + PCONSOLE_PROCESS_DATA current; + + /* + * Loop through the process list, from the most recent process + * (the active one) to the oldest one (the first created, i.e. + * the console leader process), and for each, send an event + * (new processes are inserted at the head of the console process list). + */ + current_entry = Console->ProcessList.Flink; + while (current_entry != &Console->ProcessList) + { + current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); + current_entry = current_entry->Flink; + + /* + * Only processes belonging to the same process group are signaled. + * If the process group ID is zero, then all the processes are signaled. + */ + if (ProcessGroupId == 0 || current->Process->ProcessGroupId == ProcessGroupId) + { + Status = ConSrvConsoleCtrlEvent(Event, current); + } + } + + return Status; } VOID FASTCALL @@ -1107,29 +1149,15 @@ NTSTATUS Status; PCONSOLE_GENERATECTRLEVENT GenerateCtrlEventRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GenerateCtrlEventRequest; PCONSOLE Console; - PCONSOLE_PROCESS_DATA current; - PLIST_ENTRY current_entry; - DWORD Group; Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); if (!NT_SUCCESS(Status)) return Status; - Group = GenerateCtrlEventRequest->ProcessGroup; - Status = STATUS_INVALID_PARAMETER; - for (current_entry = Console->ProcessList.Flink; - current_entry != &Console->ProcessList; - current_entry = current_entry->Flink) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - if (Group == 0 || current->Process->ProcessGroupId == Group) - { - ConSrvConsoleCtrlEvent(GenerateCtrlEventRequest->Event, current); - Status = STATUS_SUCCESS; - } - } + Status = ConSrvConsoleProcessCtrlEvent(Console, + GenerateCtrlEventRequest->ProcessGroup, + GenerateCtrlEventRequest->Event); ConSrvReleaseConsole(Console, TRUE); - return Status; } Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Tue Mar 19 23:40:20 2013 @@ -1040,29 +1040,15 @@ GuiConsoleHandleClose(PGUI_CONSOLE_DATA GuiData) { PCONSOLE Console = GuiData->Console; - PLIST_ENTRY current_entry; - PCONSOLE_PROCESS_DATA current; /// LOCK /// EnterCriticalSection(&Console->Lock); /* - * Loop through the process list, from the most recent process - * (the active one) to the oldest one (the first created, - * i.e. the console leader process), and for each, send a - * CTRL-CLOSE event (new processes are inserted at the head - * of the console process list). + * FIXME: Windows will wait up to 5 seconds for the thread to exit. + * We shouldn't wait here, though, since the console lock is entered. + * A copy of the thread list probably needs to be made. */ - current_entry = Console->ProcessList.Flink; - while (current_entry != &Console->ProcessList) - { - current = CONTAINING_RECORD(current_entry, CONSOLE_PROCESS_DATA, ConsoleLink); - current_entry = current_entry->Flink; - - /* FIXME: Windows will wait up to 5 seconds for the thread to exit. - * We shouldn't wait here, though, since the console lock is entered. - * A copy of the thread list probably needs to be made. */ - ConSrvConsoleCtrlEvent(CTRL_CLOSE_EVENT, current); - } + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_CLOSE_EVENT); /// LOCK /// LeaveCriticalSection(&Console->Lock); }

11 years, 9 months

[hbelusca] 58555: [CONSRV] Code beautification, no changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 19 22:05:38 2013 New Revision: 58555 URL: http://svn.reactos.org/svn/reactos?rev=58555&view=rev Log: [CONSRV] Code beautification, no changes. Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/lineinput.c Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -673,7 +673,7 @@ } -/* PUBLIC APIS ****************************************************************/ +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvReadConsole) { Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -593,7 +593,7 @@ } -/* PUBLIC APIS ****************************************************************/ +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvReadConsoleOutput) { Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #define COBJMACROS #define NONAMELESSUNION @@ -26,7 +26,7 @@ #include <debug.h> -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ BOOL FASTCALL DtbgIsDesktopVisible(VOID) @@ -507,6 +507,9 @@ RtlFreeHeap(ConSrvHeap, 0, Console); } + +/* PUBLIC SERVER APIS *********************************************************/ + CSR_API(SrvOpenConsole) { NTSTATUS Status = STATUS_SUCCESS; @@ -598,7 +601,6 @@ * and recreate a new one later on. */ ConSrvRemoveConsole(ProcessData); - // ConSrvFreeHandlesTable(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ Status = ConSrvAllocateConsole(ProcessData, @@ -689,7 +691,6 @@ * and recreate a new one later on. */ ConSrvRemoveConsole(TargetProcessData); - // ConSrvFreeHandlesTable(TargetProcessData); /* * Inherit the console from the parent, Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/consrv.h [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -149,13 +149,6 @@ CSR_API(SrvVerifyConsoleIoHandle); CSR_API(SrvDuplicateHandle); -NTSTATUS FASTCALL ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, - OUT PHANDLE pInputHandle, - OUT PHANDLE pOutputHandle, - OUT PHANDLE pErrorHandle); -NTSTATUS FASTCALL ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, - IN PCONSOLE_PROCESS_DATA TargetProcessData); -VOID FASTCALL ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); NTSTATUS FASTCALL ConSrvInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, Object_t *Object, Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "consrv.h" #include "conio.h" @@ -15,7 +15,7 @@ #include <debug.h> -/* PRIVATE FUNCTIONS *********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ static INT AdjustHandleCounts(PCONSOLE_IO_HANDLE Entry, INT Change) @@ -103,10 +103,10 @@ } -/* FUNCTIONS *****************************************************************/ - -/* static */ NTSTATUS -FASTCALL +/* Forward declaration, used in ConSrvInitHandlesTable */ +static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData); + +static NTSTATUS ConSrvInitHandlesTable(IN OUT PCONSOLE_PROCESS_DATA ProcessData, OUT PHANDLE pInputHandle, OUT PHANDLE pOutputHandle, @@ -181,8 +181,7 @@ return STATUS_SUCCESS; } -NTSTATUS -FASTCALL +static NTSTATUS ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, IN PCONSOLE_PROCESS_DATA TargetProcessData) { @@ -234,8 +233,7 @@ return Status; } -VOID -FASTCALL +static VOID ConSrvFreeHandlesTable(PCONSOLE_PROCESS_DATA ProcessData) { DPRINT1("ConSrvFreeHandlesTable\n"); @@ -756,6 +754,7 @@ } +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvCloseHandle) { Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Tue Mar 19 22:05:38 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: Jeffrey Morlan */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "consrv.h" #include "conio.h" @@ -24,7 +24,8 @@ UNICODE_STRING ExeName; } HISTORY_BUFFER, *PHISTORY_BUFFER; -/* FUNCTIONS *****************************************************************/ + +/* PRIVATE FUNCTIONS **********************************************************/ static PHISTORY_BUFFER HistoryCurrentBuffer(PCONSOLE Console) @@ -140,14 +141,294 @@ VOID FASTCALL HistoryDeleteBuffer(PHISTORY_BUFFER Hist) { - if (!Hist) - return; + if (!Hist) return; + while (Hist->NumEntries != 0) RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]); + RtlFreeHeap(ConSrvHeap, 0, Hist->Entries); RemoveEntryList(&Hist->ListEntry); RtlFreeHeap(ConSrvHeap, 0, Hist); } + +static VOID +LineInputSetPos(PCONSOLE Console, UINT Pos) +{ + if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + { + PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; + UINT OldCursorX = Buffer->CursorPosition.X; + UINT OldCursorY = Buffer->CursorPosition.Y; + INT XY = OldCursorY * Buffer->ScreenBufferSize.X + OldCursorX; + + XY += (Pos - Console->LinePos); + if (XY < 0) + XY = 0; + else if (XY >= Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X) + XY = Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X - 1; + + Buffer->CursorPosition.X = XY % Buffer->ScreenBufferSize.X; + Buffer->CursorPosition.Y = XY / Buffer->ScreenBufferSize.X; + ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); + } + + Console->LinePos = Pos; +} + +static VOID +LineInputEdit(PCONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion) +{ + UINT Pos = Console->LinePos; + UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; + INT i; + + /* Make sure there's always enough room for ending \r\n */ + if (NewSize + 2 > Console->LineMaxSize) + return; + + memmove(&Console->LineBuffer[Pos + NumToInsert], + &Console->LineBuffer[Pos + NumToDelete], + (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); + memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); + + if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + { + for (i = Pos; i < NewSize; i++) + { + CHAR AsciiChar; + WideCharToMultiByte(Console->OutputCodePage, 0, + &Console->LineBuffer[i], 1, + &AsciiChar, 1, NULL, NULL); + ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); + } + for (; i < Console->LineSize; i++) + { + ConioWriteConsole(Console, Console->ActiveBuffer, " ", 1, TRUE); + } + Console->LinePos = i; + } + + Console->LineSize = NewSize; + LineInputSetPos(Console, Pos + NumToInsert); +} + +static VOID +LineInputRecallHistory(PCONSOLE Console, INT Offset) +{ + PHISTORY_BUFFER Hist; + + if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + return; + + Offset += Hist->Position; + Offset = max(Offset, 0); + Offset = min(Offset, Hist->NumEntries - 1); + Hist->Position = Offset; + + LineInputSetPos(Console, 0); + LineInputEdit(Console, Console->LineSize, + Hist->Entries[Offset].Length / sizeof(WCHAR), + Hist->Entries[Offset].Buffer); +} + +VOID FASTCALL +LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent) +{ + UINT Pos = Console->LinePos; + PHISTORY_BUFFER Hist; + UNICODE_STRING Entry; + INT HistPos; + + switch (KeyEvent->wVirtualKeyCode) + { + case VK_ESCAPE: + /* Clear entire line */ + LineInputSetPos(Console, 0); + LineInputEdit(Console, Console->LineSize, 0, NULL); + return; + case VK_HOME: + /* Move to start of line. With ctrl, erase everything left of cursor */ + LineInputSetPos(Console, 0); + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Pos, 0, NULL); + return; + case VK_END: + /* Move to end of line. With ctrl, erase everything right of cursor */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); + else + LineInputSetPos(Console, Console->LineSize); + return; + case VK_LEFT: + /* Move left. With ctrl, move to beginning of previous word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; + while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; + } + else + { + Pos -= (Pos > 0); + } + LineInputSetPos(Console, Pos); + return; + case VK_RIGHT: + case VK_F1: + /* Move right. With ctrl, move to beginning of next word */ + if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) + { + while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; + while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; + LineInputSetPos(Console, Pos); + return; + } + else + { + /* Recall one character (but don't overwrite current line) */ + HistoryGetCurrentEntry(Console, &Entry); + if (Pos < Console->LineSize) + LineInputSetPos(Console, Pos + 1); + else if (Pos * sizeof(WCHAR) < Entry.Length) + LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); + } + return; + case VK_INSERT: + /* Toggle between insert and overstrike */ + Console->LineInsertToggle = !Console->LineInsertToggle; + ConioSetCursorInfo(Console, Console->ActiveBuffer); + return; + case VK_DELETE: + /* Remove character to right of cursor */ + if (Pos != Console->LineSize) + LineInputEdit(Console, 1, 0, NULL); + return; + case VK_PRIOR: + /* Recall first history entry */ + LineInputRecallHistory(Console, -((WORD)-1)); + return; + case VK_NEXT: + /* Recall last history entry */ + LineInputRecallHistory(Console, +((WORD)-1)); + return; + case VK_UP: + case VK_F5: + /* Recall previous history entry. On first time, actually recall the + * current (usually last) entry; on subsequent times go back. */ + LineInputRecallHistory(Console, Console->LineUpPressed ? -1 : 0); + Console->LineUpPressed = TRUE; + return; + case VK_DOWN: + /* Recall next history entry */ + LineInputRecallHistory(Console, +1); + return; + case VK_F3: + /* Recall remainder of current history entry */ + HistoryGetCurrentEntry(Console, &Entry); + if (Pos * sizeof(WCHAR) < Entry.Length) + { + UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); + UINT DeleteSize = min(Console->LineSize - Pos, InsertSize); + LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); + } + return; + case VK_F6: + /* Insert a ^Z character */ + KeyEvent->uChar.UnicodeChar = 26; + break; + case VK_F7: + if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + HistoryDeleteBuffer(HistoryCurrentBuffer(Console)); + return; + case VK_F8: + /* Search for history entries starting with input. */ + if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + return; + + /* Like Up/F5, on first time start from current (usually last) entry, + * but on subsequent times start at previous entry. */ + if (Console->LineUpPressed) + Hist->Position = (Hist->Position ? Hist->Position : Hist->NumEntries) - 1; + Console->LineUpPressed = TRUE; + + Entry.Length = Console->LinePos * sizeof(WCHAR); + Entry.Buffer = Console->LineBuffer; + + /* Keep going backwards, even wrapping around to the end, + * until we get back to starting point */ + HistPos = Hist->Position; + do + { + if (RtlPrefixUnicodeString(&Entry, &Hist->Entries[HistPos], FALSE)) + { + Hist->Position = HistPos; + LineInputEdit(Console, Console->LineSize - Pos, + Hist->Entries[HistPos].Length / sizeof(WCHAR) - Pos, + &Hist->Entries[HistPos].Buffer[Pos]); + /* Cursor stays where it was */ + LineInputSetPos(Console, Pos); + return; + } + if (--HistPos < 0) HistPos += Hist->NumEntries; + } while (HistPos != Hist->Position); + return; + } + + if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT) + { + /* backspace handling - if processed input enabled then we handle it here + * otherwise we treat it like a normal char. */ + if (Pos > 0) + { + LineInputSetPos(Console, Pos - 1); + LineInputEdit(Console, 1, 0, NULL); + } + } + else if (KeyEvent->uChar.UnicodeChar == L'\r') + { + HistoryAddEntry(Console); + + /* TODO: Expand aliases */ + + LineInputSetPos(Console, Console->LineSize); + Console->LineBuffer[Console->LineSize++] = L'\r'; + if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); + + /* Add \n if processed input. There should usually be room for it, + * but an exception to the rule exists: the buffer could have been + * pre-filled with LineMaxSize - 1 characters. */ + if (Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && + Console->LineSize < Console->LineMaxSize) + { + Console->LineBuffer[Console->LineSize++] = L'\n'; + if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) + ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); + } + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else if (KeyEvent->uChar.UnicodeChar != L'\0') + { + if (KeyEvent->uChar.UnicodeChar < 0x20 && + Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) + { + /* Control key client wants to handle itself (e.g. for tab completion) */ + Console->LineBuffer[Console->LineSize++] = L' '; + Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else + { + /* Normal character */ + BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; + LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); + } + } +} + + +/* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvGetConsoleCommandHistoryLength) { @@ -337,280 +618,4 @@ return Status; } -static VOID -LineInputSetPos(PCONSOLE Console, UINT Pos) -{ - if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - { - PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; - UINT OldCursorX = Buffer->CursorPosition.X; - UINT OldCursorY = Buffer->CursorPosition.Y; - INT XY = OldCursorY * Buffer->ScreenBufferSize.X + OldCursorX; - - XY += (Pos - Console->LinePos); - if (XY < 0) - XY = 0; - else if (XY >= Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X) - XY = Buffer->ScreenBufferSize.Y * Buffer->ScreenBufferSize.X - 1; - - Buffer->CursorPosition.X = XY % Buffer->ScreenBufferSize.X; - Buffer->CursorPosition.Y = XY / Buffer->ScreenBufferSize.X; - ConioSetScreenInfo(Console, Buffer, OldCursorX, OldCursorY); - } - - Console->LinePos = Pos; -} - -static VOID -LineInputEdit(PCONSOLE Console, UINT NumToDelete, UINT NumToInsert, WCHAR *Insertion) -{ - UINT Pos = Console->LinePos; - UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; - INT i; - - /* Make sure there's always enough room for ending \r\n */ - if (NewSize + 2 > Console->LineMaxSize) - return; - - memmove(&Console->LineBuffer[Pos + NumToInsert], - &Console->LineBuffer[Pos + NumToDelete], - (Console->LineSize - (Pos + NumToDelete)) * sizeof(WCHAR)); - memcpy(&Console->LineBuffer[Pos], Insertion, NumToInsert * sizeof(WCHAR)); - - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - { - for (i = Pos; i < NewSize; i++) - { - CHAR AsciiChar; - WideCharToMultiByte(Console->OutputCodePage, 0, - &Console->LineBuffer[i], 1, - &AsciiChar, 1, NULL, NULL); - ConioWriteConsole(Console, Console->ActiveBuffer, &AsciiChar, 1, TRUE); - } - for (; i < Console->LineSize; i++) - { - ConioWriteConsole(Console, Console->ActiveBuffer, " ", 1, TRUE); - } - Console->LinePos = i; - } - - Console->LineSize = NewSize; - LineInputSetPos(Console, Pos + NumToInsert); -} - -static VOID -LineInputRecallHistory(PCONSOLE Console, INT Offset) -{ - PHISTORY_BUFFER Hist; - - if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) - return; - - Offset += Hist->Position; - Offset = max(Offset, 0); - Offset = min(Offset, Hist->NumEntries - 1); - Hist->Position = Offset; - - LineInputSetPos(Console, 0); - LineInputEdit(Console, Console->LineSize, - Hist->Entries[Offset].Length / sizeof(WCHAR), - Hist->Entries[Offset].Buffer); -} - -VOID FASTCALL -LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent) -{ - UINT Pos = Console->LinePos; - PHISTORY_BUFFER Hist; - UNICODE_STRING Entry; - INT HistPos; - - switch (KeyEvent->wVirtualKeyCode) - { - case VK_ESCAPE: - /* Clear entire line */ - LineInputSetPos(Console, 0); - LineInputEdit(Console, Console->LineSize, 0, NULL); - return; - case VK_HOME: - /* Move to start of line. With ctrl, erase everything left of cursor */ - LineInputSetPos(Console, 0); - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - LineInputEdit(Console, Pos, 0, NULL); - return; - case VK_END: - /* Move to end of line. With ctrl, erase everything right of cursor */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - LineInputEdit(Console, Console->LineSize - Pos, 0, NULL); - else - LineInputSetPos(Console, Console->LineSize); - return; - case VK_LEFT: - /* Move left. With ctrl, move to beginning of previous word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos > 0 && Console->LineBuffer[Pos - 1] == L' ') Pos--; - while (Pos > 0 && Console->LineBuffer[Pos - 1] != L' ') Pos--; - } - else - { - Pos -= (Pos > 0); - } - LineInputSetPos(Console, Pos); - return; - case VK_RIGHT: - case VK_F1: - /* Move right. With ctrl, move to beginning of next word */ - if (KeyEvent->dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - while (Pos < Console->LineSize && Console->LineBuffer[Pos] != L' ') Pos++; - while (Pos < Console->LineSize && Console->LineBuffer[Pos] == L' ') Pos++; - LineInputSetPos(Console, Pos); - return; - } - else - { - /* Recall one character (but don't overwrite current line) */ - HistoryGetCurrentEntry(Console, &Entry); - if (Pos < Console->LineSize) - LineInputSetPos(Console, Pos + 1); - else if (Pos * sizeof(WCHAR) < Entry.Length) - LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); - } - return; - case VK_INSERT: - /* Toggle between insert and overstrike */ - Console->LineInsertToggle = !Console->LineInsertToggle; - ConioSetCursorInfo(Console, Console->ActiveBuffer); - return; - case VK_DELETE: - /* Remove character to right of cursor */ - if (Pos != Console->LineSize) - LineInputEdit(Console, 1, 0, NULL); - return; - case VK_PRIOR: - /* Recall first history entry */ - LineInputRecallHistory(Console, -((WORD)-1)); - return; - case VK_NEXT: - /* Recall last history entry */ - LineInputRecallHistory(Console, +((WORD)-1)); - return; - case VK_UP: - case VK_F5: - /* Recall previous history entry. On first time, actually recall the - * current (usually last) entry; on subsequent times go back. */ - LineInputRecallHistory(Console, Console->LineUpPressed ? -1 : 0); - Console->LineUpPressed = TRUE; - return; - case VK_DOWN: - /* Recall next history entry */ - LineInputRecallHistory(Console, +1); - return; - case VK_F3: - /* Recall remainder of current history entry */ - HistoryGetCurrentEntry(Console, &Entry); - if (Pos * sizeof(WCHAR) < Entry.Length) - { - UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); - UINT DeleteSize = min(Console->LineSize - Pos, InsertSize); - LineInputEdit(Console, DeleteSize, InsertSize, &Entry.Buffer[Pos]); - } - return; - case VK_F6: - /* Insert a ^Z character */ - KeyEvent->uChar.UnicodeChar = 26; - break; - case VK_F7: - if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - HistoryDeleteBuffer(HistoryCurrentBuffer(Console)); - return; - case VK_F8: - /* Search for history entries starting with input. */ - if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) - return; - - /* Like Up/F5, on first time start from current (usually last) entry, - * but on subsequent times start at previous entry. */ - if (Console->LineUpPressed) - Hist->Position = (Hist->Position ? Hist->Position : Hist->NumEntries) - 1; - Console->LineUpPressed = TRUE; - - Entry.Length = Console->LinePos * sizeof(WCHAR); - Entry.Buffer = Console->LineBuffer; - - /* Keep going backwards, even wrapping around to the end, - * until we get back to starting point */ - HistPos = Hist->Position; - do - { - if (RtlPrefixUnicodeString(&Entry, &Hist->Entries[HistPos], FALSE)) - { - Hist->Position = HistPos; - LineInputEdit(Console, Console->LineSize - Pos, - Hist->Entries[HistPos].Length / sizeof(WCHAR) - Pos, - &Hist->Entries[HistPos].Buffer[Pos]); - /* Cursor stays where it was */ - LineInputSetPos(Console, Pos); - return; - } - if (--HistPos < 0) HistPos += Hist->NumEntries; - } while (HistPos != Hist->Position); - return; - } - - if (KeyEvent->uChar.UnicodeChar == L'\b' && Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT) - { - /* backspace handling - if processed input enabled then we handle it here - * otherwise we treat it like a normal char. */ - if (Pos > 0) - { - LineInputSetPos(Console, Pos - 1); - LineInputEdit(Console, 1, 0, NULL); - } - } - else if (KeyEvent->uChar.UnicodeChar == L'\r') - { - HistoryAddEntry(Console); - - /* TODO: Expand aliases */ - - LineInputSetPos(Console, Console->LineSize); - Console->LineBuffer[Console->LineSize++] = L'\r'; - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); - - /* Add \n if processed input. There should usually be room for it, - * but an exception to the rule exists: the buffer could have been - * pre-filled with LineMaxSize - 1 characters. */ - if (Console->InputBuffer.Mode & ENABLE_PROCESSED_INPUT && - Console->LineSize < Console->LineMaxSize) - { - Console->LineBuffer[Console->LineSize++] = L'\n'; - if (Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) - ConioWriteConsole(Console, Console->ActiveBuffer, "\n", 1, TRUE); - } - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - else if (KeyEvent->uChar.UnicodeChar != L'\0') - { - if (KeyEvent->uChar.UnicodeChar < 0x20 && - Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) - { - /* Control key client wants to handle itself (e.g. for tab completion) */ - Console->LineBuffer[Console->LineSize++] = L' '; - Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; - Console->LineComplete = TRUE; - Console->LinePos = 0; - } - else - { - /* Normal character */ - BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; - LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); - } - } -} - /* EOF */

11 years, 9 months

[hbelusca] 58554: [WIN32SS] "Internal Message!" : this is just an informative message, not an error.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 19 01:28:50 2013 New Revision: 58554 URL: http://svn.reactos.org/svn/reactos?rev=58554&view=rev Log: [WIN32SS] "Internal Message!" : this is just an informative message, not an error. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Mar 19 01:28:50 2013 @@ -1557,7 +1557,7 @@ { if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN( FALSE); - ERR("SMWCB: Internal Message!\n"); + TRACE("SMWCB: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); if (uResult) *uResult = Result; RETURN( TRUE);

11 years, 9 months

[fireball] 58553: [CMD] - Victor Martinez: ECHO command should write CRLF. Fixes regressions in several apps that depend on console output. CORE-6916 #resolve #comment Committed in r58553.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 18 21:23:35 2013 New Revision: 58553 URL: http://svn.reactos.org/svn/reactos?rev=58553&view=rev Log: [CMD] - Victor Martinez: ECHO command should write CRLF. Fixes regressions in several apps that depend on console output. CORE-6916 #resolve #comment Committed in r58553. Modified: trunk/reactos/base/shell/cmd/echo.c Modified: trunk/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/echo.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/echo.c [iso-8859-1] Mon Mar 18 21:23:35 2013 @@ -83,7 +83,7 @@ { /* skip the first character */ ConOutPuts(param + 1); - ConOutPuts(_T("\n")); + ConOutPuts(_T("\r\n")); } return 0; }

11 years, 9 months

[ekohl] 58552: [SAMSRV] - Add missing flags for SamrQueryInformationUser.UserAllInformation.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 18 15:16:10 2013 New Revision: 58552 URL: http://svn.reactos.org/svn/reactos?rev=58552&view=rev Log: [SAMSRV] - Add missing flags for SamrQueryInformationUser.UserAllInformation. Modified: trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Mon Mar 18 15:16:10 2013 @@ -224,6 +224,19 @@ #define USER_ALL_SECURITYDESCRIPTOR 0x10000000 #define USER_ALL_OWFPASSWORD 0x20000000 #define USER_ALL_UNDEFINED_MASK 0xC0000000 + +#define USER_ALL_READ_GENERAL_MASK 0x0000003F +#define USER_ALL_READ_LOGON_MASK 0x0003FFC0 +#define USER_ALL_READ_ACCOUNT_MASK 0x003C0000 +#define USER_ALL_READ_PREFERENCES_MASK 0x00C00000 +#define USER_ALL_READ_TRUSTED_MASK 0x1F000000 +#define USER_ALL_READ_CANT_MASK 0xC0000000 + +#define USER_ALL_WRITE_ACCOUNT_MASK 0x003827DB +#define USER_ALL_WRITE_PREFERENCES_MASK 0x00C00020 +#define USER_ALL_WRITE_FORCE_PASSWORD_CHANGE_MASK 0x0B000000 +#define USER_ALL_WRITE_TRUSTED_MASK 0x1404D800 +#define USER_ALL_WRITE_CANT_MASK 0xC0030004 /* Values used by USER_PWD_CHANGE_FAILURE_INFORMATION.ExtendedFailureReason */ #define SAM_PWD_CHANGE_NO_ERROR 0

11 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2013