Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 58347: [TRANSLATION] Update/add Hebrew translations. Baruch Rutman (peterooch~AT~gmail~DOT~com).
by dgorbachev＠svn.reactos.org 21 Feb '13

21 Feb '13

Author: dgorbachev Date: Thu Feb 21 17:36:53 2013 New Revision: 58347 URL: http://svn.reactos.org/svn/reactos?rev=58347&view=rev Log: [TRANSLATION] Update/add Hebrew translations. Baruch Rutman (peterooch~AT~gmail~DOT~com). Added: trunk/reactos/base/shell/explorer/explorer-he.rc (with props) trunk/reactos/dll/win32/oledlg/oledlg_He.rc (with props) trunk/reactos/dll/win32/rasdlg/lang/he-IL.rc (with props) trunk/reactos/dll/win32/serialui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/setupapi/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shdoclc/He.rc (with props) trunk/reactos/dll/win32/shell32/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_He.rc (with props) trunk/reactos/dll/win32/syssetup/lang/he-IL.rc (with props) trunk/reactos/dll/win32/tapiui/lang/he-IL.rc (with props) trunk/reactos/dll/win32/userenv/lang/he-IL.rc (with props) trunk/reactos/dll/win32/wldap32/wldap32_He.rc (with props) trunk/reactos/win32ss/user/user32/lang/he-IL.rc (with props) trunk/reactos/win32ss/user/win32csr/lang/he-IL.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc trunk/reactos/base/applications/games/winmine/lang/he-IL.rc trunk/reactos/base/applications/msconfig/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/he-IL.rc trunk/reactos/base/applications/notepad/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/regedit/lang/he-IL.rc trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc trunk/reactos/base/applications/shutdown/lang/he-IL.rc trunk/reactos/base/applications/sndvol32/lang/en-US.rc trunk/reactos/base/applications/sndvol32/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/wordpad/He.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/vmwinst/lang/he-IL.rc trunk/reactos/base/shell/explorer-new/lang/he-IL.rc trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/base/system/winlogon/lang/he-IL.rc trunk/reactos/dll/cpl/console/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/dll/keyboard/kbdheb/kbdheb.c trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/lang/he-IL.rc trunk/reactos/dll/win32/comctl32/comctl_He.rc trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc trunk/reactos/dll/win32/cryptui/cryptui.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/oledlg/rsrc.rc trunk/reactos/dll/win32/rasdlg/rasdlg.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/setupapi/setupapi.rc trunk/reactos/dll/win32/shdoclc/rsrc.rc trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/dll/win32/wldap32/wldap32.rc trunk/reactos/win32ss/user/user32/user32.rc trunk/reactos/win32ss/user/win32csr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/games/solitaire/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winmine/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/msconfig/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… Modified: trunk/reactos/base/setup/vmwinst/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/he… Modified: trunk/reactos/base/shell/explorer-new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/shell/explorer/explorer-he.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/winlogon/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/he-IL… Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=58… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=5… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… Modified: trunk/reactos/dll/shellext/deskadp/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/browseui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/he… Modified: trunk/reactos/dll/win32/comctl32/comctl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… Added: trunk/reactos/dll/win32/oledlg/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_He… Modified: trunk/reactos/dll/win32/oledlg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/rsrc.rc?r… Added: trunk/reactos/dll/win32/rasdlg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/he-I… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc… Added: trunk/reactos/dll/win32/serialui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/he… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Added: trunk/reactos/dll/win32/setupapi/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/he… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Added: trunk/reactos/dll/win32/shdoclc/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/He.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/rsrc.rc?… Added: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Added: trunk/reactos/dll/win32/shimgvw/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/he-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Added: trunk/reactos/dll/win32/tapiui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/he-I… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Added: trunk/reactos/dll/win32/userenv/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/he-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… Added: trunk/reactos/dll/win32/wldap32/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… Added: trunk/reactos/win32ss/user/user32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h… Modified: trunk/reactos/win32ss/user/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… Added: trunk/reactos/win32ss/user/win32csr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/lang… Modified: trunk/reactos/win32ss/user/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/rsrc…

1 0

[gadamopoulos] 58346: [win32k] - Implement NtUserLockWorkStation [winlogon] - Handle LN_LOCK_WORKSTATION case of the WM_LOGONNOTIFY message
by gadamopoulos＠svn.reactos.org 21 Feb '13

21 Feb '13

Author: gadamopoulos Date: Thu Feb 21 17:27:08 2013 New Revision: 58346 URL: http://svn.reactos.org/svn/reactos?rev=58346&view=rev Log: [win32k] - Implement NtUserLockWorkStation [winlogon] - Handle LN_LOCK_WORKSTATION case of the WM_LOGONNOTIFY message Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -1174,6 +1174,11 @@ inScrn = FALSE; break; } + case LN_LOCK_WORKSTATION: + { + DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); + break; + } default: { ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -301,15 +301,6 @@ DWORD Unknown9, DWORD Unknown10, DWORD Unknown11) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserLockWorkStation(VOID) { STUB Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Thu Feb 21 17:27:08 2013 @@ -1320,4 +1320,27 @@ return TRUE; } +BOOL +APIENTRY +NtUserLockWorkStation(VOID) +{ + BOOL ret; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + UserEnterExclusive(); + + if (pti->rpdesk == IntGetActiveDesktop()) + { + ret = UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOCK_WORKSTATION, 0); + } + else + { + ret = FALSE; + } + + UserLeave(); + + return ret; +} + /* EOF */

1 0

[hbelusca] 58345: [PSDK] - Add ENABLE_INSERT_MODE, ENABLE_QUICK_EDIT_MODE and ENABLE_EXTENDED_FLAGS flags. - Add GetConsoleAliasExesA/W and GetConsoleAliasExesLengthA/W api definitions. [DOSKEY] Re...
by hbelusca＠svn.reactos.org 20 Feb '13

20 Feb '13

Author: hbelusca Date: Wed Feb 20 22:28:14 2013 New Revision: 58345 URL: http://svn.reactos.org/svn/reactos?rev=58345&view=rev Log: [PSDK] - Add ENABLE_INSERT_MODE, ENABLE_QUICK_EDIT_MODE and ENABLE_EXTENDED_FLAGS flags. - Add GetConsoleAliasExesA/W and GetConsoleAliasExesLengthA/W api definitions. [DOSKEY] Remove unneeded definitions since now these are declared in the psdk. Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h branches/ros-csrss/include/psdk/wincon.h Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… ============================================================================== --- branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] (original) +++ branches/ros-csrss/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] Wed Feb 20 22:28:14 2013 @@ -2,48 +2,3 @@ #define IDS_HELP 0 #define IDS_INVALID_MACRO_DEF 1 - -#ifndef RC_INVOKED - -#ifdef UNICODE -#define TNAME(x) x##W -#else -#define TNAME(x) x##A -#endif - -/* Missing from include/psdk/wincon.h */ -#ifndef ENABLE_INSERT_MODE -#define ENABLE_INSERT_MODE 0x20 -#endif -#ifndef ENABLE_EXTENDED_FLAGS -#define ENABLE_EXTENDED_FLAGS 0x80 -#endif - -/* Undocumented APIs */ -#ifndef AddConsoleAlias -BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR); -BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); -#define AddConsoleAlias TNAME(AddConsoleAlias) -#endif -#ifndef GetConsoleAliases -DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); -DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); -#define GetConsoleAliases TNAME(GetConsoleAliases) -#endif -#ifndef GetConsoleAliasesLength -DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); -DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); -#define GetConsoleAliasesLength TNAME(GetConsoleAliasesLength) -#endif -#ifndef GetConsoleAliasExes -DWORD WINAPI GetConsoleAliasExesA(LPSTR, DWORD); -DWORD WINAPI GetConsoleAliasExesW(LPWSTR, DWORD); -#define GetConsoleAliasExes TNAME(GetConsoleAliasExes) -#endif -#ifndef GetConsoleAliasExesLength -DWORD WINAPI GetConsoleAliasExesLengthA(VOID); -DWORD WINAPI GetConsoleAliasExesLengthW(VOID); -#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) -#endif - -#endif /* RC_INVOKED */ Modified: branches/ros-csrss/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/wincon.h… ============================================================================== --- branches/ros-csrss/include/psdk/wincon.h [iso-8859-1] (original) +++ branches/ros-csrss/include/psdk/wincon.h [iso-8859-1] Wed Feb 20 22:28:14 2013 @@ -14,26 +14,45 @@ #pragma warning(disable:4820) #endif -#define FOREGROUND_BLUE 1 -#define FOREGROUND_GREEN 2 -#define FOREGROUND_RED 4 -#define FOREGROUND_INTENSITY 8 -#define BACKGROUND_BLUE 16 -#define BACKGROUND_GREEN 32 -#define BACKGROUND_RED 64 -#define BACKGROUND_INTENSITY 128 -#define CTRL_C_EVENT 0 -#define CTRL_BREAK_EVENT 1 -#define CTRL_CLOSE_EVENT 2 -#define CTRL_LOGOFF_EVENT 5 +/* + * Color attributes for text and screen background + */ +#define FOREGROUND_BLUE 0x0001 +#define FOREGROUND_GREEN 0x0002 +#define FOREGROUND_RED 0x0004 +#define FOREGROUND_INTENSITY 0x0008 +#define BACKGROUND_BLUE 0x0010 +#define BACKGROUND_GREEN 0x0020 +#define BACKGROUND_RED 0x0040 +#define BACKGROUND_INTENSITY 0x0080 + +/* + * Control handler codes + */ +#define CTRL_C_EVENT 0 +#define CTRL_BREAK_EVENT 1 +#define CTRL_CLOSE_EVENT 2 +#define CTRL_LOGOFF_EVENT 5 #define CTRL_SHUTDOWN_EVENT 6 -#define ENABLE_LINE_INPUT 2 -#define ENABLE_ECHO_INPUT 4 -#define ENABLE_PROCESSED_INPUT 1 -#define ENABLE_WINDOW_INPUT 8 -#define ENABLE_MOUSE_INPUT 16 -#define ENABLE_PROCESSED_OUTPUT 1 -#define ENABLE_WRAP_AT_EOL_OUTPUT 2 + +/* + * Input mode flags + */ +#define ENABLE_PROCESSED_INPUT 0x0001 +#define ENABLE_LINE_INPUT 0x0002 +#define ENABLE_ECHO_INPUT 0x0004 +#define ENABLE_WINDOW_INPUT 0x0008 +#define ENABLE_MOUSE_INPUT 0x0010 +#define ENABLE_INSERT_MODE 0x0020 +#define ENABLE_QUICK_EDIT_MODE 0x0040 +#define ENABLE_EXTENDED_FLAGS 0x0080 + +/* + * Output mode flags + */ +#define ENABLE_PROCESSED_OUTPUT 0x0001 +#define ENABLE_WRAP_AT_EOL_OUTPUT 0x0002 + #define KEY_EVENT 1 #define MOUSE_EVENT 2 #define WINDOW_BUFFER_SIZE_EVENT 4 @@ -172,10 +191,12 @@ #endif #endif -BOOL WINAPI AllocConsole(void); +BOOL WINAPI AllocConsole(VOID); + #if (_WIN32_WINNT >= 0x0501) #define ATTACH_PARENT_PROCESS (DWORD)-1 BOOL WINAPI AttachConsole(_In_ DWORD); + BOOL WINAPI AddConsoleAliasA(_In_ LPCSTR, _In_ LPCSTR, _In_ LPCSTR); BOOL WINAPI AddConsoleAliasW(_In_ LPCWSTR, _In_ LPCWSTR, _In_ LPCWSTR); @@ -209,20 +230,36 @@ _In_ DWORD AliasBufferLength, _In_ LPWSTR ExeName); -DWORD WINAPI GetConsoleAliasesLengthA(_In_ LPSTR); -DWORD WINAPI GetConsoleAliasesLengthW(_In_ LPWSTR); -#endif +DWORD WINAPI GetConsoleAliasesLengthA(_In_ LPSTR ExeName); +DWORD WINAPI GetConsoleAliasesLengthW(_In_ LPWSTR ExeName); + +DWORD +WINAPI +GetConsoleAliasExesA( + _Out_writes_(ExeNameBufferLength) LPSTR ExeNameBuffer, + _In_ DWORD ExeNameBufferLength); + +DWORD +WINAPI +GetConsoleAliasExesW( + _Out_writes_(ExeNameBufferLength) LPWSTR ExeNameBuffer, + _In_ DWORD ExeNameBufferLength); + +DWORD WINAPI GetConsoleAliasExesLengthA(VOID); +DWORD WINAPI GetConsoleAliasExesLengthW(VOID); +#endif + HANDLE WINAPI CreateConsoleScreenBuffer(_In_ DWORD, _In_ DWORD, _In_opt_ CONST SECURITY_ATTRIBUTES*, _In_ DWORD, _Reserved_ LPVOID); BOOL WINAPI FillConsoleOutputAttribute(_In_ HANDLE, _In_ WORD, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FillConsoleOutputCharacterA(_In_ HANDLE, _In_ CHAR, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FillConsoleOutputCharacterW(_In_ HANDLE, _In_ WCHAR, _In_ DWORD, _In_ COORD, _Out_ PDWORD); BOOL WINAPI FlushConsoleInputBuffer(_In_ HANDLE); -BOOL WINAPI FreeConsole(void); +BOOL WINAPI FreeConsole(VOID); BOOL WINAPI GenerateConsoleCtrlEvent(_In_ DWORD, _In_ DWORD); -UINT WINAPI GetConsoleCP(void); +UINT WINAPI GetConsoleCP(VOID); BOOL WINAPI GetConsoleCursorInfo(_In_ HANDLE, _Out_ PCONSOLE_CURSOR_INFO); BOOL WINAPI GetConsoleMode(HANDLE,PDWORD); -UINT WINAPI GetConsoleOutputCP(void); +UINT WINAPI GetConsoleOutputCP(VOID); BOOL WINAPI GetConsoleScreenBufferInfo(_In_ HANDLE, _Out_ PCONSOLE_SCREEN_BUFFER_INFO); DWORD @@ -238,7 +275,7 @@ _In_ DWORD nSize); #if (_WIN32_WINNT >= 0x0500) -HWND WINAPI GetConsoleWindow(void); +HWND WINAPI GetConsoleWindow(VOID); WINBASEAPI BOOL APIENTRY GetConsoleDisplayMode(_Out_ LPDWORD lpModeFlags); BOOL APIENTRY SetConsoleDisplayMode(_In_ HANDLE hConsoleOutput, _In_ DWORD dwFlags, _Out_opt_ PCOORD lpNewScreenBufferDimensions); #endif @@ -389,11 +426,12 @@ #define CONSOLE_WINDOWED_MODE 2 #ifdef UNICODE -#define FillConsoleOutputCharacter FillConsoleOutputCharacterW #define AddConsoleAlias AddConsoleAliasW #define GetConsoleAlias GetConsoleAliasW #define GetConsoleAliases GetConsoleAliasesW #define GetConsoleAliasesLength GetConsoleAliasesLengthW +#define GetConsoleAliasExes GetConsoleAliasExesW +#define GetConsoleAliasExesLength GetConsoleAliasExesLengthW #define GetConsoleTitle GetConsoleTitleW #define PeekConsoleInput PeekConsoleInputW #define ReadConsole ReadConsoleW @@ -405,13 +443,15 @@ #define WriteConsole WriteConsoleW #define WriteConsoleInput WriteConsoleInputW #define WriteConsoleOutput WriteConsoleOutputW +#define FillConsoleOutputCharacter FillConsoleOutputCharacterW #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW #else #define AddConsoleAlias AddConsoleAliasA -#define FillConsoleOutputCharacter FillConsoleOutputCharacterA #define GetConsoleAlias GetConsoleAliasA #define GetConsoleAliases GetConsoleAliasesA #define GetConsoleAliasesLength GetConsoleAliasesLengthA +#define GetConsoleAliasExes GetConsoleAliasExesA +#define GetConsoleAliasExesLength GetConsoleAliasExesLengthA #define GetConsoleTitle GetConsoleTitleA #define PeekConsoleInput PeekConsoleInputA #define ReadConsole ReadConsoleA @@ -423,6 +463,7 @@ #define WriteConsole WriteConsoleA #define WriteConsoleInput WriteConsoleInputA #define WriteConsoleOutput WriteConsoleOutputA +#define FillConsoleOutputCharacter FillConsoleOutputCharacterA #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA #endif

1 0

[tfaber] 58344: [NTOSKRNL:MM] - Do not assume all zeroes in PE sections that contain uninitialized data. Such sections can have other contents as well, and MiReadPage already provides zeroes for ou...
by tfaber＠svn.reactos.org 20 Feb '13

20 Feb '13

Author: tfaber Date: Wed Feb 20 21:48:05 2013 New Revision: 58344 URL: http://svn.reactos.org/svn/reactos?rev=58344&view=rev Log: [NTOSKRNL:MM] - Do not assume all zeroes in PE sections that contain uninitialized data. Such sections can have other contents as well, and MiReadPage already provides zeroes for outside-of-file data anyway CORE-6958 #resolve Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Feb 20 21:48:05 2013 @@ -677,6 +677,7 @@ pssSegments[i].Length.QuadPart = pishSectionHeaders[i].Misc.VirtualSize; pssSegments[i].Length.LowPart = ALIGN_UP_BY(pssSegments[i].Length.LowPart, nSectionAlignment); + /* FIXME: always false */ if (pssSegments[i].Length.QuadPart < pssSegments[i].Length.QuadPart) DIE(("Cannot align the virtual size of section %u\n", i)); @@ -1394,52 +1395,6 @@ } /* - * Map anonymous memory for BSS sections - */ - if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - { - /* We'll be unlocking the address space below. Prevent us from being preempted - * in faulting in the page. */ - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); - MmUnlockSectionSegment(Segment); - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - /* Remove the wait entry we placed, so that we can map the page */ - MmDeletePageFileMapping(Process, PAddress, &SwapEntry); - Status = MmCreateVirtualMapping(Process, - PAddress, - Region->Protect, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return(Status); - } - MmInsertRmap(Page, Process, Address); - - /* - * Cleanup and release locks - */ - MiSetPageEvent(Process, Address); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_SUCCESS); - } - - /* * Get the entry corresponding to the offset within the section */ Entry = MmGetPageEntrySectionSegment(Segment, &Offset); @@ -1508,7 +1463,7 @@ MmUnlockSectionSegment(Segment); MmDeletePageFileMapping(Process, PAddress, &FakeSwapEntry); - DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", + DPRINT("CreateVirtualMapping Page %x Process %p PAddress %p Attributes %x\n", Page, Process, PAddress, Attributes); Status = MmCreateVirtualMapping(Process, PAddress, @@ -2058,7 +2013,7 @@ Address); KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address); } - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(MC_USER, Page); MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); }

1 0

[hbelusca] 58343: [CONSOLE.DLL] - Add an icon. - Fix some labels in the property box and the disposition of controls in english and french resources (not in all because positions change between lan...
by hbelusca＠svn.reactos.org 19 Feb '13

19 Feb '13

Author: hbelusca Date: Tue Feb 19 00:18:37 2013 New Revision: 58343 URL: http://svn.reactos.org/svn/reactos?rev=58343&view=rev Log: [CONSOLE.DLL] - Add an icon. - Fix some labels in the property box and the disposition of controls in english and french resources (not in all because positions change between languages and I've no time synchronizing by hand all the resource files, removing the differences). Added: branches/ros-csrss/dll/cpl/console/res/ - copied from r58258, branches/ros-csrss/win32ss/user/consrv/res/ Modified: branches/ros-csrss/dll/cpl/console/console.rc branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc branches/ros-csrss/dll/cpl/console/lang/de-DE.rc branches/ros-csrss/dll/cpl/console/lang/en-US.rc branches/ros-csrss/dll/cpl/console/lang/es-ES.rc branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/lang/he-IL.rc branches/ros-csrss/dll/cpl/console/lang/id-ID.rc branches/ros-csrss/dll/cpl/console/lang/it-IT.rc branches/ros-csrss/dll/cpl/console/lang/no-NO.rc branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc branches/ros-csrss/dll/cpl/console/resource.h Modified: branches/ros-csrss/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… ============================================================================== --- branches/ros-csrss/dll/cpl/console/console.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/console.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -17,4 +17,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "console.dll\0" #include <reactos/version.rc> +IDC_CPLICON ICON DISCARDABLE "res/terminal.ico" + #include "rsrc.rc" Modified: branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°", -1, 143, 7, 130, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&ÐÑÐ¾Ð·Ð¾ÑÐµÑ", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 20, 70, 10 CONTROL "&Ð¦ÑÐ» ÐµÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 40, 70, 10 - GROUPBOX "ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ÑÐµ", -1, 7, 84, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÐ½ÐµÐ²Ð½Ð¸Ðº Ð½Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ÑÐµ", -1, 7, 85, 130, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ Ð½Ð° &Ð±ÑÑÐµÑÐ°", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -95,7 +95,7 @@ CONTROL "ÐÐºÑÐ°Ð½Ð½Ð° Ð¿Ð¾Ð´&ÑÐ²ÐµÑÐºÐ°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "ÐÐ·&ÑÐºÐ°ÑÐ°Ñ ÑÐµÐºÑÑ", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "ÐÐ·ÑÐºÐ°ÑÐ°ÑÐ° Ð¿Ð¾Ð´&ÑÐ²ÐµÑÐºÐ°", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ ÑÐ²ÐµÑÐ¾Ð²Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑÐ¸", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Ð§ÐµÑÐ²ÐµÐ½Ð¾:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ ÐµÐºÑÐ°Ð½Ð½Ð¸ ÑÐ²ÐµÑÐ¾Ð²Ðµ:", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÐ·Ð±ÑÐ°Ð½Ð¸ Ð¸Ð·ÑÐºÐ°ÑÐ°ÑÐ¸ ÑÐ²ÐµÑÐ¾Ð²Ðµ:", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -20,7 +20,7 @@ GROUPBOX "MoÅ¾nosti zobrazenÃ", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Okno", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&CelÃ¡ obrazovka", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historie pÅÃkazÅ¯", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Historie pÅÃkazÅ¯", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Velikost v&yrovnÃ¡vacÃ pamÄti:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -93,7 +93,7 @@ CONTROL "PozadÃ zo&brazenÃ", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "Text &vÃ½bÄru", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "PozadÃ vÃ½&bÄru", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ZvolenÃ© barevnÃ© hodnoty", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "Äe&rvenÃ¡:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -119,9 +119,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ZvolenÃ© barvy zobrazenÃ", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ZvolenÃ© barvy vÃ½bÄru", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -95,7 +95,7 @@ CONTROL "Fenster&hintergrund", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "&Popuptext", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Pop&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "AusgewÃ¤hlte Farbwerte", -1, 120, 15, 90, 45 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Rot:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "AusgewÃ¤hlte Fensterfarben", -1, 10, 110, 200, 40 + GROUPBOX "Fenstervorschau", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "AusgewÃ¤hlte Popupfarben", -1, 10, 155, 200, 40 + GROUPBOX "Popupvorschau", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/en-US.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Command History", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Command History", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -91,40 +91,40 @@ CAPTION "Colors" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 - LTEXT "&Red:", -1, 140, 25, 48, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 - LTEXT "&Green:", -1, 140, 42, 48, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14 - LTEXT "&Blue:", -1, 140, 60, 48, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14 - CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "Selected Color Components", -1, 105, 6, 140, 60 + LTEXT "&Red:", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "&Green:", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "&Blue:", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "Preview (Screen)", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 Modified: branches/ros-csrss/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -92,7 +92,7 @@ CONTROL "&Fondo Pantalla", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "Texto &Emergente", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Fondo E&mergente", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Valores de Color Seleccionados", -1, 120, 15, 90, 45 + GROUPBOX "Componentes de Color Seleccionados", -1, 120, 15, 90, 45 LTEXT "&Rojo:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -118,9 +118,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Colores de Pantalla Seleccionados", -1, 10, 110, 200, 40 + GROUPBOX "PrevisualizaciÃ³n (Pantalla)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Colores Emergentes Seleccionados", -1, 10, 155, 200, 40 + GROUPBOX "PrevisualizaciÃ³n (Emergente)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,14 +22,14 @@ GROUPBOX "Options d'affichage", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&FenÃªtre", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "P&lein Ã©cran", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historique des commandes", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Historique des commandes", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Taille du &buffer :", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 LTEXT "&Nombre de buffers :", -1, 14, 124, 70, 12 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "&Se dÃ©barrasser des vielles copies", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + CHECKBOX "&Supprimer les doublons", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 GROUPBOX "Options d'Ã©dition", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP CHECKBOX "M&ode d'Ã©dition rapide", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP CHECKBOX "Mode &insertion", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -83,7 +83,7 @@ CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "Laisser le systÃ¨me &positionner la fenÃªtre", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 + CHECKBOX "&PositionnÃ©e par le systÃ¨me", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 @@ -91,40 +91,40 @@ CAPTION "Couleurs" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Texte Ã l'Ã©cran", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "Fond de l'&Ã©cran", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "Texte du &popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "Fond du Pop&up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Valeurs de couleur sÃ©lÃ©ctionnÃ©es", -1, 129, 7, 118, 73 - LTEXT "&Rouge :", -1, 140, 25, 48, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 - LTEXT "&Vert :", -1, 140, 42, 48, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 39, 12, 14 - LTEXT "&Bleu :", -1, 140, 60, 48, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 56, 12, 14 - CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Couleurs de l'Ã©cran sÃ©lectionneÃ©s", -1, 7, 111, 240, 40 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Couleurs du popup sÃ©lectionneÃ©s", -1, 7, 162, 240, 40 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 + CONTROL "&Texte (Ãcran)", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 + CONTROL "Arr&iÃ¨re-plan (Ãcran)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 + CONTROL "T&exte (Popup)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 + CONTROL "ArriÃ¨re-pla&n (Popup)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 + GROUPBOX "Composantes de la couleur sÃ©lectionnÃ©e", -1, 105, 6, 140, 60 + LTEXT "&Rouge :", -1, 135, 18, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 + LTEXT "&Vert :", -1, 135, 34, 30, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 + LTEXT "&Bleu :", -1, 135, 50, 30, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + GROUPBOX "AperÃ§u (Ãcran)", -1, 8, 100, 237, 55 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + GROUPBOX "AperÃ§u (Popup)", -1, 8, 160, 237, 55 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 Modified: branches/ros-csrss/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "××¤×©×¨××××ª ×ª×¦×××", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "××××", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "××¡× ×××", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "×××¡×××¨×××ª ×¤×§××××ª:", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "×××¡×××¨×××ª ×¤×§××××ª:", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "×××× ××ª×××:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -92,11 +92,11 @@ CAPTION "×¦××¢××" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "××§×¡× ×©× ×××¡×", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 - CONTROL "×¨×§×¢ ××¡×", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 - CONTROL "××§×¡× ×©× ×××× ×§××¤×¥", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 - CONTROL "×¨×§×¢ ×©× ×××× ×§××¤×¥", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "×¢×¨×× ××¦××¢×× ×× ×××¨××", -1, 129, 7, 118, 73 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "××××:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "×¦××¢× ××¡× × ×××¨××", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "×¦××¢× ×××× ××ª ×§××¤×¦×× × ×××¨××", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -91,11 +91,11 @@ CAPTION "Warna" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Teks Layar", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 - CONTROL "Latar &Belakang Layar", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 - CONTROL "Teks &Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 - CONTROL "Latar Belakang Pop&up", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Nilai Warna Dipilih", -1, 120, 15, 90, 45 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Merah:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Warna Layar Dipilih", -1, 10, 110, 200, 40 + GROUPBOX "Preview (Screen)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Warna Popup Dipilih", -1, 10, 155, 200, 40 + GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -91,11 +91,11 @@ CAPTION "Colori" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 - CONTROL "&Sfondo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 - CONTROL "&Testo Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 - CONTROL "Sfondo Popup", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Valori dei colori", -1, 120, 15, 90, 45 + CONTROL "&Testo Schermo", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 + CONTROL "&Sfondo Schermo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 + CONTROL "T&esto Popup", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 + CONTROL "S&fondo Popup", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 + GROUPBOX "Componenti dei colori", -1, 120, 15, 90, 45 LTEXT "&Rosso:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Colori selezionati", -1, 10, 110, 200, 40 + GROUPBOX "Anteprima (Schermo)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Colori selezionati Popup", -1, 10, 155, 200, 40 + GROUPBOX "Anteprima (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -22,7 +22,7 @@ GROUPBOX "Skjerminnstillinger", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Vindu", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull skjerm", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Kommando historie", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Kommando historie", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&BufferstÃ¸rrelse:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -95,7 +95,7 @@ CONTROL "Skjerm &bakgrunn", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&Hurtigmenytekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Hurtig&menybakgrunn", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Valgte fargeverdier", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&RÃ¸d:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -121,9 +121,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Valgte skjermfarger", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Valgte hurtigmenyfarger", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -94,7 +94,7 @@ CONTROL "Ekran &tÅo", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 CONTROL "&Popup tekst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 CONTROL "Pop&up tÅo", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Wybrane wartoÅci koloru", -1, 120, 15, 90, 45 + GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 LTEXT "&Czerowny:", -1, 125, 25, 30, 10 EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 @@ -120,9 +120,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 - GROUPBOX "Wybrane kolory ekranu", -1, 10, 110, 200, 40 + GROUPBOX "Preview (Screen)", -1, 10, 110, 200, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 - GROUPBOX "Wybrane kolory Popup", -1, 10, 155, 200, 40 + GROUPBOX "Preview (Popup)", -1, 10, 155, 200, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "Mod de afiÈare", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "Ãn fe&reastrÄ", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "Pe &tot ecranul", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Istoric pentru comenzi", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Istoric pentru comenzi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "N&umÄr de Ã®nregistrÄri:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Previzionarea culorilor alese pentru ecran", -1, 7, 111, 240, 40 + GROUPBOX "Previzionare (ecran)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Previzionarea culorilor alese pentru ferestre intempestive", -1, 7, 162, 240, 40 + GROUPBOX "Previzionare (ferestre intempestive)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -16,7 +16,7 @@ GROUPBOX "ÐÐºÑÐ°Ð½", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&ÐÐºÐ½Ð¾", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&ÐÐ¾Ð»Ð½ÑÐ¹ ÑÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "ÐÑÑÐ¾ÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÑÑÐ¾ÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ°:", -1, 14, 101, 60, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -89,7 +89,7 @@ CONTROL "&Ð¤Ð¾Ð½ ÑÐºÑÐ°Ð½Ð°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&ÐÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ð¹ ÑÐµÐºÑÑ", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Ð&ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ð¹ ÑÐ¾Ð½", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÑÐ±Ð¾Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐ²ÐµÑÐ¾Ð²", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&ÐÑÐ°ÑÐ½ÑÐ¹:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -115,9 +115,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐ¹ ÑÐ²ÐµÑ ÑÐºÑÐ°Ð½Ð°", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÑÐ±ÑÐ°Ð½Ð½ÑÐµ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ðµ ÑÐ²ÐµÑÐ°", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -18,7 +18,7 @@ GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "HistÃ³ria prÃkazov", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "HistÃ³ria prÃkazov", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -91,7 +91,7 @@ CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Red:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -117,9 +117,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -23,7 +23,7 @@ GROUPBOX "ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "Ð&ÑÐºÐ½Ð¾", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "&ÐÐ° Ð²ÐµÑÑ ÐµÐºÑÐ°Ð½", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "ÐÑÑÐ½Ð°Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "ÐÑÑÐ½Ð°Ð» ÐºÐ¾Ð¼Ð°Ð½Ð´", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Ð Ð¾Ð·Ð¼ÑÑ Ð±ÑÑÐµÑÐ°:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -96,7 +96,7 @@ CONTROL "&Ð¢Ð»Ð¾ ÐµÐºÑÐ°Ð½Ð°", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "Ð¢Ðµ&ÐºÑÑ ÑÐ¿Ð»Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "Ð¢&Ð»Ð¾ ÑÐ¿Ð»Ð¸Ð²Ð½Ð¾Ð³Ð¾ Ð²ÑÐºÐ½Ð°", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "ÐÐ½Ð°ÑÐµÐ½Ð½Ñ Ð²Ð¸Ð±ÑÐ°Ð½Ð¸Ñ ÐºÐ¾Ð»ÑÐ¾ÑÑÐ²", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "&Ð§ÐµÑÐ²Ð¾Ð½Ð¸Ð¹:", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -122,9 +122,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "ÐÐ¸Ð±ÑÐ°Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑÐ¸ ÐµÐºÑÐ°Ð½Ð°", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "ÐÐ¸Ð±ÑÐ°Ð½Ñ ÑÐ¿Ð»Ð¸Ð²Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑÐ¸", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/lang/… ============================================================================== --- branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -21,7 +21,7 @@ GROUPBOX "æ¾ç¤ºéé¡¹", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "çªå£(&W)", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 CONTROL "å¨å±æ¾ç¤º(&F)", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "å½ä»¤è®°å½", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "å½ä»¤è®°å½", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "ç¼å²åºå¤§å°(&B):", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 @@ -94,7 +94,7 @@ CONTROL "å±å¹èæ¯(&B)", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 CONTROL "å¼¹åºçªå£æå(&P)", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 CONTROL "å¼¹åºçªå£èæ¯(&U)", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 - GROUPBOX "éå®çé¢è²å¼", -1, 129, 7, 118, 73 + GROUPBOX "Selected Color Components", -1, 129, 7, 118, 73 LTEXT "çº¢(&R)ï¼", -1, 140, 25, 48, 10 EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 240, 22, 12, 14 @@ -120,9 +120,9 @@ CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 - GROUPBOX "éå®çå±å¹é¢è²", -1, 7, 111, 240, 40 + GROUPBOX "Preview (Screen)", -1, 7, 111, 240, 40 CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 - GROUPBOX "éå®çå¼¹åºçªå£é¢è²", -1, 7, 162, 240, 40 + GROUPBOX "Preview (Popup)", -1, 7, 162, 240, 40 CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END Modified: branches/ros-csrss/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/resou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/resource.h [iso-8859-1] Tue Feb 19 00:18:37 2013 @@ -3,7 +3,7 @@ #define IDC_CPLICON 40 #define IDS_CPLNAME 41 #define IDS_CPLDESCRIPTION 42 -#define IDS_APPLY_SHORTCUT_ALL 43 +#define IDS_APPLY_SHORTCUT_ALL 43 #define IDD_PROPPAGEOPTIONS 100 #define IDD_PROPPAGEFONT 101

1 0

[ekohl] 58342: [MSGINA] - Display logon information in the security dialog. - Fix font in japanese dialogs.
by ekohl＠svn.reactos.org 18 Feb '13

18 Feb '13

Author: ekohl Date: Mon Feb 18 23:16:39 2013 New Revision: 58342 URL: http://svn.reactos.org/svn/reactos?rev=58342&view=rev Log: [MSGINA] - Display logon information in the security dialog. - Fix font in japanese dialogs. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -217,6 +217,35 @@ return TRUE; } +static VOID +OnInitSecurityDlg(HWND hwnd, + PGINA_CONTEXT pgContext) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + WCHAR Buffer3[256]; + WCHAR Buffer4[512]; + + LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, 256); + + wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer4, Buffer1, Buffer2); + + SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4); + + LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, 256); + + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer2, 256); + + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer3, 256); + + wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); + + SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); +} + static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, @@ -224,10 +253,15 @@ IN WPARAM wParam, IN LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) { + case WM_INITDIALOG: + { + OnInitSecurityDlg(hwndDlg, (PGINA_CONTEXT)lParam); + SetFocus(GetDlgItem(hwndDlg, IDNO)); + return TRUE; + } + case WM_COMMAND: { switch (LOWORD(wParam)) @@ -249,11 +283,6 @@ return TRUE; } break; - } - case WM_INITDIALOG: - { - SetFocus(GetDlgItem(hwndDlg, IDNO)); - return TRUE; } case WM_CLOSE: { @@ -416,8 +445,7 @@ static VOID OnInitLockedDlg(HWND hwnd, - PGINA_CONTEXT pgContext, - UINT id) + PGINA_CONTEXT pgContext) { WCHAR Buffer1[256]; WCHAR Buffer2[256]; @@ -428,7 +456,7 @@ wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); wsprintfW(Buffer3, Buffer1, Buffer2); - SetWindowTextW(GetDlgItem(hwnd, id), Buffer3); + SetDlgItemTextW(hwnd, IDC_LOCKMSG, Buffer3); } @@ -451,7 +479,7 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - OnInitLockedDlg(hwndDlg, pgContext, IDC_LOCKMSG); + OnInitLockedDlg(hwndDlg, pgContext); return TRUE; } case WM_PAINT: Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ÐÐ°ÐºÐ²Ð¾ Ð¶ÐµÐ»Ð°ÐµÑÐµ?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,95,99,14 - PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,76,75,14 - PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,170,76,75,14 - PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»",IDC_TASKMGR,10,76,75,14 - PUSHBUTTON "ÐÑÐºÐ°Ð·",IDCANCEL,130,95,99,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ÐÐ°ÐºÐ²Ð¾ Ð¶ÐµÐ»Ð°ÐµÑÐµ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,154,99,14 + PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,135,75,14 + PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,170,135,75,14 + PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»",IDC_TASKMGR,10,135,75,14 + PUSHBUTTON "ÐÑÐºÐ°Ð·",IDCANCEL,130,154,99,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ð°: " IDS_FORCELOGOFF "Ð¢Ð°ÐºÐ° ÑÐµÐºÑÑÐ¸ÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» ÑÐµ Ð¸Ð·Ð»ÐµÐ·Ðµ Ð¸ ÑÐµ Ð¸Ð·Ð³ÑÐ±Ð¸ Ð²ÑÐ¸ÑÐºÐ¸ Ð½ÐµÑÑÑÑÐ°Ð½ÐµÐ½Ð¸ Ð´Ð°Ð½Ð½Ð¸. ÐÐ° Ð¿ÑÐ¾Ð´ÑÐ»Ð¶Ð° Ð»Ð¸?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." -END + IDS_LOGONDATE "Logon date: %s %s" + END Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -39,18 +39,21 @@ PUSHBUTTON "Vypnout",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpeÄnost" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Co chcete udÄlat?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,76,70,14 - PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "SprÃ¡vce Ãºloh",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Storno",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Co chcete udÄlat?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,135,70,14 + PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "SprÃ¡vce Ãºloh",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Storno",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -91,4 +94,5 @@ IDS_ASKFORPASSWORD "Heslo: " IDS_FORCELOGOFF "SouÄasnÃ½ uÅ¾ivatel bude odhlÃ¡Å¡en a vÅ¡echna jeho neuloÅ¾enÃ¡ data ztracena. PokraÄovat?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicherheit" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Was wollen Sie tun?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Computer sperren",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Abmelden",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Taskmanager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Abbrechen",IDCANCEL,170,95,70,14 + GROUPBOX "Anmeldeinformation",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Was wollen Sie tun?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Computer sperren",IDC_LOCK,10,135,76,14 + PUSHBUTTON "Abmelden",IDC_LOGOFF,100,135,75,14 + PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Taskmanager",IDC_TASKMGR,100,154,75,14 + PUSHBUTTON "Abbrechen",IDCANCEL,189,154,76,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Passwort: " IDS_FORCELOGOFF "Dies wird den derzeitigen Benutzer abmelden. Alle ungespeicherten Daten gehen verloren. Fortsetzen?" IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren." + IDS_LOGONDATE "Anmeldedatum: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Security" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "What do you want to do?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Log off",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Shutdown",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Cancel",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "What do you want to do?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Lock computer",IDC_LOCK,10,135,76,14 + PUSHBUTTON "Log off",IDC_LOGOFF,100,135,75,14 + PUSHBUTTON "Shutdown",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,100,154,75,14 + PUSHBUTTON "Cancel",IDCANCEL,189,154,76,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,6 @@ IDS_ASKFORPASSWORD "Password: " IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONMSG "You are logged on as %s." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -38,18 +38,21 @@ PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Seguridad" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Â¿QuÃ© quieres hacer?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14 - PUSHBUTTON "Salir",IDC_LOGOFF, 92, 76, 88, 14 - PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186, 76, 70, 14 - PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92, 95, 88, 14 - PUSHBUTTON "Cancelar",IDCANCEL, 186, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Â¿QuÃ© quieres hacer?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4,135, 83, 14 + PUSHBUTTON "Salir",IDC_LOGOFF, 92,135, 88, 14 + PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186,135, 70, 14 + PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92,154, 88, 14 + PUSHBUTTON "Cancelar",IDCANCEL, 186,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -90,4 +93,5 @@ IDS_ASKFORPASSWORD "ContraseÃ±a: " IDS_FORCELOGOFF "Esto cerrarÃ¡ al usuario actual y perderÃ¡ todos los datos no guardados. Â¿Desea Continuar?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "SÃ©curitÃ©" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Que voulez-vous faire ?",IDC_STATIC, 94, 60, 87, 8 - PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14 - PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93, 76, 85, 14 - PUSHBUTTON "Ãteindre",IDC_SHUTDOWN, 184, 76, 70, 14 - PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR, 93, 95, 85, 14 - PUSHBUTTON "Annuler",IDCANCEL, 184, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Que voulez-vous faire ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4,135, 82, 14 + PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93,135, 85, 14 + PUSHBUTTON "Ãteindre",IDC_SHUTDOWN, 184,135, 70, 14 + PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR, 93,154, 85, 14 + PUSHBUTTON "Annuler",IDCANCEL, 184,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Mot de passe : " IDS_FORCELOGOFF "Cela dÃ©connectera l'utilisateur en cours et perdra les donnÃ©es non sauvÃ©es. Continuer ?" IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut dÃ©verrouiller cet ordinateur." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "×××××",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "×××××" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "×× ××¨×¦×× × ××¢×©××ª?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "×× ×¢×× ××ª ××××©×",IDC_LOCK,10,76,70,14 - PUSHBUTTON "×××ª× ×ª×§",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "×××××ª",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "×× ×× ×××©××××ª",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "×××××",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "×× ××¨×¦×× × ××¢×©××ª?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "×× ×¢×× ××ª ××××©×",IDC_LOCK,10,135,70,14 + PUSHBUTTON "×××ª× ×ª×§",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "×××××ª",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "×× ×× ×××©××××ª",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "×××××",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "×¡××¡××: " IDS_FORCELOGOFF "×× ×××¨×× ×××ª× ×ª×§××ª ×××©×ª××© ×× ×××× ××××× ××ª ×× ×××××¢ ×©××× × × ×©××¨. ××××©××?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Matikan",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Keamanan" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Kunci komputer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Keluar",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Batal",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Kunci komputer",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Keluar",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Batal",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Kata sandi: " IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan. Lanjutkan?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Sicurezza" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Task manager",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Annulla",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Cosa volete fare?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Task manager",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Annulla",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "Password: " IDS_FORCELOGOFF "VerrÃ terminata la sessione dell'utente attuale e tutti i dati non salvati verranno persi. Volete procedere?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,24 +33,27 @@ PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ã»ãã¥ãªãã£" FONT 9, "MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ä½ããã¾ãã?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,76,70,14 - PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ä½ããã¾ãã?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,135,70,14 + PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Computer Locked" -FONT 8,"MS Shell Dlg",400,0,1 +FONT 9,"MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 @@ -62,7 +65,7 @@ IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Unlock Computer" -FONT 8,"MS Shell Dlg",400,0,1 +FONT 9,"MS UI Gothic",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "ãã¹ã¯ã¼ã: " IDS_FORCELOGOFF "ç¾å¨ã®ã¦ã¼ã¶ã¼ããã°ã¢ã¦ããã¾ããä¿åããã¦ããªããã¼ã¿ã¯ãã¹ã¦å¤±ããã¾ãã ç¶è¡ãã¾ãã?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -33,18 +33,21 @@ PUSHBUTTON "Avslutt",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS-sikkerhet" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Hva vil du gjÃ¸re?",IDC_STATIC, 92, 60, 87, 8 - PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 76, 74, 14 - PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 76, 78, 14 - PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 76, 70, 14 - PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 95, 78, 14 - PUSHBUTTON "Avbryt",IDCANCEL, 170, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Hva vil du gjÃ¸re?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 135, 74, 14 + PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 135, 78, 14 + PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 135, 70, 14 + PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 154, 78, 14 + PUSHBUTTON "Avbryt",IDCANCEL, 170, 154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -85,4 +88,5 @@ IDS_ASKFORPASSWORD "Passord: " IDS_FORCELOGOFF "Dette vil logge av gjeldende bruker, alle ulagrede data vil gÃ¥ tapt. Fortsette?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpieczeÅstwo" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Co chcesz teraz zrobiÄ?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "Blokada komputera",IDC_LOCK,10,76,70,14 - PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "MenedÅ¼er zadaÅ",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "Anuluj",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Co chcesz teraz zrobiÄ?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "Blokada komputera",IDC_LOCK,10,135,70,14 + PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "MenedÅ¼er zadaÅ",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "Anuluj",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "HasÅo: " IDS_FORCELOGOFF "To wyloguje aktualnego uÅ¼ytkownika i straci on wszystkie niezapisane dane. KontynuowaÄ?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -34,18 +34,21 @@ PUSHBUTTON "&OpreÈte", IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Securitate" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Ce acÈiune preferaÈi?", IDC_STATIC,86,60,87,8 - PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,76,70,14 - PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "Ãnchid&ere calculatorul", IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "Gestionar de &activitÄÈi", IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Ce acÈiune preferaÈi?", IDC_STATIC,10,119,255,8 + PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,135,70,14 + PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "Ãnchid&ere calculatorul", IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Gestionar de &activitÄÈi", IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -86,4 +89,5 @@ IDS_ASKFORPASSWORD "ParolÄ: " IDS_FORCELOGOFF "AceastÄ acÈiune va deautentifica utilizatorului curent cu posibile pierderi ale datelor nepÄstrate. ContinuaÈi?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -35,18 +35,21 @@ PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 171, 122, 58, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC, 7, 60, 123, 8 - PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7, 76, 86, 14 - PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102, 76, 86, 14 - PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ",IDC_SHUTDOWN, 198, 76, 70, 14 - PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ",IDC_TASKMGR, 102, 95, 86, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198, 95, 70, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7,135, 86, 14 + PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102,135, 86, 14 + PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ",IDC_SHUTDOWN, 198,135, 70, 14 + PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ",IDC_TASKMGR, 102,154, 86, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198,154, 70, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -87,4 +90,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ñ: " IDS_FORCELOGOFF "ÐÑÐ¸ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð²ÑÐµ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð±ÑÐ´ÑÑ ÑÑÐµÑÑÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -38,18 +38,21 @@ PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "BezpeÄnosÅ¥" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,86,60,87,8 - PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,76,70,14 - PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,76,70,14 - PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,76,70,14 - PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,95,70,14 - PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,95,70,14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,135,70,14 + PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,135,70,14 + PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,154,70,14 + PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,154,70,14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -90,4 +93,5 @@ IDS_ASKFORPASSWORD "Heslo: " IDS_FORCELOGOFF "Toto spÃ´sobÃ odhlÃ¡senie aktuÃ¡lneho pouÅ¾ÃvateÄ¾a a stratu vÅ¡etkÃ½ch neuloÅ¾enÃ½ch Ãºdajov. Chcete pokraÄovaÅ¥?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -41,18 +41,21 @@ PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN,148, 122, 86, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐµÐ·Ð¿ÐµÐºÐ°" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - LTEXT "Ð©Ð¾ ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð·ÑÐ¾Ð±Ð¸ÑÐ¸?",IDC_STATIC, 86, 60, 87, 8 - PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6, 76, 70, 14 - PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80, 76, 80, 14 - PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN, 165, 76, 86, 14 - PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ",IDC_TASKMGR, 80, 95, 80, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL, 165, 95, 86, 14 + GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 + LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + CTEXT "Ð©Ð¾ ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð·ÑÐ¾Ð±Ð¸ÑÐ¸?",IDC_STATIC,10,119,255,8 + PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6,135, 70, 14 + PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80,135, 80, 14 + PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN, 165,135, 86, 14 + PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ",IDC_TASKMGR, 80,154, 80, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL, 165,154, 86, 14 END IDD_LOCKED_DLG DIALOGEX 0,0,275,121 @@ -93,4 +96,5 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ñ: " IDS_FORCELOGOFF "Ð¦Ðµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ ÑÐµÐ°Ð½Ñ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ñ Ð²ÑÑ Ð½ÐµÐ·Ð±ÐµÑÐµÐ¶ÐµÐ½Ñ Ð´Ð°Ð½Ñ Ð±ÑÐ´ÑÑÑ Ð·Ð°Ð³ÑÐ±Ð»ÐµÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." + IDS_LOGONDATE "Logon date: %s %s" END Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -428,6 +428,9 @@ goto cleanup; } + /* Store the logon time in the context */ + GetLocalTime(&pgContext->LogonTime); + /* Store user and domain in the context */ wcscpy(pgContext->UserName, UserName); if (Domain == NULL || wcslen(Domain) == 0) Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -6,6 +6,7 @@ #include <wincon.h> #include <winreg.h> #include <wingdi.h> +#include <winnls.h> #include <winsvc.h> #include <winuser.h> #include <userenv.h> @@ -31,6 +32,7 @@ /* Informations to be filled during logon */ WCHAR UserName[256]; WCHAR Domain[256]; + SYSTEMTIME LogonTime; HANDLE UserToken; PLUID pAuthenticationId; PDWORD pdwOptions; Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Mon Feb 18 23:16:39 2013 @@ -17,6 +17,8 @@ #define IDC_ROSLOGO 1007 #define IDC_TASKMGR 1008 #define IDC_LOCKMSG 1009 +#define IDC_LOGONMSG 1010 +#define IDC_LOGONDATE 1011 #define IDI_ROSLOGO 20000 @@ -29,5 +31,7 @@ #define IDS_ASKFORPASSWORD 40004 #define IDS_FORCELOGOFF 40005 #define IDS_LOCKMSG 40006 +#define IDS_LOGONMSG 40007 +#define IDS_LOGONDATE 40008 /* EOF */

1 0

[tkreuzer] 58341: [FREELDR] Implement HeapVerify(), fix a buffer overrun. CORE-6893 #resolve
by tkreuzer＠svn.reactos.org 18 Feb '13

18 Feb '13

Author: tkreuzer Date: Mon Feb 18 20:09:50 2013 New Revision: 58341 URL: http://svn.reactos.org/svn/reactos?rev=58341&view=rev Log: [FREELDR] Implement HeapVerify(), fix a buffer overrun. CORE-6893 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/mm/heap.c Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -133,6 +133,10 @@ PVOID HeapHandle); VOID +HeapVerify( + PVOID HeapHandle); + +VOID HeapCleanupAll(VOID); PVOID Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -190,7 +190,7 @@ RtlZeroMemory(Section, sizeof(INI_SECTION)); // Allocate the section name buffer - Section->SectionName = MmHeapAlloc(strlen(SectionName)); + Section->SectionName = MmHeapAlloc(strlen(SectionName) + sizeof(CHAR)); if (!Section->SectionName) { MmHeapFree(Section); Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Mon Feb 18 20:09:50 2013 @@ -149,6 +149,32 @@ LoaderFirmwareTemporary); } +#ifdef FREELDR_HEAP_VERIFIER +VOID +HeapVerify( + PVOID HeapHandle) +{ + PHEAP Heap = HeapHandle; + PHEAP_BLOCK Block; + + /* Loop all heap chunks */ + for (Block = &Heap->Blocks; + Block->Size != 0; + Block = Block + 1 + Block->Size) + { + /* Continue, if its not free */ + if (Block->Tag != 0) + { + /* Verify size and redzones */ + ASSERT(*REDZONE_SIZE(Block) <= Block->Size * sizeof(HEAP_BLOCK)); + ASSERT(*REDZONE_LOW(Block) == REDZONE_MARK); + ASSERT(*REDZONE_HI(Block) == REDZONE_MARK); + continue; + } + } +} +#endif /* FREELDR_HEAP_VERIFIER */ + VOID HeapRelease( PVOID HeapHandle) @@ -296,6 +322,9 @@ ULONGLONG Time = __rdtsc(); #ifdef FREELDR_HEAP_VERIFIER + /* Verify the heap */ + HeapVerify(HeapHandle); + /* Add space for a size field and 2 redzones */ ByteSize += REDZONE_ALLOCATION; #endif @@ -408,6 +437,11 @@ TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); ASSERT(Tag != 'dnE#'); +#ifdef FREELDR_HEAP_VERIFIER + /* Verify the heap */ + HeapVerify(HeapHandle); +#endif + /* Check if the block is really inside this heap */ if ((Pointer < (PVOID)(Heap + 1)) || (Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize)))

1 0

[tkreuzer] 58340: [WLANCONF] Fix a bug, I introduced.
by tkreuzer＠svn.reactos.org 17 Feb '13

17 Feb '13

Author: tkreuzer Date: Sun Feb 17 19:08:39 2013 New Revision: 58340 URL: http://svn.reactos.org/svn/reactos?rev=58340&view=rev Log: [WLANCONF] Fix a bug, I introduced. Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 19:08:39 2013 @@ -562,6 +562,7 @@ BOOL WlanConnect(HANDLE hAdapter) { + CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; BOOL bSuccess; DWORD dwBytesReturned, SetOidSize; PNDISUIO_SET_OID SetOid; @@ -706,8 +707,9 @@ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - RtlCopyMemory(Ssid->Ssid, sSsid, wcslen(sSsid)); - Ssid->SsidLength = wcslen(sSsid); + snprintf(SsidBuffer, sizeof(SsidBuffer), "%S", sSsid); + RtlCopyMemory(Ssid->Ssid, SsidBuffer, strlen(SsidBuffer)); + Ssid->SsidLength = strlen(SsidBuffer); bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE,

1 0

[tkreuzer] 58339: [WLANCONF] - Convert to UNICODE - rewrite CharToHex()
by tkreuzer＠svn.reactos.org 17 Feb '13

17 Feb '13

Author: tkreuzer Date: Sun Feb 17 18:48:59 2013 New Revision: 58339 URL: http://svn.reactos.org/svn/reactos?rev=58339&view=rev Log: [WLANCONF] - Convert to UNICODE - rewrite CharToHex() Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 18:48:59 2013 @@ -25,8 +25,8 @@ BOOL bScan = FALSE; BOOL bConnect = FALSE; -char *sSsid = NULL; -char *sWepKey = NULL; +WCHAR *sSsid = NULL; +WCHAR *sWepKey = NULL; BOOL bAdhoc = FALSE; BOOL bDisconnect = FALSE; @@ -35,12 +35,12 @@ the command prompt. */ VOID PrintResourceString(INT resID, ...) { - TCHAR szMsgBuf[MAX_BUFFER_SIZE]; + WCHAR szMsgBuf[MAX_BUFFER_SIZE]; va_list arg_ptr; va_start(arg_ptr, resID); - LoadString(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); - _vtprintf(szMsgBuf, arg_ptr); + LoadStringW(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); + vwprintf(szMsgBuf, arg_ptr); va_end(arg_ptr); } @@ -49,22 +49,22 @@ LPVOID lpMsgBuf; DWORD RetVal; - if ((RetVal = FormatMessage( + if ((RetVal = FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, + (LPWSTR) &lpMsgBuf, 0, NULL ))) { - _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + printf("%S", (LPWSTR)lpMsgBuf); LocalFree(lpMsgBuf); - /* return number of TCHAR's stored in output buffer + /* return number of WCHAR's stored in output buffer * excluding '\0' - as FormatMessage does*/ return RetVal; } @@ -285,47 +285,18 @@ static UCHAR -CharToHex(CHAR Char) -{ - Char = toupper(Char); - - switch (Char) - { - case '0': - return 0x0; - case '1': - return 0x1; - case '2': - return 0x2; - case '3': - return 0x3; - case '4': - return 0x4; - case '5': - return 0x5; - case '6': - return 0x6; - case '7': - return 0x7; - case '8': - return 0x8; - case '9': - return 0x9; - case 'A': - return 0xA; - case 'B': - return 0xB; - case 'C': - return 0xC; - case 'D': - return 0xD; - case 'E': - return 0xE; - case 'F': - return 0xF; - default: - return 0; - } +CharToHex(WCHAR Char) +{ + if ((Char >= L'0') && (Char <= L'9')) + return Char - L'0'; + + if ((Char >= L'a') && (Char <= L'f')) + return Char - L'a' + 10; + + if ((Char >= L'A') && (Char <= L'F')) + return Char - L'A' + 10; + + return 0; } BOOL @@ -338,7 +309,7 @@ PNDIS_802_11_SSID SsidInfo; CHAR SsidBuffer[NDIS_802_11_LENGTH_SSID + 1]; DWORD i; - TCHAR szMsgBuf[128]; + WCHAR szMsgBuf[128]; QueryOidSize = FIELD_OFFSET(NDISUIO_QUERY_OID, Data) + sizeof(NDIS_802_11_SSID); QueryOid = HeapAlloc(GetProcessHeap(), 0, QueryOidSize); @@ -393,19 +364,19 @@ PrintResourceString(IDS_MSG_CURRENT_WIRELESS); } - _tprintf(_T("SSID: %hs\n"), SsidBuffer); - - _tprintf(_T("BSSID: ")); + printf("SSID: %s\n", SsidBuffer); + + printf("BSSID: "); for (i = 0; i < sizeof(NDIS_802_11_MAC_ADDRESS); i++) { UINT BssidData = QueryOid->Data[i]; - _tprintf(_T("%.2x"), BssidData); + printf("%.2x", BssidData); if (i != sizeof(NDIS_802_11_MAC_ADDRESS) - 1) - _tprintf(_T(":")); - } - _tprintf(_T("\n")); + printf(":"); + } + printf("\n"); HeapFree(GetProcessHeap(), 0, QueryOid); QueryOidSize = sizeof(NDISUIO_QUERY_OID); @@ -429,10 +400,10 @@ return FALSE; } - LoadString(GetModuleHandle(NULL), - *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_NETWORK_MODE, szMsgBuf); QueryOid->Oid = OID_802_11_WEP_STATUS; @@ -451,13 +422,13 @@ return FALSE; } - LoadString(GetModuleHandle(NULL), - *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + *(PUINT)QueryOid->Data == Ndis802_11WEPEnabled ? IDS_YES : IDS_NO, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_WEP_ENABLED, szMsgBuf); - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_RSSI; bSuccess = DeviceIoControl(hAdapter, @@ -471,7 +442,7 @@ if (bSuccess) { /* This OID is optional */ - _tprintf(_T("RSSI: %i dBm\n"), *(PINT)QueryOid->Data); + printf("RSSI: %i dBm\n", *(PINT)QueryOid->Data); } QueryOid->Oid = OID_802_11_TX_POWER_LEVEL; @@ -490,7 +461,7 @@ PrintResourceString(IDS_MSG_TRANSMISSION_POWER, *(PUINT)QueryOid->Data); } - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_NUMBER_OF_ANTENNAS; @@ -548,7 +519,7 @@ PrintResourceString(IDS_MSG_RECEIVE_ANTENNA_ANY); } - _tprintf(_T("\n")); + printf("\n"); QueryOid->Oid = OID_802_11_FRAGMENTATION_THRESHOLD; @@ -584,7 +555,7 @@ HeapFree(GetProcessHeap(), 0, QueryOid); - _tprintf(_T("\n")); + printf("\n"); return TRUE; } @@ -646,7 +617,7 @@ SetOidSize = FIELD_OFFSET(NDISUIO_SET_OID, Data) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + - (strlen(sWepKey) >> 1); + (wcslen(sWepKey) >> 1); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); if (!SetOid) return FALSE; @@ -656,7 +627,7 @@ WepData = (PNDIS_802_11_WEP)SetOid->Data; WepData->KeyIndex = 0x80000000; - WepData->KeyLength = strlen(sWepKey) >> 1; + WepData->KeyLength = wcslen(sWepKey) >> 1; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; /* Assemble the hex key */ @@ -735,8 +706,8 @@ SetOid->Oid = OID_802_11_SSID; Ssid = (PNDIS_802_11_SSID)SetOid->Data; - RtlCopyMemory(Ssid->Ssid, sSsid, strlen(sSsid)); - Ssid->SsidLength = strlen(sSsid); + RtlCopyMemory(Ssid->Ssid, sSsid, wcslen(sSsid)); + Ssid->SsidLength = wcslen(sSsid); bSuccess = DeviceIoControl(hAdapter, IOCTL_NDISUIO_SET_OID_VALUE, @@ -766,7 +737,7 @@ DWORD QueryOidSize; PNDIS_802_11_BSSID_LIST BssidList; DWORD i, j; - TCHAR szMsgBuf[128]; + WCHAR szMsgBuf[128]; SetOid.Oid = OID_802_11_BSSID_LIST_SCAN; @@ -824,29 +795,29 @@ RtlCopyMemory(SsidBuffer, Ssid->Ssid, Ssid->SsidLength); SsidBuffer[Ssid->SsidLength] = 0; - _tprintf(_T("\nSSID: %hs\n"), SsidBuffer); - - _tprintf(_T("BSSID: ")); + printf("\nSSID: %s\n", SsidBuffer); + + printf("BSSID: "); for (j = 0; j < sizeof(NDIS_802_11_MAC_ADDRESS); j++) { UINT BssidData = BssidInfo->MacAddress[j]; - _tprintf(_T("%.2x"), BssidData); + printf("%.2x", BssidData); if (j != sizeof(NDIS_802_11_MAC_ADDRESS) - 1) - _tprintf(_T(":")); + printf(":"); } - _tprintf(_T("\n")); - - LoadString(GetModuleHandle(NULL), - BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, - szMsgBuf, - COUNT_OF(szMsgBuf)); + printf("\n"); + + LoadStringW(GetModuleHandle(NULL), + BssidInfo->Privacy == 0 ? IDS_NO : IDS_YES, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_ENCRYPTED, szMsgBuf); - LoadString(GetModuleHandle(NULL), - NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, - szMsgBuf, - COUNT_OF(szMsgBuf)); + LoadStringW(GetModuleHandle(NULL), + NetworkType == Ndis802_11IBSS ? IDS_ADHOC : IDS_INFRASTRUCTURE, + szMsgBuf, + COUNT_OF(szMsgBuf)); PrintResourceString(IDS_MSG_NETWORK_TYPE, szMsgBuf); PrintResourceString(IDS_MSG_RSSI, (int)Rssi); PrintResourceString(IDS_MSG_SUPPORT_RATE); @@ -863,16 +834,16 @@ if (Rate & 0x01) { /* Bit 0 is set so we need to add 0.5 */ - _tprintf(_T("%u.5 "), (Rate >> 1)); + printf("%u.5 ", (Rate >> 1)); } else { /* Bit 0 is clear so just print the conversion */ - _tprintf(_T("%u "), (Rate >> 1)); + printf("%u ", (Rate >> 1)); } } } - _tprintf(_T("\n")); + printf("\n"); /* Move to the next entry */ BssidInfo = (PNDIS_WLAN_BSSID)((PUCHAR)BssidInfo + BssidInfo->Length); @@ -884,23 +855,23 @@ return bSuccess; } -BOOL ParseCmdline(int argc, char *argv[]) +BOOL ParseCmdline(int argc, WCHAR *argv[]) { INT i; for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') + if (argv[i][0] == L'-') { switch (argv[i][1]) { - case 's': + case L's': bScan = TRUE; break; - case 'd': + case L'd': bDisconnect = TRUE; break; - case 'c': + case L'c': if (i == argc - 1) { PrintResourceString(IDS_USAGE); @@ -909,7 +880,7 @@ bConnect = TRUE; sSsid = argv[++i]; break; - case 'w': + case L'w': if (i == argc - 1) { PrintResourceString(IDS_USAGE); @@ -917,7 +888,7 @@ } sWepKey = argv[++i]; break; - case 'a': + case L'a': bAdhoc = TRUE; break; default : @@ -936,7 +907,7 @@ return TRUE; } -int _tmain(int argc, char *argv[]) +int wmain(int argc, WCHAR *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo;

1 0

[tkreuzer] 58338: [WLANCONF] Compile as UNICODE.
by tkreuzer＠svn.reactos.org 17 Feb '13

17 Feb '13

Author: tkreuzer Date: Sun Feb 17 18:11:16 2013 New Revision: 58338 URL: http://svn.reactos.org/svn/reactos?rev=58338&view=rev Log: [WLANCONF] Compile as UNICODE. Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt trunk/reactos/base/applications/network/wlanconf/wlanconf.c Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Sun Feb 17 18:11:16 2013 @@ -4,12 +4,6 @@ ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio) add_executable(wlanconf wlanconf.c wlanconf.rc) -# FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(NOT MSVC) - #add_target_compile_flags(wlanconf "-Wno-format") - set_source_files_properties(wlanconf.c PROPERTIES COMPILE_FLAGS "-Wno-format") -endif() - -set_module_type(wlanconf win32cui) +set_module_type(wlanconf win32cui UNICODE) add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.c [iso-8859-1] Sun Feb 17 18:11:16 2013 @@ -936,7 +936,7 @@ return TRUE; } -int main(int argc, char *argv[]) +int _tmain(int argc, char *argv[]) { HANDLE hAdapter; IP_ADAPTER_INDEX_MAP IpInfo;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs