Ros-diffs March 2013

ros-diffs@reactos.org

14 participants
249 discussions

[ekohl] 58421: [LSASRV] - Add authentication package loader code. - Load registered authentication packages before the rpc server is started.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 3 19:43:33 2013 New Revision: 58421 URL: http://svn.reactos.org/svn/reactos?rev=58421&view=rev Log: [LSASRV] - Add authentication package loader code. - Load registered authentication packages before the rpc server is started. Added: trunk/reactos/dll/win32/lsasrv/authpackage.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -8,6 +8,7 @@ spec2def(lsasrv.dll lsasrv.spec ADD_IMPORTLIB) list(APPEND SOURCE + authpackage.c authport.c database.c lookup.c Added: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c (added) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -1,0 +1,147 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/authpackage.c + * PURPOSE: Authenticaton package management routines + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + + +typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PVOID /*PLSA_DISPATCH_TABLE*/, + PLSA_STRING, PLSA_STRING, PLSA_STRING *); + +typedef struct _AUTH_PACKAGE +{ + LIST_ENTRY Entry; + PSTRING Name; + PVOID ModuleHandle; + + PLSA_AP_INITIALIZE_PACKAGE LsaApInitializePackage; +// PLSA_AP_CALL_PACKAGE LsaApCallPackage; +// PLSA_AP_CALL_PACKAGE_UNTRUSTED LsaApCallPackageUntrusted; +// PLSA_AP_LOGON_TERMINATED LsaApLogonTerminated; +// PLSA_AP_LOGON_USER_EX2 LsaApLogonUserEx2; +// PLSA_AP_LOGON_USER_EX LsaApLogonUserEx; +// PLSA_AP_LOGON_USER LsaApLogonUser; +} AUTH_PACKAGE, *PAUTH_PACKAGE; + +/* GLOBALS *****************************************************************/ + +static LIST_ENTRY PackageListHead; +static ULONG PackageId; + +/* FUNCTIONS ***************************************************************/ + +static +NTSTATUS +NTAPI +LsapAddAuthPackage(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PAUTH_PACKAGE Package = NULL; + UNICODE_STRING PackageName; + STRING ProcName; + PULONG Id; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("LsapAddAuthPackage()\n"); + + PackageName.Length = (USHORT)ValueLength - sizeof(WCHAR); + PackageName.MaximumLength = (USHORT)ValueLength; + PackageName.Buffer = ValueData; + + Id = (PULONG)Context; + + Package = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(AUTH_PACKAGE)); + if (Package == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = LdrLoadDll(NULL, + NULL, + &PackageName, + &Package->ModuleHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrLoadDll failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitAnsiString(&ProcName, "LsaApInitializePackage"); + Status = LdrGetProcedureAddress(Package->ModuleHandle, + &ProcName, + 0, + (PVOID *)&Package->LsaApInitializePackage); + if (!NT_SUCCESS(Status)) + { + TRACE("LdrGetProcedureAddress() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = Package->LsaApInitializePackage(*Id, + NULL, + NULL, + NULL, + &Package->Name); + if (!NT_SUCCESS(Status)) + { + TRACE("Package->LsaApInitializePackage() failed (Status 0x%08lx)\n", Status); + goto done; + } + + *Id++; + + InsertTailList(&PackageListHead, &Package->Entry); + +done: + if (!NT_SUCCESS(Status)) + { + if (Package != NULL) + { + if (Package->ModuleHandle != NULL) + LdrUnloadDll(Package->ModuleHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, Package); + } + } + + return Status; +} + + +NTSTATUS +LsapInitAuthPackages(VOID) +{ + RTL_QUERY_REGISTRY_TABLE AuthPackageTable[] = { + {LsapAddAuthPackage, 0, L"Authentication Packages", NULL, REG_NONE, NULL, 0}, + {NULL, 0, NULL, NULL, REG_NONE, NULL, 0}}; + + NTSTATUS Status; + + InitializeListHead(&PackageListHead); + PackageId = 0; + + /* Add registered authentication packages */ + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"Lsa", + AuthPackageTable, + &PackageId, + NULL); + + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/authpackage.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/authpackage.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -20,6 +20,7 @@ { HANDLE hEvent; DWORD dwError; + NTSTATUS Status; TRACE("LsapInitLsa() called\n"); @@ -28,6 +29,22 @@ /* Initialize the LSA database */ LsapInitDatabase(); + + /* Initialize registered authentication packages */ + Status = LsapInitAuthPackages(); + if (!NT_SUCCESS(Status)) + { + ERR("LsapInitAuthPackages() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Start the authentication port thread */ + Status = StartAuthenticationPort(); + if (!NT_SUCCESS(Status)) + { + ERR("StartAuthenticationPort() failed (Status 0x%08lx)\n", Status); + return Status; + } /* Start the RPC server */ LsarStartRpcServer(); @@ -61,8 +78,6 @@ /* NOTE: Do not close the event handle!!!! */ - StartAuthenticationPort(); - return STATUS_SUCCESS; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Mar 3 19:43:33 2013 @@ -19,10 +19,12 @@ #include <ndk/kefuncs.h> #include <ndk/lpctypes.h> #include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> +#include <ndk/umfuncs.h> #include <ntsam.h> #include <ntlsa.h> @@ -79,6 +81,9 @@ extern PSID AccountDomainSid; extern UNICODE_STRING AccountDomainName; +/* authpackage.c */ +NTSTATUS +LsapInitAuthPackages(VOID); /* authport.c */ NTSTATUS

11 years, 9 months

[ekohl] 58420: [MSV1_0] Add authentication package stub and add it to the registry.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 3 19:11:22 2013 New Revision: 58420 URL: http://svn.reactos.org/svn/reactos?rev=58420&view=rev Log: [MSV1_0] Add authentication package stub and add it to the registry. Added: trunk/reactos/dll/win32/msv1_0/ (with props) trunk/reactos/dll/win32/msv1_0/CMakeLists.txt (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.c (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.h (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.rc (with props) trunk/reactos/dll/win32/msv1_0/msv1_0.spec (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/cmake/baseaddress.cmake trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -768,6 +768,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","00010415",2,"214" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","0001041F",2,"440" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layout\DosKeybIDs","00020408",2,"319" + +; Lsa +HKLM,"SYSTEM\CurrentControlSet\Control\Lsa","Authentication Packages",0x00010000, \ + "msv1_0" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -2,6 +2,7 @@ set(baseaddress_kernel32 0x77da0000) set(baseaddress_msvcrt 0x77d10000) set(baseaddress_advapi32 0x77c60000) +set(baseaddress_msv1_0 0x77c40000) set(baseaddress_gdi32 0x77bf0000) set(baseaddress_user32 0x77a60000) set(baseaddress_dhcpcsvc 0x77a10000) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -107,6 +107,7 @@ add_subdirectory(mssign32) add_subdirectory(mssip32) add_subdirectory(mstask) +add_subdirectory(msv1_0) add_subdirectory(msvcrt) add_subdirectory(msvcrt20) add_subdirectory(msvcrt40) Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 3 19:11:22 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msv1_0/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,19 @@ + +#include_directories( +# ${CMAKE_CURRENT_BINARY_DIR}) + +spec2def(msv1_0.dll msv1_0.spec) + +list(APPEND SOURCE + msv1_0.c + msv1_0.rc + ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def) + +add_library(msv1_0 SHARED ${SOURCE}) +set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0) +target_link_libraries(msv1_0 wine ${PSEH_LIB}) +add_importlibs(msv1_0 kernel32 ntdll) +add_pch(msv1_0 msv1_0.h) +add_dependencies(msv1_0 psdk) +add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,126 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/msv1_0/msv1_0.c + * PURPOSE: Main file + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "msv1_0.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + + +/* FUNCTIONS ***************************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackagePassthrough(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApCallPackageUntrusted(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApInitializePackage(IN ULONG AuthenticationPackageId, + IN PLSA_DISPATCH_TABLE LsaDispatchTable, + IN PLSA_STRING Database OPTIONAL, + IN PLSA_STRING Confidentiality OPTIONAL, + OUT PLSA_STRING *AuthenticationPackageName) +{ + TRACE("(%lu %p %p %p %p)\n", + AuthenticationPackageId, LsaDispatchTable, Database, + Confidentiality, AuthenticationPackageName); + + + return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +VOID +NTAPI +LsaApLogonTerminated(IN PLUID LogonId) +{ + TRACE("()\n"); +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, + IN SECURITY_LOGON_TYPE LogonType, + IN PVOID AuthenticationInformation, + IN PVOID ClientAuthenticationBase, + IN ULONG AuthenticationInformationLength, + OUT PVOID *ProfileBuffer, + OUT PULONG ProfileBufferLength, + OUT PLUID LogonId, + OUT PNTSTATUS SubStatus, + OUT PLSA_TOKEN_INFORMATION_TYPE TokenInformationType, + OUT PVOID *TokenInformation, + OUT PLSA_UNICODE_STRING *AccountName, + OUT PLSA_UNICODE_STRING *AuthenticatingAuthority) +{ + TRACE("()\n"); + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,33 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/msv1_0/msv1_0.h + * PURPOSE: Common header file + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#define NTOS_MODE_USER +#include <ndk/cmfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> + +#include <sspi.h> +#include <ntsecapi.h> +#include <ntsecpkg.h> + +#include <wine/debug.h> + +/* EOF */ Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.rc… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.rc (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.rc [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,7 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Authentication Package\0" +#define REACTOS_STR_INTERNAL_NAME "msv1_0\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msv1_0.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/dll/win32/msv1_0/msv1_0.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.sp… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.spec (added) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.spec [iso-8859-1] Sun Mar 3 19:11:22 2013 @@ -1,0 +1,18 @@ +@ stdcall LsaApCallPackage(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApCallPackagePassthrough(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApCallPackageUntrusted(ptr ptr ptr long ptr ptr ptr) +@ stdcall LsaApInitializePackage(long ptr ptr ptr ptr) +@ stdcall LsaApLogonTerminated(ptr) +@ stdcall LsaApLogonUser(ptr long ptr ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stub LsaApLogonUserEx +@ stub LsaApLogonUserEx2 +@ stub Msv1_0ExportSubAuthenticationRoutine +@ stub Msv1_0SubAuthenticationPresent +@ stub MsvGetLogonAttemptCount +@ stub MsvSamLogoff +@ stub MsvSamValidate +@ stub MsvValidateTarget +@ stub SpInitialize +@ stub SpInstanceInit +@ stub SpLsaModeInitiaize +@ stub SpUserModeInitiaize Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msv1_0/msv1_0.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision

11 years, 9 months

[hbelusca] 58419: [CONSOLE.DLL] Use a new unique sample text for fonts and colors overview. [CONSRV] Remove few DPRINTs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 3 17:39:44 2013 New Revision: 58419 URL: http://svn.reactos.org/svn/reactos?rev=58419&view=rev Log: [CONSOLE.DLL] Use a new unique sample text for fonts and colors overview. [CONSRV] Remove few DPRINTs. Modified: 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/layout.c branches/ros-csrss/dll/cpl/console/resource.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/settings.c 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "ÐÐ¾Ð½Ð·Ð¾Ð»Ð°" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÐºÐ¾Ð½Ð·Ð¾Ð»Ð°ÑÐ°." IDS_APPLY_SHORTCUT_ALL "ÐÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° &Ð¿ÑÐµÐ¿ÑÐ°ÑÐºÐ°ÑÐ°, Ð·Ð°Ð¿ÑÑÐ½Ð°Ð»Ð° ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Ð ÐµÑÐµÑÑÑÐ½Ð¸ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ" 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] Sun Mar 3 17:39:44 2013 @@ -141,6 +141,5 @@ IDS_CPLNAME "Konzole" IDS_CPLDESCRIPTION "Nastavit vlastnosti konzole." IDS_APPLY_SHORTCUT_ALL "ZmÄnit zÃ¡&stupce, kterÃ½ spustil toto okno" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "RastrovÃ¡ pÃsma" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsole" IDS_CPLDESCRIPTION "Konfiguriert die Konsoleneigenschaften." IDS_APPLY_SHORTCUT_ALL "Modifiziere die &VerknÃ¼pfung, die das Fenster startete" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Rasterschriften" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" END 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] Sun Mar 3 17:39:44 2013 @@ -140,6 +140,5 @@ IDS_CPLNAME "Consola" IDS_CPLDESCRIPTION "Configurar propiedades de la consola." IDS_APPLY_SHORTCUT_ALL "Modificar &atajo que comienza esta ventana" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fuentes Raster" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configurer les propriÃ©tÃ©s de la console." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Polices Raster" END 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] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "×©××¨×ª ××¤×§×××" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsol" IDS_CPLDESCRIPTION "Konfigurasi properti konsol." IDS_APPLY_SHORTCUT_ALL "Modifikasi &jalan pintas yang memulai jendela ini" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Font Raster" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configura le proprietÃ della console." IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" 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] Sun Mar 3 17:39:44 2013 @@ -143,6 +143,5 @@ IDS_CPLNAME "Konsoll" IDS_CPLDESCRIPTION "Konfigurere Konsoll innstillinger." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster Fonts" 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] Sun Mar 3 17:39:44 2013 @@ -142,6 +142,5 @@ IDS_CPLNAME "Konsola" IDS_CPLDESCRIPTION "Konfiguruje wÅaÅciwoÅci konsoli." IDS_APPLY_SHORTCUT_ALL "Zmodyfikuj skrÃ³t, ktÃ³ry wywoÅaÅ to okno" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Czcionki rastrowe" 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] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "Linie de comandÄ" IDS_CPLDESCRIPTION "Configurarea proprietÄÈilor pentru programe linie de comandÄ." IDS_APPLY_SHORTCUT_ALL "ModificÄ &scurtÄtura care a pornit aplicaÈia" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fonturi rastre" 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] Sun Mar 3 17:39:44 2013 @@ -137,6 +137,5 @@ IDS_CPLNAME "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ°" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸." IDS_APPLY_SHORTCUT_ALL "&ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑÐ»ÑÐº, ÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð±ÑÐ»Ð¾ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-07 5:00\nSYSTEM32 <DIR> 10-01-07 5:00" IDS_RASTERFONTS "Ð Ð°ÑÑÑÐ¾Ð²ÑÐµ ÑÑÐ¸ÑÑÑ" 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] Sun Mar 3 17:39:44 2013 @@ -139,6 +139,5 @@ IDS_CPLNAME "Konzola" IDS_CPLDESCRIPTION "Nastavuje vlastnosti Konzoly." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "RasterovÃ© pÃsma" 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] Sun Mar 3 17:39:44 2013 @@ -144,6 +144,5 @@ IDS_CPLNAME "ÐÐ¾Ð½ÑÐ¾Ð»Ñ" IDS_CPLDESCRIPTION "ÐÐ°ÑÑÑÐ¾ÑÐ²Ð°Ð½Ð½Ñ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÐµÐ¹ ÐºÐ¾Ð½ÑÐ¾Ð»Ñ." IDS_APPLY_SHORTCUT_ALL "ÐÐ¼ÑÐ½Ð° &ÑÑÐ»Ð¸ÐºÐ°, ÑÐºÐ¸Ð¹ Ð·Ð°Ð¿ÑÑÑÐ¸Ð² ÑÐµ Ð²ÑÐºÐ½Ð¾" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Ð Ð°ÑÑÑÐ¾Ð²Ñ ÑÑÐ¸ÑÑÐ¸" 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] Sun Mar 3 17:39:44 2013 @@ -142,6 +142,5 @@ IDS_CPLNAME "æ§å¶å°" IDS_CPLDESCRIPTION "éç½®æ§å¶å°å±æ§ã" IDS_APPLY_SHORTCUT_ALL "ä¿®æ¹å¯å¨æ¤çªå£çå¿«æ·æ¹å¼(&S)" - IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Raster åä½" END Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -8,31 +8,15 @@ #include "console.h" -// TODO: Use ReactOS output -const TCHAR szPreviewText[] = \ +const TCHAR szPreviewText[] = _T("C:\\ReactOS> dir \n") \ - _T("SYSTEM <DIR> 10-01-99 5:00a\n") \ - _T("SYSTEM32 <DIR> 10-01-99 5:00a\n") \ - _T("README TXT 26926 10-01-99 5:00a\n") \ - _T("WINDOWS BMP 46080 10-01-99 5:00a\n") \ - _T("NOTEPAD EXE 337232 10-01-99 5:00a\n") \ - _T("CLOCK AVI 39594 10-01-99 5:00p\n") \ - _T("WIN INI 7005 10-01-99 5:00a\n"); -/* -const TCHAR szPreviewText[] = \ - _T("C:\\ReactOS> dir \n") \ - _T("02-18-13 05:00a <DIR> system \n") \ - _T("02-18-13 05:00a <DIR> system32 \n") \ - _T("02-18-13 05:00a 26926 readme.txt \n") \ - _T("02-18-13 05:00a 3321856 explorer.exe\n") \ - _T("02-18-13 05:00a 256 setuplog. \n") \ - _T("02-18-13 05:00a 18736 vgafonts.cab\n") \ - _T("02-18-13 05:00a 256 win.ini \n") \ - _T("README TXT 26926 10-01-99 5:00a\n") \ - _T("CLOCK AVI 39594 10-01-99 5:00p\n") \ - _T("WIN INI 7005 10-01-99 5:00a\n"); -*/ -// IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + _T("SYSTEM <DIR> 03-03-13 5:00a\n") \ + _T("SYSTEM32 <DIR> 03-03-13 5:00a\n") \ + _T("readme txt 1739 03-03-13 5:00a\n") \ + _T("explorer exe 3329536 03-03-13 5:00a\n") \ + _T("vgafonts cab 18736 03-03-13 5:00a\n") \ + _T("setuplog txt 313 03-03-13 5:00a\n") \ + _T("win ini 7005 03-03-13 5:00a\n"); VOID 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] Sun Mar 3 17:39:44 2013 @@ -86,5 +86,4 @@ #define IDC_STATIC_COLOR16 627 // String IDs -#define IDS_SCREEN_TEXT 700 -#define IDS_RASTERFONTS 701 +#define IDS_RASTERFONTS 700 Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -66,8 +66,6 @@ IN USHORT ScreenAttrib, IN USHORT PopupAttrib) { - DPRINT("ConSrvCreateScreenBuffer\n"); - if (Console == NULL || Buffer == NULL) return STATUS_INVALID_PARAMETER; Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -521,7 +521,6 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); - DPRINT1("SrvOpenConsole - Checkpoint 1\n"); DPRINT1("ProcessData = 0x%p ; ProcessData->Console = 0x%p\n", ProcessData, ProcessData->Console); if (ProcessData->Console) @@ -532,9 +531,9 @@ PCONSOLE Console = ProcessData->Console; Object_t *Object; + DPRINT1("SrvOpenConsole - Checkpoint 1\n"); + EnterCriticalSection(&Console->Lock); DPRINT1("SrvOpenConsole - Checkpoint 2\n"); - EnterCriticalSection(&Console->Lock); - DPRINT1("SrvOpenConsole - Checkpoint 3\n"); if (OpenConsoleRequest->HandleType == HANDLE_OUTPUT) { @@ -632,7 +631,6 @@ /* Set the Property Dialog Handler */ ProcessData->PropDispatcher = AllocConsoleRequest->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = AllocConsoleRequest->CtrlDispatcher; @@ -734,7 +732,6 @@ /* Set the Property Dialog Handler */ TargetProcessData->PropDispatcher = AttachConsoleRequest->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", TargetProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ TargetProcessData->CtrlDispatcher = AttachConsoleRequest->CtrlDispatcher; Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/guiconsole.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -1800,7 +1800,6 @@ (PVOID)Console); if (NULL != NewWindow) { - DPRINT1("CreateWindowExW succeeded\n"); SetConsoleWndConsoleLeaderCID(Console); SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); @@ -1818,7 +1817,6 @@ SendMessageW(Console->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)Console->hIconSm); } - DPRINT1("Show window\n"); ShowWindow(NewWindow, (int)wParam); } return (LRESULT)NewWindow; @@ -2132,7 +2130,6 @@ if (IconPath) { HICON hIcon = NULL, hIconSm = NULL; - DPRINT1("Extracting icons\n"); PrivateExtractIconExW(IconPath, IconIndex, &hIcon, Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -745,7 +745,6 @@ /* Set the Property Dialog Handler */ ProcessData->PropDispatcher = ConnectInfo->PropDispatcher; - DPRINT("CONSRV: PropDispatcher address: %x\n", ProcessData->PropDispatcher); /* Set the Ctrl Dispatcher */ ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Sun Mar 3 17:39:44 2013 @@ -142,8 +142,6 @@ * i.e. %SystemRoot%_<some_path>_<some_app.exe> */ - DPRINT1("ConSrvOpenUserSettings entered\n"); - /* Open the registry key where we saved the console properties */ if (!OpenUserRegistryPathPerProcessId(ProcessId, &hKey, samDesired)) { @@ -209,7 +207,7 @@ &hKey, KEY_READ, FALSE)) { - DPRINT1("ConSrvOpenUserSettings failed\n"); + DPRINT("ConSrvOpenUserSettings failed\n"); return FALSE; } @@ -426,8 +424,6 @@ ConSrvGetDefaultSettings(IN OUT PCONSOLE_INFO ConsoleInfo, IN DWORD ProcessId) { - DPRINT1("ConSrvGetDefaultSettings(0x%p)\n", ConsoleInfo); - if (ConsoleInfo == NULL) return; /// HKCU,"Console","LoadConIme",0x00010003,1

11 years, 9 months

[tkreuzer] 58418: [WIN32K] Properly handle glyph positions and take target coordinate transformation into account when caching glyphs. (This is suboptimal, since we might cache duplicates of the sa...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 3 17:20:44 2013 New Revision: 58418 URL: http://svn.reactos.org/svn/reactos?rev=58418&view=rev Log: [WIN32K] Properly handle glyph positions and take target coordinate transformation into account when caching glyphs. (This is suboptimal, since we might cache duplicates of the same glyphs, but it works). Fixes CORE-4657. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Mar 3 17:20:44 2013 @@ -59,6 +59,7 @@ FT_Face Face; FT_BitmapGlyph BitmapGlyph; int Height; + MATRIX mxWorldToDevice; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; static LIST_ENTRY FontCacheListHead; static UINT FontCacheNumEntries; @@ -161,14 +162,10 @@ VOID FtSetCoordinateTransform( FT_Face face, - PDC pdc) + PMATRIX pmx) { FT_Matrix ftmatrix; - PMATRIX pmx; FLOATOBJ efTemp; - - /* Get the DC's world-to-device transformation matrix */ - pmx = DC_pmxWorldToDevice(pdc); /* Create a freetype matrix, by converting to 16.16 fixpoint format */ efTemp = pmx->efM11; @@ -1343,12 +1340,24 @@ return FALSE; } +static +BOOL +SameScaleMatrix( + PMATRIX pmx1, + PMATRIX pmx2) +{ + return (FLOATOBJ_Equal(&pmx1->efM11, &pmx2->efM11) && + FLOATOBJ_Equal(&pmx1->efM12, &pmx2->efM12) && + FLOATOBJ_Equal(&pmx1->efM21, &pmx2->efM21) && + FLOATOBJ_Equal(&pmx1->efM22, &pmx2->efM22)); +} FT_BitmapGlyph APIENTRY ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, - INT Height) + INT Height, + PMATRIX pmx) { PLIST_ENTRY CurrentEntry; PFONT_CACHE_ENTRY FontEntry; @@ -1357,9 +1366,10 @@ while (CurrentEntry != &FontCacheListHead) { FontEntry = (PFONT_CACHE_ENTRY)CurrentEntry; - if (FontEntry->Face == Face && - FontEntry->GlyphIndex == GlyphIndex && - FontEntry->Height == Height) + if ((FontEntry->Face == Face) && + (FontEntry->GlyphIndex == GlyphIndex) && + (FontEntry->Height == Height) && + (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; CurrentEntry = CurrentEntry->Flink; } @@ -1379,6 +1389,7 @@ FT_Face Face, INT GlyphIndex, INT Height, + PMATRIX pmx, FT_GlyphSlot GlyphSlot, FT_Render_Mode RenderMode) { @@ -1428,6 +1439,7 @@ NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; + NewEntry->mxWorldToDevice = *pmx; InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); if (FontCacheNumEntries++ > MAX_FONT_CACHE) @@ -1585,7 +1597,7 @@ /* FIXME: Should set character height if neg */ // (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? // dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); -// FtSetCoordinateTransform(face, dc); +// FtSetCoordinateTransform(face, DC_pmxWorldToDevice(dc)); TEXTOBJ_UnlockText(TextObj); @@ -2132,6 +2144,7 @@ BOOL use_kerning; FT_Render_Mode RenderMode; BOOLEAN Render; + PMATRIX pmxWorldToDevice; FontGDI = ObjToGDI(TextObj->Font, FONT); @@ -2186,7 +2199,9 @@ DPRINT1("Error in setting pixel sizes: %u\n", error); } - FtSetCoordinateTransform(face, dc); + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -2199,7 +2214,8 @@ glyph_index = FT_Get_Char_Index(face, *String); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -2209,8 +2225,12 @@ } glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, + glyph, + RenderMode); if (!realglyph) { DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); @@ -2470,7 +2490,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(Face, dc); + FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc)); IntUnLockFreeType; if (0 != Error) { @@ -3117,6 +3137,24 @@ ExFreePoolWithTag(Info, GDITAG_TEXT); return Count; +} + +LONG +FORCEINLINE +ScaleLong(LONG lValue, PFLOATOBJ pef) +{ + FLOATOBJ efTemp; + + /* Check if we have scaling different from 1 */ + if (!FLOATOBJ_Equal(pef, (PFLOATOBJ)&gef1)) + { + /* Need to multiply */ + FLOATOBJ_SetLong(&efTemp, lValue); + FLOATOBJ_Mul(&efTemp, pef); + lValue = FLOATOBJ_GetLong(&efTemp); + } + + return lValue; } BOOL @@ -3165,6 +3203,8 @@ POINT Start; BOOL DoBreak = FALSE; USHORT DxShift; + PMATRIX pmxWorldToDevice; + LONG fixAscender, fixDescender; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3328,18 +3368,22 @@ goto fail; } - FtSetCoordinateTransform(face, dc); + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); /* * Process the vertical alignment and determine the yoff. */ + fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); + fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); + if (pdcattr->lTextAlign & TA_BASELINE) yoff = 0; else if (pdcattr->lTextAlign & TA_BOTTOM) - yoff = -face->size->metrics.descender >> 6; + yoff = -fixDescender >> 6; else /* TA_TOP */ - yoff = face->size->metrics.ascender >> 6; + yoff = fixAscender >> 6; use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -3377,7 +3421,8 @@ glyph_index = FT_Get_Char_Index(face, *TempText); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -3386,8 +3431,12 @@ } glyph = face->glyph; - realglyph = ftGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, + glyph, + RenderMode); if (!realglyph) { DPRINT1("Failed to render glyph! [index: %u]\n", glyph_index); @@ -3453,7 +3502,8 @@ glyph_index = FT_Get_Char_Index(face, *String); if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice))) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) @@ -3466,6 +3516,7 @@ realglyph = ftGdiGlyphCacheSet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + pmxWorldToDevice, glyph, RenderMode); if (!realglyph) @@ -3491,8 +3542,8 @@ { DestRect.left = BackgroundLeft; DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6; - DestRect.top = TextTop + yoff - ((face->size->metrics.ascender + 32) >> 6); - DestRect.bottom = TextTop + yoff + ((32 - face->size->metrics.descender) >> 6); + DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6); + DestRect.bottom = TextTop + yoff + ((32 - fixDescender) >> 6); MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); IntEngBitBlt( &psurf->SurfObj, @@ -3777,6 +3828,7 @@ UINT i, glyph_index, BufferSize; HFONT hFont = 0; NTSTATUS Status = STATUS_SUCCESS; + PMATRIX pmxWorldToDevice; if (pwch) { @@ -3823,6 +3875,9 @@ pdcattr = dc->pdcattr; hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); + + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -3866,7 +3921,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(face, dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++) { @@ -3951,6 +4006,7 @@ FT_CharMap charmap, found = NULL; UINT i, glyph_index, BufferSize; HFONT hFont = 0; + PMATRIX pmxWorldToDevice; if (pwc) { @@ -3991,6 +4047,8 @@ pdcattr = dc->pdcattr; hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); + /* Get the DC's world-to-device transformation matrix */ + pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -4034,7 +4092,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); - FtSetCoordinateTransform(face, dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); for (i = FirstChar; i < FirstChar+Count; i++) {

11 years, 9 months

[hbelusca] 58417: [README] - Precise which target we are primarily aiming at, update the readme a little bit. - Add it to the installed files.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 3 17:16:29 2013 New Revision: 58417 URL: http://svn.reactos.org/svn/reactos?rev=58417&view=rev Log: [README] - Precise which target we are primarily aiming at, update the readme a little bit. - Add it to the installed files. Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Mar 3 17:16:29 2013 @@ -54,6 +54,7 @@ #readme.txt add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION root NO_CAB FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/readme.txt DESTINATION reactos FOR all) #freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd regtest) Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Sun Mar 3 17:16:29 2013 @@ -1,16 +1,16 @@ ======================== -ReactOS Version 0.3.x -Updated July 28, 2007 +ReactOS Version 0.3.x +Updated March 3, 2013 ======================== 1. What is ReactOS? ------------------- -ReactOS is an Open Source effort to develop a quality operating system that is -compatible with applications and drivers written for the Microsoft Windows NT -family of operating systems (NT4, 2000, XP, 2003, Vista). +ReactOS is an Open Source effort to develop a quality operating system that is +compatible with applications and drivers written for the Microsoft® Windows NT +family of operating systems (NT4, 2000, XP, 2003, Vista, Seven). -Website: http://www.reactos.org/ +Website: http://www.reactos.org 2. Relationship with the WINE project @@ -25,7 +25,7 @@ 3. Future compatibility ----------------------- -The ReactOS project, although currently focused on Windows XP +The ReactOS project, although currently focused on Windows Server 2003 compatibility, is always keeping an eye toward compatibility with Windows Vista and future Windows NT releases. @@ -35,18 +35,19 @@ The Windows NT architecture allows for subsystems, as does the ReactOS architecture. A subsystem is an implementation of the APIs of another -operating system, allowing ReactOS to run applications from other systems. We -are already looking at subsystems for: Java, OS/2, and DOS and possibly others -in the future. +operating system, allowing ReactOS to run applications from other systems. +We are already looking at subsystems for: Java, OS/2, and DOS and possibly +others in the future. 5. Tutorials ------------ -Developer and User Tutorials: http://www.reactos.org/wiki/index.php/Main_Page +Developer and User Tutorials: http://www.reactos.org/wiki The tutorials contain more information on the project, compiling and testing -ReactOS - among other topics. Contributors to the project are always welcome. +ReactOS - amongst other topics. Contributors to the project are always welcome. + 6. Author ---------

11 years, 9 months

[hbelusca] 58416: [CONSOLE.DLL] Code formatting only (tab --> space indentation)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 3 15:47:52 2013 New Revision: 58416 URL: http://svn.reactos.org/svn/reactos?rev=58416&view=rev Log: [CONSOLE.DLL] Code formatting only (tab --> space indentation) Modified: branches/ros-csrss/dll/cpl/console/colors.c branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/cpl/console/options.c branches/ros-csrss/dll/cpl/console/resource.h Modified: branches/ros-csrss/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/color… ============================================================================== --- branches/ros-csrss/dll/cpl/console/colors.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/colors.c [iso-8859-1] Sun Mar 3 15:47:52 2013 @@ -40,49 +40,49 @@ WPARAM wParam, LPARAM lParam) { - PCONSOLE_PROPS pConInfo; - LPDRAWITEMSTRUCT drawItem; + PCONSOLE_PROPS pConInfo; + LPDRAWITEMSTRUCT drawItem; DWORD colorIndex; COLORREF color; - pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - { - pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); /* Set the valid range of the colour indicators */ - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); /* Select by default the screen background option */ - CheckRadioButton(hwndDlg, IDC_RADIO_SCREEN_TEXT, IDC_RADIO_POPUP_BACKGROUND, IDC_RADIO_SCREEN_BACKGROUND); + CheckRadioButton(hwndDlg, IDC_RADIO_SCREEN_TEXT, IDC_RADIO_POPUP_BACKGROUND, IDC_RADIO_SCREEN_BACKGROUND); SendMessage(hwndDlg, WM_COMMAND, IDC_RADIO_SCREEN_BACKGROUND, 0); - return TRUE; - } - - case WM_DRAWITEM: - { - drawItem = (LPDRAWITEMSTRUCT)lParam; - if (drawItem->CtlID >= IDC_STATIC_COLOR1 && drawItem->CtlID <= IDC_STATIC_COLOR16) - { - return PaintStaticControls(hwndDlg, pConInfo, drawItem); - } - else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR || drawItem->CtlID == IDC_STATIC_POPUP_COLOR) - { - PaintText(drawItem, pConInfo); - return TRUE; - } + return TRUE; + } + + case WM_DRAWITEM: + { + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= IDC_STATIC_COLOR1 && drawItem->CtlID <= IDC_STATIC_COLOR16) + { + return PaintStaticControls(hwndDlg, pConInfo, drawItem); + } + else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR || drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + { + PaintText(drawItem, pConInfo); + return TRUE; + } break; - } - - case WM_NOTIFY: - { + } + + case WM_NOTIFY: + { switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: @@ -145,15 +145,15 @@ } } - break; - } - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_RADIO_SCREEN_TEXT: - { + break; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_RADIO_SCREEN_TEXT: + { /* Get the color of the screen foreground */ colorIndex = TextAttribFromAttrib(pConInfo->ci.ScreenAttrib); color = pConInfo->ci.Colors[colorIndex]; @@ -166,13 +166,13 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - break; - } - - case IDC_RADIO_SCREEN_BACKGROUND: - { + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + + case IDC_RADIO_SCREEN_BACKGROUND: + { /* Get the color of the screen background */ colorIndex = BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib); color = pConInfo->ci.Colors[colorIndex]; @@ -185,13 +185,13 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - break; - } - - case IDC_RADIO_POPUP_TEXT: - { + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + + case IDC_RADIO_POPUP_TEXT: + { /* Get the color of the popup foreground */ colorIndex = TextAttribFromAttrib(pConInfo->ci.PopupAttrib); color = pConInfo->ci.Colors[colorIndex]; @@ -204,13 +204,13 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - break; - } - - case IDC_RADIO_POPUP_BACKGROUND: - { + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + + case IDC_RADIO_POPUP_BACKGROUND: + { /* Get the color of the popup background */ colorIndex = BkgdAttribFromAttrib(pConInfo->ci.PopupAttrib); color = pConInfo->ci.Colors[colorIndex]; @@ -223,61 +223,61 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - break; - } - } - - if ( HIWORD(wParam) == STN_CLICKED && + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + break; + } + } + + if ( HIWORD(wParam) == STN_CLICKED && IDC_STATIC_COLOR1 <= LOWORD(wParam) && LOWORD(wParam) <= IDC_STATIC_COLOR16 ) - { - colorIndex = LOWORD(wParam) - IDC_STATIC_COLOR1; - - if (colorIndex == pConInfo->ActiveStaticControl) - { - /* Same static control was re-clicked */ - break; - } + { + colorIndex = LOWORD(wParam) - IDC_STATIC_COLOR1; + + if (colorIndex == pConInfo->ActiveStaticControl) + { + /* Same static control was re-clicked */ + break; + } color = pConInfo->ci.Colors[colorIndex]; - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); - - /* Update global struct */ - if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT)) - { + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(color), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(color), FALSE); + + /* Update global struct */ + if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT)) + { pConInfo->ci.ScreenAttrib = MakeAttrib(colorIndex, BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)); - } - else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND)) - { + } + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND)) + { pConInfo->ci.ScreenAttrib = MakeAttrib(TextAttribFromAttrib(pConInfo->ci.ScreenAttrib), colorIndex); - } - else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_TEXT)) - { + } + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_TEXT)) + { pConInfo->ci.PopupAttrib = MakeAttrib(colorIndex, BkgdAttribFromAttrib(pConInfo->ci.PopupAttrib)); - } - else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_BACKGROUND)) - { + } + else if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_POPUP_BACKGROUND)) + { pConInfo->ci.PopupAttrib = MakeAttrib(TextAttribFromAttrib(pConInfo->ci.PopupAttrib), colorIndex); - } - - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); + } + + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); pConInfo->ActiveStaticControl = colorIndex; - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); - InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); - - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - } - - default: - break; - } - - return FALSE; + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + } + + default: + break; + } + + return FALSE; } Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… ============================================================================== --- branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/layout.c [iso-8859-1] Sun Mar 3 15:47:52 2013 @@ -39,106 +39,105 @@ PaintConsole(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo) { - HBRUSH hBrush; - RECT cRect, fRect; - DWORD startx, starty; - DWORD endx, endy; - DWORD sizex, sizey; - - FillRect(drawItem->hDC, &drawItem->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); - - sizex = drawItem->rcItem.right - drawItem->rcItem.left; - sizey = drawItem->rcItem.bottom - drawItem->rcItem.top; - - if ( pConInfo->ci.u.GuiInfo.WindowOrigin.x == MAXDWORD && + HBRUSH hBrush; + RECT cRect, fRect; + DWORD startx, starty; + DWORD endx, endy; + DWORD sizex, sizey; + + FillRect(drawItem->hDC, &drawItem->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); + + sizex = drawItem->rcItem.right - drawItem->rcItem.left; + sizey = drawItem->rcItem.bottom - drawItem->rcItem.top; + + if ( pConInfo->ci.u.GuiInfo.WindowOrigin.x == MAXDWORD && pConInfo->ci.u.GuiInfo.WindowOrigin.y == MAXDWORD ) - { - startx = sizex / 3; - starty = sizey / 3; - } - else - { - // TODO: - // Calculate pos correctly when console centered - startx = sizex / 3; - starty = sizey / 3; - } - - // TODO: - // Strech console when bold fonts are selected - endx = drawItem->rcItem.right - startx + 15; - endy = starty + sizey / 3; - - /* Draw console size */ - SetRect(&cRect, startx, starty, endx, endy); - FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME)); - - /* Draw console border */ - SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1); - FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - - /* Draw left box */ - SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - - /* Draw window title */ - SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION)); - - /* Draw first right box */ - SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - - /* Draw second right box */ - SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); - FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - - /* Draw scrollbar */ - SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3); - FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR)); - - /* Draw console background */ - hBrush = CreateSolidBrush(pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)]); - SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3); - FillRect(drawItem->hDC, &fRect, hBrush); - DeleteObject((HGDIOBJ)hBrush); + { + startx = sizex / 3; + starty = sizey / 3; + } + else + { + // TODO: + // Calculate pos correctly when console centered + startx = sizex / 3; + starty = sizey / 3; + } + + // TODO: + // Strech console when bold fonts are selected + endx = drawItem->rcItem.right - startx + 15; + endy = starty + sizey / 3; + + /* Draw console size */ + SetRect(&cRect, startx, starty, endx, endy); + FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME)); + + /* Draw console border */ + SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1); + FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); + + /* Draw left box */ + SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); + + /* Draw window title */ + SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION)); + + /* Draw first right box */ + SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); + + /* Draw second right box */ + SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); + + /* Draw scrollbar */ + SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3); + FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR)); + + /* Draw console background */ + hBrush = CreateSolidBrush(pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)]); + SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3); + FillRect(drawItem->hDC, &fRect, hBrush); + DeleteObject((HGDIOBJ)hBrush); } VOID PaintText(LPDRAWITEMSTRUCT drawItem, PCONSOLE_PROPS pConInfo) { - COLORREF pbkColor, ptColor; - COLORREF nbkColor, ntColor; - HBRUSH hBrush = NULL; - - if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) - { - nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; - } - else if (drawItem->CtlID == IDC_STATIC_POPUP_COLOR) - { - nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.PopupAttrib)]; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.PopupAttrib)]; - } - - if (!hBrush) - { - return; - } - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - - ptColor = SetTextColor(drawItem->hDC, ntColor); - pbkColor = SetBkColor(drawItem->hDC, nbkColor); - DrawText(drawItem->hDC, szPreviewText, _tcslen(szPreviewText), &drawItem->rcItem, 0); - SetTextColor(drawItem->hDC, ptColor); - SetBkColor(drawItem->hDC, pbkColor); - DeleteObject((HGDIOBJ)hBrush); + COLORREF pbkColor, ptColor; + COLORREF nbkColor, ntColor; + HBRUSH hBrush = NULL; + + if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + { + nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.ScreenAttrib)]; + } + else if (drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + { + nbkColor = pConInfo->ci.Colors[BkgdAttribFromAttrib(pConInfo->ci.PopupAttrib)]; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->ci.Colors[TextAttribFromAttrib(pConInfo->ci.PopupAttrib)]; + } + + if (!hBrush) + { + return; + } + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + + ptColor = SetTextColor(drawItem->hDC, ntColor); + pbkColor = SetBkColor(drawItem->hDC, nbkColor); + DrawText(drawItem->hDC, szPreviewText, _tcslen(szPreviewText), &drawItem->rcItem, 0); + SetTextColor(drawItem->hDC, ptColor); + SetBkColor(drawItem->hDC, pbkColor); + DeleteObject((HGDIOBJ)hBrush); } - INT_PTR CALLBACK @@ -147,248 +146,248 @@ WPARAM wParam, LPARAM lParam) { - LPNMUPDOWN lpnmud; - LPPSHNOTIFY lppsn; - PCONSOLE_PROPS pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); - - UNREFERENCED_PARAMETER(hwndDlg); - UNREFERENCED_PARAMETER(wParam); - - switch (uMsg) - { - case WM_INITDIALOG: - { - DWORD xres, yres; - HDC hDC; - pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); - - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); - - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, pConInfo->ci.ScreenBufferSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, pConInfo->ci.ScreenBufferSize.X, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, pConInfo->ci.ConsoleSize.Y, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, pConInfo->ci.ConsoleSize.X, FALSE); - - hDC = GetDC(NULL); - xres = GetDeviceCaps(hDC, HORZRES); - yres = GetDeviceCaps(hDC, VERTRES); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); - SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); - - if ( pConInfo->ci.u.GuiInfo.WindowOrigin.x != MAXDWORD && + LPNMUPDOWN lpnmud; + LPPSHNOTIFY lppsn; + PCONSOLE_PROPS pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); + + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + { + DWORD xres, yres; + HDC hDC; + pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 1)); + + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, pConInfo->ci.ScreenBufferSize.Y, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, pConInfo->ci.ScreenBufferSize.X, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, pConInfo->ci.ConsoleSize.Y, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, pConInfo->ci.ConsoleSize.X, FALSE); + + hDC = GetDC(NULL); + xres = GetDeviceCaps(hDC, HORZRES); + yres = GetDeviceCaps(hDC, VERTRES); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); + + if ( pConInfo->ci.u.GuiInfo.WindowOrigin.x != MAXDWORD && pConInfo->ci.u.GuiInfo.WindowOrigin.y != MAXDWORD ) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, pConInfo->ci.u.GuiInfo.WindowOrigin.x, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, pConInfo->ci.u.GuiInfo.WindowOrigin.y, FALSE); - } - else - { - // FIXME: Calculate window pos from xres, yres - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); - SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - } - - return TRUE; - } - case WM_DRAWITEM: - { - PaintConsole((LPDRAWITEMSTRUCT)lParam, pConInfo); - return TRUE; - } - case WM_NOTIFY: - { - lpnmud = (LPNMUPDOWN) lParam; - lppsn = (LPPSHNOTIFY) lParam; - - if (lppsn->hdr.code == UDN_DELTAPOS) - { - DWORD wheight, wwidth; - DWORD sheight, swidth; - DWORD left, top; - - if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH) - { - wwidth = lpnmud->iPos + lpnmud->iDelta; - } - else - { - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) - { - wheight = lpnmud->iPos + lpnmud->iDelta; - } - else - { - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH) - { - swidth = lpnmud->iPos + lpnmud->iDelta; - } - else - { - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) - { - sheight = lpnmud->iPos + lpnmud->iDelta; - } - else - { - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_LEFT) - { - left = lpnmud->iPos + lpnmud->iDelta; - } - else - { - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_TOP) - { - top = lpnmud->iPos + lpnmud->iDelta; - } - else - { - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); - } - - if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) - { - /* Automatically adjust screen buffer size when window size enlarges */ - if (wwidth >= swidth) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); - swidth = wwidth; - } - - if (wheight >= sheight) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, wheight, TRUE); - sheight = wheight; - } - } - swidth = max(swidth, 1); - sheight = max(sheight, 1); - - if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) - { - /* Automatically adjust window size when screen buffer decreases */ - if (wwidth > swidth) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); - wwidth = swidth; - } - - if (wheight > sheight) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); - wheight = sheight; - } - } - - pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight}; - pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight}; - pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){left, top}; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_EDIT_SCREEN_BUFFER_WIDTH: - case IDC_EDIT_SCREEN_BUFFER_HEIGHT: - case IDC_EDIT_WINDOW_SIZE_WIDTH: - case IDC_UPDOWN_WINDOW_SIZE_HEIGHT: - case IDC_EDIT_WINDOW_POS_LEFT: - case IDC_EDIT_WINDOW_POS_TOP: - { - if (HIWORD(wParam) == EN_KILLFOCUS) - { - DWORD wheight, wwidth; - DWORD sheight, swidth; - DWORD left, top; - - wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); - wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); - swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); - sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); - - swidth = max(swidth, 1); - sheight = max(sheight, 1); - - /* Automatically adjust window size when screen buffer decreases */ - if (wwidth > swidth) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); - wwidth = swidth; - } - - if (wheight > sheight) - { - SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); - wheight = sheight; - } + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, pConInfo->ci.u.GuiInfo.WindowOrigin.x, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, pConInfo->ci.u.GuiInfo.WindowOrigin.y, FALSE); + } + else + { + // FIXME: Calculate window pos from xres, yres + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + } + + return TRUE; + } + case WM_DRAWITEM: + { + PaintConsole((LPDRAWITEMSTRUCT)lParam, pConInfo); + return TRUE; + } + case WM_NOTIFY: + { + lpnmud = (LPNMUPDOWN) lParam; + lppsn = (LPPSHNOTIFY) lParam; + + if (lppsn->hdr.code == UDN_DELTAPOS) + { + DWORD wheight, wwidth; + DWORD sheight, swidth; + DWORD left, top; + + if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH) + { + wwidth = lpnmud->iPos + lpnmud->iDelta; + } + else + { + wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) + { + wheight = lpnmud->iPos + lpnmud->iDelta; + } + else + { + wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH) + { + swidth = lpnmud->iPos + lpnmud->iDelta; + } + else + { + swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) + { + sheight = lpnmud->iPos + lpnmud->iDelta; + } + else + { + sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_LEFT) + { + left = lpnmud->iPos + lpnmud->iDelta; + } + else + { + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_POS_TOP) + { + top = lpnmud->iPos + lpnmud->iDelta; + } + else + { + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + } + + if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) + { + /* Automatically adjust screen buffer size when window size enlarges */ + if (wwidth >= swidth) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); + swidth = wwidth; + } + + if (wheight >= sheight) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, wheight, TRUE); + sheight = wheight; + } + } + swidth = max(swidth, 1); + sheight = max(sheight, 1); + + if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) + { + /* Automatically adjust window size when screen buffer decreases */ + if (wwidth > swidth) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); + wwidth = swidth; + } + + if (wheight > sheight) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); + wheight = sheight; + } + } + + pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight}; + pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight}; + pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){left, top}; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_EDIT_SCREEN_BUFFER_WIDTH: + case IDC_EDIT_SCREEN_BUFFER_HEIGHT: + case IDC_EDIT_WINDOW_SIZE_WIDTH: + case IDC_UPDOWN_WINDOW_SIZE_HEIGHT: + case IDC_EDIT_WINDOW_POS_LEFT: + case IDC_EDIT_WINDOW_POS_TOP: + { + if (HIWORD(wParam) == EN_KILLFOCUS) + { + DWORD wheight, wwidth; + DWORD sheight, swidth; + DWORD left, top; + + wwidth = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, NULL, FALSE); + wheight = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, NULL, FALSE); + swidth = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, NULL, FALSE); + sheight = GetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, NULL, FALSE); + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + + swidth = max(swidth, 1); + sheight = max(sheight, 1); + + /* Automatically adjust window size when screen buffer decreases */ + if (wwidth > swidth) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); + wwidth = swidth; + } + + if (wheight > sheight) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, sheight, TRUE); + wheight = sheight; + } pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight}; pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight}; pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){left, top}; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - - case IDC_CHECK_SYSTEM_POS_WINDOW: - { - LONG res = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); - if (res == BST_CHECKED) - { - ULONG left, top; - - left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); - top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); - pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){left, top}; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), TRUE); - } - else if (res == BST_UNCHECKED) - { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + + case IDC_CHECK_SYSTEM_POS_WINDOW: + { + LONG res = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + if (res == BST_CHECKED) + { + ULONG left, top; + + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){left, top}; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), TRUE); + } + else if (res == BST_UNCHECKED) + { pConInfo->ci.u.GuiInfo.WindowOrigin = (POINT){UINT_MAX, UINT_MAX}; - SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); - } - } - } - } - default: - break; - } - - return FALSE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + } + } + } + } + default: + break; + } + + return FALSE; } Modified: branches/ros-csrss/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/optio… ============================================================================== --- branches/ros-csrss/dll/cpl/console/options.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/cpl/console/options.c [iso-8859-1] Sun Mar 3 15:47:52 2013 @@ -19,241 +19,241 @@ WPARAM wParam, LPARAM lParam) { - PCONSOLE_PROPS pConInfo; - LRESULT lResult; - HWND hDlgCtrl; + PCONSOLE_PROPS pConInfo; + LRESULT lResult; + HWND hDlgCtrl; LPPSHNOTIFY lppsn; - pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - { - pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); - UpdateDialogElements(hwndDlg, pConInfo); - return TRUE; - } - case WM_NOTIFY: - { - if (!pConInfo) - { - break; - } - lppsn = (LPPSHNOTIFY) lParam; + pConInfo = (PCONSOLE_PROPS)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + pConInfo = (PCONSOLE_PROPS)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + UpdateDialogElements(hwndDlg, pConInfo); + return TRUE; + } + case WM_NOTIFY: + { + if (!pConInfo) + { + break; + } + lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == UDN_DELTAPOS) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); - pConInfo->ci.HistoryBufferSize = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); - pConInfo->ci.NumberOfHistoryBuffers = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - else if (lppsn->hdr.code == PSN_APPLY) - { - if (!pConInfo->AppliedConfig) - { - return ApplyConsoleInfo(hwndDlg, pConInfo); - } - else - { - /* Options have already been applied */ - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR); - return TRUE; - } - } - break; - } - case WM_COMMAND: - { - if (!pConInfo) - { - break; - } - switch (LOWORD(wParam)) - { - case IDC_RADIO_SMALL_CURSOR: - { - pConInfo->ci.CursorSize = 0; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_RADIO_MEDIUM_CURSOR: - { - pConInfo->ci.CursorSize = 50; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_RADIO_LARGE_CURSOR: - { - pConInfo->ci.CursorSize = 100; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_RADIO_DISPLAY_WINDOW: - { - pConInfo->ci.FullScreen = FALSE; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_RADIO_DISPLAY_FULL: - { - pConInfo->ci.FullScreen = TRUE; - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_CHECK_QUICK_EDIT: - { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); + pConInfo->ci.HistoryBufferSize = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); + pConInfo->ci.NumberOfHistoryBuffers = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + else if (lppsn->hdr.code == PSN_APPLY) + { + if (!pConInfo->AppliedConfig) + { + return ApplyConsoleInfo(hwndDlg, pConInfo); + } + else + { + /* Options have already been applied */ + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR); + return TRUE; + } + } + break; + } + case WM_COMMAND: + { + if (!pConInfo) + { + break; + } + switch (LOWORD(wParam)) + { + case IDC_RADIO_SMALL_CURSOR: + { + pConInfo->ci.CursorSize = 0; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_MEDIUM_CURSOR: + { + pConInfo->ci.CursorSize = 50; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_LARGE_CURSOR: + { + pConInfo->ci.CursorSize = 100; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_DISPLAY_WINDOW: + { + pConInfo->ci.FullScreen = FALSE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_DISPLAY_FULL: + { + pConInfo->ci.FullScreen = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_QUICK_EDIT: + { lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); if (lResult == BST_CHECKED) { - pConInfo->ci.QuickEdit = FALSE; + pConInfo->ci.QuickEdit = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else if (lResult == BST_UNCHECKED) { - pConInfo->ci.QuickEdit = TRUE; + pConInfo->ci.QuickEdit = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_CHECK_INSERT_MODE: - { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_INSERT_MODE: + { lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); if (lResult == BST_CHECKED) { - pConInfo->ci.InsertMode = FALSE; + pConInfo->ci.InsertMode = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else if (lResult == BST_UNCHECKED) { - pConInfo->ci.InsertMode = TRUE; + pConInfo->ci.InsertMode = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - case IDC_CHECK_DISCARD_DUPLICATES: - { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_DISCARD_DUPLICATES: + { lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); if (lResult == BST_CHECKED) { - pConInfo->ci.HistoryNoDup = FALSE; + pConInfo->ci.HistoryNoDup = FALSE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else if (lResult == BST_UNCHECKED) { - pConInfo->ci.HistoryNoDup = TRUE; + pConInfo->ci.HistoryNoDup = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - } - default: - break; - } - break; - } - default: - break; - } - - return FALSE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + default: + break; + } + break; + } + default: + break; + } + + return FALSE; } static void UpdateDialogElements(HWND hwndDlg, PCONSOLE_PROPS pConInfo) { - HWND hDlgCtrl; - TCHAR szBuffer[MAX_PATH]; - - /* Update cursor size */ - if (pConInfo->ci.CursorSize == 0) - { - /* Small cursor */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - else if (pConInfo->ci.CursorSize == 50) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - else if (pConInfo->ci.CursorSize == 100) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); - } - - /* Update num buffers */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); - _stprintf(szBuffer, _T("%d"), pConInfo->ci.NumberOfHistoryBuffers); - SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); - - /* Update buffer size */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); - SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); - _stprintf(szBuffer, _T("%d"), pConInfo->ci.HistoryBufferSize); - SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); - - /* Update discard duplicates */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); - if (pConInfo->ci.HistoryNoDup) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - - /* Update full/window screen */ - if (pConInfo->ci.FullScreen) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - } - else - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - - hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - } - - /* Update quick edit */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); - if (pConInfo->ci.QuickEdit) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - - /* Update insert mode */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); - if (pConInfo->ci.InsertMode) - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - else - SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + HWND hDlgCtrl; + TCHAR szBuffer[MAX_PATH]; + + /* Update cursor size */ + if (pConInfo->ci.CursorSize == 0) + { + /* Small cursor */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else if (pConInfo->ci.CursorSize == 50) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + else if (pConInfo->ci.CursorSize == 100) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + } + + /* Update num buffers */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); + _stprintf(szBuffer, _T("%d"), pConInfo->ci.NumberOfHistoryBuffers); + SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); + + /* Update buffer size */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); + _stprintf(szBuffer, _T("%d"), pConInfo->ci.HistoryBufferSize); + SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); + + /* Update discard duplicates */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); + if (pConInfo->ci.HistoryNoDup) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + + /* Update full/window screen */ + if (pConInfo->ci.FullScreen) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + } + else + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_WINDOW); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + } + + /* Update quick edit */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); + if (pConInfo->ci.QuickEdit) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); + + /* Update insert mode */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); + if (pConInfo->ci.InsertMode) + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + else + SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); } 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] Sun Mar 3 15:47:52 2013 @@ -1,36 +1,36 @@ #pragma once -#define IDC_CPLICON 40 -#define IDS_CPLNAME 41 -#define IDS_CPLDESCRIPTION 42 -#define IDS_APPLY_SHORTCUT_ALL 43 +#define IDC_CPLICON 40 +#define IDS_CPLNAME 41 +#define IDS_CPLDESCRIPTION 42 +#define IDS_APPLY_SHORTCUT_ALL 43 -#define IDD_PROPPAGEOPTIONS 100 -#define IDD_PROPPAGEFONT 101 -#define IDD_PROPPAGELAYOUT 102 -#define IDD_PROPPAGECOLORS 103 -#define IDD_APPLYOPTIONS 104 +#define IDD_PROPPAGEOPTIONS 100 +#define IDD_PROPPAGEFONT 101 +#define IDD_PROPPAGELAYOUT 102 +#define IDD_PROPPAGECOLORS 103 +#define IDD_APPLYOPTIONS 104 // Options dialog -#define IDC_CHECK_QUICK_EDIT 200 -#define IDC_CHECK_INSERT_MODE 201 -#define IDC_CHECK_DISCARD_DUPLICATES 202 -#define IDC_EDIT_BUFFER_SIZE 203 -#define IDC_UPDOWN_BUFFER_SIZE 204 -#define IDC_EDIT_NUM_BUFFER 205 -#define IDC_UPDOWN_NUM_BUFFER 206 -#define IDC_RADIO_SMALL_CURSOR 207 -#define IDC_RADIO_MEDIUM_CURSOR 208 -#define IDC_RADIO_LARGE_CURSOR 209 -#define IDC_RADIO_DISPLAY_WINDOW 210 -#define IDC_RADIO_DISPLAY_FULL 211 +#define IDC_CHECK_QUICK_EDIT 200 +#define IDC_CHECK_INSERT_MODE 201 +#define IDC_CHECK_DISCARD_DUPLICATES 202 +#define IDC_EDIT_BUFFER_SIZE 203 +#define IDC_UPDOWN_BUFFER_SIZE 204 +#define IDC_EDIT_NUM_BUFFER 205 +#define IDC_UPDOWN_NUM_BUFFER 206 +#define IDC_RADIO_SMALL_CURSOR 207 +#define IDC_RADIO_MEDIUM_CURSOR 208 +#define IDC_RADIO_LARGE_CURSOR 209 +#define IDC_RADIO_DISPLAY_WINDOW 210 +#define IDC_RADIO_DISPLAY_FULL 211 // Apply dialog -#define IDC_RADIO_APPLY_ALL 300 -#define IDC_RADIO_APPLY_CURRENT 301 +#define IDC_RADIO_APPLY_ALL 300 +#define IDC_RADIO_APPLY_CURRENT 301 // Font dialog -#define IDC_CHECK_BOLD_FONTS 400 +#define IDC_CHECK_BOLD_FONTS 400 #define IDC_STATIC_SELECT_FONT_PREVIEW 401 #define IDC_FONT_SIZE_X 402 #define IDC_FONT_SIZE_Y 403 @@ -40,20 +40,20 @@ #define IDC_GROUPBOX_FONT_NAME 407 // Layout dialog -#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH 500 -#define IDC_EDIT_SCREEN_BUFFER_WIDTH 501 -#define IDC_EDIT_SCREEN_BUFFER_HEIGHT 502 -#define IDC_UPDOWN_SCREEN_BUFFER_HEIGHT 503 -#define IDC_EDIT_WINDOW_SIZE_WIDTH 504 -#define IDC_UPDOWN_WINDOW_SIZE_WIDTH 505 -#define IDC_EDIT_WINDOW_SIZE_HEIGHT 506 -#define IDC_UPDOWN_WINDOW_SIZE_HEIGHT 507 -#define IDC_EDIT_WINDOW_POS_LEFT 508 -#define IDC_UPDOWN_WINDOW_POS_LEFT 509 -#define IDC_EDIT_WINDOW_POS_TOP 510 -#define IDC_UPDOWN_WINDOW_POS_TOP 511 -#define IDC_CHECK_SYSTEM_POS_WINDOW 512 -#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513 +#define IDC_UPDOWN_SCREEN_BUFFER_WIDTH 500 +#define IDC_EDIT_SCREEN_BUFFER_WIDTH 501 +#define IDC_EDIT_SCREEN_BUFFER_HEIGHT 502 +#define IDC_UPDOWN_SCREEN_BUFFER_HEIGHT 503 +#define IDC_EDIT_WINDOW_SIZE_WIDTH 504 +#define IDC_UPDOWN_WINDOW_SIZE_WIDTH 505 +#define IDC_EDIT_WINDOW_SIZE_HEIGHT 506 +#define IDC_UPDOWN_WINDOW_SIZE_HEIGHT 507 +#define IDC_EDIT_WINDOW_POS_LEFT 508 +#define IDC_UPDOWN_WINDOW_POS_LEFT 509 +#define IDC_EDIT_WINDOW_POS_TOP 510 +#define IDC_UPDOWN_WINDOW_POS_TOP 511 +#define IDC_CHECK_SYSTEM_POS_WINDOW 512 +#define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513 // Color dialog #define IDC_RADIO_SCREEN_TEXT 600 @@ -86,5 +86,5 @@ #define IDC_STATIC_COLOR16 627 // String IDs -#define IDS_SCREEN_TEXT 700 -#define IDS_RASTERFONTS 701 +#define IDS_SCREEN_TEXT 700 +#define IDS_RASTERFONTS 701

11 years, 9 months

[hbelusca] 58415: [CONSOLE.DLL-KERNEL32-CONSRV] Fix the console properties dialog, when launching and transmitting console properties. Before, the properties dialog was directly launched by the con...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 3 15:35:12 2013 New Revision: 58415 URL: http://svn.reactos.org/svn/reactos?rev=58415&view=rev Log: [CONSOLE.DLL-KERNEL32-CONSRV] Fix the console properties dialog, when launching and transmitting console properties. Before, the properties dialog was directly launched by the console server (consrv), running with CSRSS (System) privileges, what constituted a security hole. Now, I create a remote thread in the running process owning the console for launching the properties dialog (thus it has only user privileges, and not System ones anymore). For that purpose, I basically took the technique described in the following paper (Cesar Cerrudo, "Story of a dumb patch", http://www.argeniss.com/research/MSBugPaper.pdf or http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf), where basically the console server shares the console properties via a shared memory section with the console properties dialog dll. The address of the thread which launches the dialog in the context of the console app is given to the console server the same way as we do for the control handler (called e.g. when you press Ctrl-C, etc...) Of course this is quite hackish, because you have the GUI interface split between the console server and the console properties dialog dll. Something far more elegant would be to put all the GUI thingie into a dedicated dll or exe, running with the same privileges as the console program itself (a kind of console -- or terminal -- emulator). [CONSOLE.DLL] Fix retriving / setting colors.c and other things. [CONSRV.DLL] - Fix retrieving / setting console properties from the registry (via the HKCU\Console\* keys), via the shell shortcuts (not totally done at the moment, because somebody has to implement properly that thing : http://msdn.microsoft.com/en-us/library/windows/desktop/bb773359(v=vs.85).a… (NT_CONSOLE_PROPS structure stored as a shortcut data block) (at application launching time), and via the console properties dialog. - Few DPRINTs removed. Added: branches/ros-csrss/win32ss/user/consrv/settings.c (with props) branches/ros-csrss/win32ss/user/consrv/settings.h (with props) Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt branches/ros-csrss/dll/cpl/console/colors.c branches/ros-csrss/dll/cpl/console/console.c branches/ros-csrss/dll/cpl/console/console.h branches/ros-csrss/dll/cpl/console/font.c branches/ros-csrss/dll/cpl/console/lang/fr-FR.rc branches/ros-csrss/dll/cpl/console/layout.c branches/ros-csrss/dll/cpl/console/options.c branches/ros-csrss/dll/win32/kernel32/client/console/console.c branches/ros-csrss/dll/win32/kernel32/client/console/init.c branches/ros-csrss/dll/win32/kernel32/include/console.h branches/ros-csrss/include/reactos/subsys/win/conmsg.h branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/consrv.h branches/ros-csrss/win32ss/user/consrv/guiconsole.c branches/ros-csrss/win32ss/user/consrv/guiconsole.h branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.c branches/ros-csrss/win32ss/user/consrv/tuiconsole.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/CMake… Modified: branches/ros-csrss/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/color… Modified: branches/ros-csrss/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/conso… Modified: branches/ros-csrss/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/font.… 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/… Modified: branches/ros-csrss/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/layou… Modified: branches/ros-csrss/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/console/optio… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/in… Modified: branches/ros-csrss/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/C… Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/g… Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… Added: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… Added: branches/ros-csrss/win32ss/user/consrv/settings.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t… Modified: branches/ros-csrss/win32ss/user/consrv/tuiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/t…

11 years, 9 months

[tkreuzer] 58414: [WIN32K] Add support for arbitrary scaling matrices when rendering glyphs. Partly fixes CORE-4657 Todo: handle glyph coordinates

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 3 14:43:53 2013 New Revision: 58414 URL: http://svn.reactos.org/svn/reactos?rev=58414&view=rev Log: [WIN32K] Add support for arbitrary scaling matrices when rendering glyphs. Partly fixes CORE-4657 Todo: handle glyph coordinates Modified: trunk/reactos/win32ss/drivers/font/ftfd/freetype.def trunk/reactos/win32ss/drivers/font/ftfd/ftfd.spec trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/drivers/font/ftfd/freetype.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/freetype.def [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/freetype.def [iso-8859-1] Sun Mar 3 14:43:53 2013 @@ -27,3 +27,4 @@ FT_Set_Pixel_Sizes FT_Vector_Transform FT_Vector_Unit + FT_Set_Transform Modified: trunk/reactos/win32ss/drivers/font/ftfd/ftfd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/ftfd.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/ftfd.spec [iso-8859-1] Sun Mar 3 14:43:53 2013 @@ -26,3 +26,4 @@ @ cdecl FT_Set_Pixel_Sizes() @ cdecl FT_Vector_Transform() @ cdecl FT_Vector_Unit() + @ cdecl FT_Set_Transform() Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Mar 3 14:43:53 2013 @@ -158,6 +158,39 @@ return TRUE; } +VOID +FtSetCoordinateTransform( + FT_Face face, + PDC pdc) +{ + FT_Matrix ftmatrix; + PMATRIX pmx; + FLOATOBJ efTemp; + + /* Get the DC's world-to-device transformation matrix */ + pmx = DC_pmxWorldToDevice(pdc); + + /* Create a freetype matrix, by converting to 16.16 fixpoint format */ + efTemp = pmx->efM11; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM12; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM21; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM22; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + + /* Set the transformation matrix */ + FT_Set_Transform(face, &ftmatrix, 0); +} + /* * IntLoadSystemFonts * @@ -1552,6 +1585,7 @@ /* FIXME: Should set character height if neg */ // (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? // dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); +// FtSetCoordinateTransform(face, dc); TEXTOBJ_UnlockText(TextObj); @@ -2152,6 +2186,8 @@ DPRINT1("Error in setting pixel sizes: %u\n", error); } + FtSetCoordinateTransform(face, dc); + use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -2434,6 +2470,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); + FtSetCoordinateTransform(Face, dc); IntUnLockFreeType; if (0 != Error) { @@ -3291,6 +3328,8 @@ goto fail; } + FtSetCoordinateTransform(face, dc); + /* * Process the vertical alignment and determine the yoff. */ @@ -3827,6 +3866,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); + FtSetCoordinateTransform(face, dc); for (i = FirstChar; i < FirstChar+Count; i++) { @@ -3994,6 +4034,7 @@ /* FIXME: Should set character height if neg */ (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight == 0 ? dc->ppdev->devinfo.lfDefaultFont.lfHeight : abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))); + FtSetCoordinateTransform(face, dc); for (i = FirstChar; i < FirstChar+Count; i++) {

11 years, 9 months

[ekohl] 58413: [ADVAPI32] Remove LsaRegisterPolicyChangeNotification and LsaUnregisterPolicyChangeNotification because they are not exported by advapi32.dll. These functions are exported by secur32...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 3 13:07:33 2013 New Revision: 58413 URL: http://svn.reactos.org/svn/reactos?rev=58413&view=rev Log: [ADVAPI32] Remove LsaRegisterPolicyChangeNotification and LsaUnregisterPolicyChangeNotification because they are not exported by advapi32.dll. These functions are exported by secur32.dll instead. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Mar 3 13:07:33 2013 @@ -391,7 +391,6 @@ @ stdcall LsaQuerySecurityObject(ptr long ptr) @ stdcall LsaQueryTrustedDomainInfo(ptr ptr long ptr) @ stdcall LsaQueryTrustedDomainInfoByName(ptr ptr long ptr) -@ stdcall LsaRegisterPolicyChangeNotification(long long) @ stdcall LsaRemoveAccountRights(ptr ptr long ptr long) @ stdcall LsaRemovePrivilegesFromAccount(ptr long ptr) @ stdcall LsaRetrievePrivateData(ptr ptr ptr) @@ -406,7 +405,6 @@ @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaSetTrustedDomainInformation(ptr ptr long ptr) @ stdcall LsaStorePrivateData(ptr ptr ptr) -@ stdcall LsaUnregisterPolicyChangeNotification(long long) @ stdcall MD4Final(ptr) @ stdcall MD4Init(ptr) @ stdcall MD4Update(ptr ptr long) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Mar 3 13:07:33 2013 @@ -1595,20 +1595,6 @@ /* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaRegisterPolicyChangeNotification(IN POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - IN HANDLE NotificationEventHandle) -{ - FIXME("LsaRegisterPolicyChangeNotification(%d %p) stub\n", - InformationClass, NotificationEventHandle); - return STATUS_UNSUCCESSFUL; -} - - -/* * @implemented */ NTSTATUS @@ -2026,18 +2012,4 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaUnregisterPolicyChangeNotification(IN POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - IN HANDLE NotificationEventHandle) -{ - FIXME("(%d %p) stub\n", - InformationClass, NotificationEventHandle); - return STATUS_SUCCESS; -} - /* EOF */

11 years, 9 months

[dgorbachev] 58412: [TRANSLATION] Update/add Turkish translations. Arda Tanrıkulu (ardatanrikulu~AT~gmail~DOT~com).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 3 03:30:57 2013 New Revision: 58412 URL: http://svn.reactos.org/svn/reactos?rev=58412&view=rev Log: [TRANSLATION] Update/add Turkish translations. Arda Tanrıkulu (ardatanrikulu~AT~gmail~DOT~com). Added: trunk/reactos/dll/win32/shdocvw/Tr.rc (with props) Modified: trunk/reactos/dll/win32/shdoclc/Tr.rc trunk/reactos/dll/win32/shdoclc/rsrc.rc trunk/reactos/dll/win32/shdocvw/shdocvw.rc Modified: trunk/reactos/dll/win32/shdoclc/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Tr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdoclc/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdoclc/Tr.rc [iso-8859-1] Sun Mar 3 03:30:57 2013 @@ -1,5 +1,5 @@ /* - * Copyright 2006 Fatih Aþýcý + * Copyright 2006 Fatih AÅÄ±cÄ± - 2012 Arda TanrÄ±kulu <ardatanrikulu(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +18,9 @@ #include "shdoclc.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDR_BROWSE_CONTEXT_MENU MENU @@ -25,53 +28,53 @@ POPUP "Default" { MENUITEM "&Geri", IDM_GOBACKWARD - MENUITEM "Ý&leri", IDM_GOFORWARD - MENUITEM SEPARATOR - MENUITEM "&Arkaplaný Farklý Kaydet...", IDM_SAVEBACKGROUND + MENUITEM "Ä°&leri", IDM_GOFORWARD + MENUITEM SEPARATOR + MENUITEM "&ArkaplanÄ± FarklÄ± Kaydet...", IDM_SAVEBACKGROUND MENUITEM "Arka&plan Yap", IDM_SETWALLPAPER - MENUITEM "Arkaplaný Ko&pyala", IDM_COPYBACKGROUND - MENUITEM "&Masaüstü Öðesi Yap", IDM_SETDESKTOPITEM - MENUITEM SEPARATOR - MENUITEM "&Tümünü Seç", IDM_SELECTALL - MENUITEM "&Yapýþtýr", IDM_PASTE - MENUITEM SEPARATOR - MENUITEM "K&ýsayol Oluþtur", IDM_CREATESHORTCUT - MENUITEM "Sýk Kullanýlanlara Ekle",IDM_ADDFAVORITES - MENUITEM "&Kaynaðý Göster", IDM_VIEWSOURCE + MENUITEM "ArkaplanÄ± Ko&pyala", IDM_COPYBACKGROUND + MENUITEM "&MasaÃ¼stÃ¼ ÃÄesi Yap", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§", IDM_SELECTALL + MENUITEM "&YapÄ±ÅtÄ±r", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "K&Ä±sayol OluÅtur", IDM_CREATESHORTCUT + MENUITEM "SÄ±k KullanÄ±lanlara Ekle",IDM_ADDFAVORITES + MENUITEM "&KaynaÄÄ± GÃ¶ster", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Kodlama", IDM_LANGUAGE MENUITEM SEPARATOR - MENUITEM "Ya&zdýr", IDM_PRINT + MENUITEM "Ya&zdÄ±r", IDM_PRINT MENUITEM "&Yenile", _IDM_REFRESH MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Özellikler", IDM_PROPERTIES + MENUITEM "&Ãzellikler", IDM_PROPERTIES } POPUP "Image" { - MENUITEM "&Baðlantýyý Aç", IDM_FOLLOWLINKC - MENUITEM "&Yeni Pencerede Aç", IDM_FOLLOWLINKN - MENUITEM "Hedefi &Farklý Kaydet...", IDM_SAVETARGET - MENUITEM "Hedefi Y&azdýr", IDM_PRINTTARGET - MENUITEM SEPARATOR - MENUITEM "Resmi &Göster", IDM_SHOWPICTURE - MENUITEM "&Resmi Farklý Kaydet...", IDM_SAVEPICTURE + MENUITEM "&BaÄlantÄ±yÄ± AÃ§", IDM_FOLLOWLINKC + MENUITEM "&Yeni Pencerede AÃ§", IDM_FOLLOWLINKN + MENUITEM "Hedefi &FarklÄ± Kaydet...", IDM_SAVETARGET + MENUITEM "Hedefi Y&azdÄ±r", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Resmi &GÃ¶ster", IDM_SHOWPICTURE + MENUITEM "&Resmi FarklÄ± Kaydet...", IDM_SAVEPICTURE MENUITEM "Resmi &E-postala...", IDM_MP_EMAILPICTURE - MENUITEM "Resmi Ya&zdýr...", IDM_MP_PRINTPICTURE + MENUITEM "Resmi Ya&zdÄ±r...", IDM_MP_PRINTPICTURE MENUITEM "Resimlerim dizinine &Git", IDM_MP_MYPICS MENUITEM "Arka&plan Yap", IDM_SETWALLPAPER - MENUITEM "Masaüstü Ö&ðesi Yap...", IDM_SETDESKTOPITEM + MENUITEM "MasaÃ¼stÃ¼ Ã&Äesi Yap...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR MENUITEM "K&es", IDM_CUT MENUITEM "K&opyala", IDM_COPY - MENUITEM "&Kýsayol Kopyala", IDM_COPYSHORTCUT - MENUITEM "Ya&pýþtýr", IDM_PASTE - MENUITEM SEPARATOR - MENUITEM "Sýk Ku&llanýlanlara Ekle...", IDM_ADDFAVORITES - MENUITEM SEPARATOR - MENUITEM SEPARATOR - MENUITEM "Ö&zellikler", IDM_PROPERTIES + MENUITEM "&KÄ±sayol Kopyala", IDM_COPYSHORTCUT + MENUITEM "Ya&pÄ±ÅtÄ±r", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "SÄ±k Ku&llanÄ±lanlara Ekle...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Ã&zellikler", IDM_PROPERTIES } POPUP "Control" @@ -80,54 +83,54 @@ MENUITEM SEPARATOR MENUITEM "K&es", IDM_CUT MENUITEM "&Kopyala", IDM_COPY - MENUITEM "Ya&pýþtýr", IDM_PASTE + MENUITEM "Ya&pÄ±ÅtÄ±r", IDM_PASTE MENUITEM "&Sil", IDM_DELETE MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Tümünü Seç", IDM_SELECTALL + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§", IDM_SELECTALL } POPUP "Table" { - POPUP "&Select" + POPUP "&SeÃ§" { - MENUITEM "&Hücre", IDM_CELLSELECT - MENUITEM "&Satýr", IDM_ROWSELECT - MENUITEM "&Sütun", IDM_COLUMNSELECT + MENUITEM "&HÃ¼cre", IDM_CELLSELECT + MENUITEM "&SatÄ±r", IDM_ROWSELECT + MENUITEM "&SÃ¼tun", IDM_COLUMNSELECT MENUITEM "&Tablo", IDM_TABLESELECT } MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Hücre Özellikleri", IDM_CELLPROPERTIES - MENUITEM "&Tablo Özellikleri", IDM_TABLEPROPERTIES + MENUITEM "&HÃ¼cre Ãzellikleri", IDM_CELLPROPERTIES + MENUITEM "&Tablo Ãzellikleri", IDM_TABLEPROPERTIES } POPUP "1DSite Select" { MENUITEM "&Kes", IDM_CUT MENUITEM "K&opyala", IDM_COPY - MENUITEM "Ya&pýþtýr", IDM_PASTE - MENUITEM "&Tümünü Seç", IDM_SELECTALL - MENUITEM "&Yazdýr", IDM_PRINT + MENUITEM "Ya&pÄ±ÅtÄ±r", IDM_PASTE + MENUITEM "&TÃ¼mÃ¼nÃ¼ SeÃ§", IDM_SELECTALL + MENUITEM "&YazdÄ±r", IDM_PRINT MENUITEM SEPARATOR } POPUP "Anchor" { - MENUITEM "&Aç", IDM_FOLLOWLINKC - MENUITEM "&Yeni Pencerede Aç", IDM_FOLLOWLINKN - MENUITEM "Hedefi &Farklý Kaydet...", IDM_SAVETARGET - MENUITEM "Hedefi Ya&zdýr", IDM_PRINTTARGET + MENUITEM "&AÃ§", IDM_FOLLOWLINKC + MENUITEM "&Yeni Pencerede AÃ§", IDM_FOLLOWLINKN + MENUITEM "Hedefi &FarklÄ± Kaydet...", IDM_SAVETARGET + MENUITEM "Hedefi Ya&zdÄ±r", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Kes", IDM_CUT MENUITEM "K&opyala", IDM_COPY - MENUITEM "K&ýsayol Kopyala", IDM_COPYSHORTCUT - MENUITEM "Ya&pýþtýr", IDM_PASTE - MENUITEM SEPARATOR - MENUITEM "Sýk Ku&llanýlanlara Ekle...", IDM_ADDFAVORITES - MENUITEM SEPARATOR - MENUITEM SEPARATOR - MENUITEM "&Özellikler", IDM_PROPERTIES + MENUITEM "K&Ä±sayol Kopyala", IDM_COPYSHORTCUT + MENUITEM "Ya&pÄ±ÅtÄ±r", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "SÄ±k Ku&llanÄ±lanlara Ekle...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Ãzellikler", IDM_PROPERTIES } POPUP "Context Unknown" @@ -137,60 +140,60 @@ POPUP "DYNSRC Image" { - MENUITEM "&Baðlantýyý Aç", IDM_FOLLOWLINKC - MENUITEM "&Yeni Pencerede Aç", IDM_FOLLOWLINKN - MENUITEM "Hedefi &Farklý Kaydet...", IDM_SAVETARGET - MENUITEM "Hedefi Ya&zdýr", IDM_PRINTTARGET - MENUITEM SEPARATOR - MENUITEM "Resmi &Göster", IDM_SHOWPICTURE - MENUITEM "&Vidyoyu Farklý Kaydet...", IDM_SAVEPICTURE + MENUITEM "&BaÄlantÄ±yÄ± AÃ§", IDM_FOLLOWLINKC + MENUITEM "&Yeni Pencerede AÃ§", IDM_FOLLOWLINKN + MENUITEM "Hedefi &FarklÄ± Kaydet...", IDM_SAVETARGET + MENUITEM "Hedefi Ya&zdÄ±r", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Resmi &GÃ¶ster", IDM_SHOWPICTURE + MENUITEM "&Vidyoyu FarklÄ± Kaydet...", IDM_SAVEPICTURE MENUITEM "Arka&plan Yap", IDM_SETWALLPAPER - MENUITEM "&Masaüstü Öðesi Yap...", IDM_SETDESKTOPITEM + MENUITEM "&MasaÃ¼stÃ¼ ÃÄesi Yap...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR MENUITEM "&Kes", IDM_CUT MENUITEM "K&opyala", IDM_COPY - MENUITEM "K&ýsayol Kopyala", IDM_COPYSHORTCUT - MENUITEM "&Yapýþtýr", IDM_PASTE - MENUITEM SEPARATOR - MENUITEM "Sýk Ku&llanýlanlara Ekle...", IDM_ADDFAVORITES - MENUITEM SEPARATOR - MENUITEM SEPARATOR - MENUITEM "Yürüt", IDM_DYNSRCPLAY + MENUITEM "K&Ä±sayol Kopyala", IDM_COPYSHORTCUT + MENUITEM "&YapÄ±ÅtÄ±r", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "SÄ±k Ku&llanÄ±lanlara Ekle...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "YÃ¼rÃ¼t", IDM_DYNSRCPLAY MENUITEM "Durdur", IDM_DYNSRCSTOP - MENUITEM "&Özellikler", IDM_PROPERTIES + MENUITEM "&Ãzellikler", IDM_PROPERTIES } POPUP "ART Image" { - MENUITEM "&Baðlantýyý Aç", IDM_FOLLOWLINKC - MENUITEM "&Yeni Pencerede Aç", IDM_FOLLOWLINKN - MENUITEM "Hedefi &Farklý Kaydet...", IDM_SAVETARGET - MENUITEM "Hedefi Ya&zdýr", IDM_PRINTTARGET - MENUITEM SEPARATOR - MENUITEM "Resmi &Göster", IDM_SHOWPICTURE - MENUITEM "Resmi &Farklý Kaydet...", IDM_SAVEPICTURE + MENUITEM "&BaÄlantÄ±yÄ± AÃ§", IDM_FOLLOWLINKC + MENUITEM "&Yeni Pencerede AÃ§", IDM_FOLLOWLINKN + MENUITEM "Hedefi &FarklÄ± Kaydet...", IDM_SAVETARGET + MENUITEM "Hedefi Ya&zdÄ±r", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "Resmi &GÃ¶ster", IDM_SHOWPICTURE + MENUITEM "Resmi &FarklÄ± Kaydet...", IDM_SAVEPICTURE MENUITEM "Arka&plan Yap", IDM_SETWALLPAPER - MENUITEM "&Masaüstü Öðesi Yap...", IDM_SETDESKTOPITEM + MENUITEM "&MasaÃ¼stÃ¼ ÃÄesi Yap...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR MENUITEM "&Kes", IDM_CUT MENUITEM "K&opyala", IDM_COPY - MENUITEM "K&ýsayol Kopyala", IDM_COPYSHORTCUT - MENUITEM "&Yapýþtýr", IDM_PASTE - MENUITEM SEPARATOR - MENUITEM "Sýk Ku&llanýlanlara Ekle...", IDM_ADDFAVORITES - MENUITEM SEPARATOR - MENUITEM "Yürüt", IDM_IMGARTPLAY + MENUITEM "K&Ä±sayol Kopyala", IDM_COPYSHORTCUT + MENUITEM "&YapÄ±ÅtÄ±r", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "SÄ±k Ku&llanÄ±lanlara Ekle...", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM "YÃ¼rÃ¼t", IDM_IMGARTPLAY MENUITEM "Durdur", IDM_IMGARTSTOP - MENUITEM "Geri Çevir", IDM_IMGARTREWIND - MENUITEM SEPARATOR - MENUITEM SEPARATOR - MENUITEM "&Özellikler", IDM_PROPERTIES + MENUITEM "Geri Ãevir", IDM_IMGARTREWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&Ãzellikler", IDM_PROPERTIES } POPUP "Debug" { /*FIXME: translate these*/ MENUITEM "Trace Tags", IDM_TRACETAGS - MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Kaynak BaÅarÄ±sÄ±zlÄ±klarÄ±", IDM_RESOURCEFAILURES MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO MENUITEM "Debug Break", IDM_DEBUGBREAK MENUITEM "Debug View", IDM_DEBUGVIEW @@ -199,39 +202,39 @@ MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS - MENUITEM "Memory Monitor", IDM_MEMORYMONITOR - MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS - MENUITEM "Save HTML", IDM_SAVEHTML - MENUITEM SEPARATOR - MENUITEM "&Browse View", IDM_BROWSEMODE - MENUITEM "&Edit View", IDM_EDITMODE + MENUITEM "Bellek MonitÃ¶rÃ¼", IDM_MEMORYMONITOR + MENUITEM "Performans ÃlÃ§erler", IDM_PERFORMANCEMETERS + MENUITEM "HTML'yi Kaydet", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&GÃ¶zatma GÃ¶rÃ¼nÃ¼mÃ¼", IDM_BROWSEMODE + MENUITEM "GÃ¶rÃ¼nÃ¼mÃ¼ DÃ¼z&enle", IDM_EDITMODE } POPUP "Vertical Scrollbar" { - MENUITEM "Buraya Kaydýr", IDM_SCROLL_HERE - MENUITEM SEPARATOR - MENUITEM "Üst", IDM_SCROLL_TOP + MENUITEM "Buraya KaydÄ±r", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "Ãst", IDM_SCROLL_TOP MENUITEM "Alt", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR - MENUITEM "Üstteki Sayfa", IDM_SCROLL_PAGEUP + MENUITEM "Ãstteki Sayfa", IDM_SCROLL_PAGEUP MENUITEM "Alttaki Sayfa", IDM_SCROLL_PAGEDOWN MENUITEM SEPARATOR - MENUITEM "Yukarý Kaydýr", IDM_SCROLL_UP - MENUITEM "Aþaðý Kaydýr", IDM_SCROLL_DOWN + MENUITEM "YukarÄ± KaydÄ±r", IDM_SCROLL_UP + MENUITEM "AÅaÄÄ± KaydÄ±r", IDM_SCROLL_DOWN } POPUP "Horizontal Scrollbar" { - MENUITEM "Buraya Kaydýr", IDM_SCROLL_HERE + MENUITEM "Buraya KaydÄ±r", IDM_SCROLL_HERE MENUITEM SEPARATOR MENUITEM "Sol Kenar", IDM_SCROLL_LEFTEDGE - MENUITEM "Sað Kenar", IDM_SCROLL_RIGHTEDGE + MENUITEM "SaÄ Kenar", IDM_SCROLL_RIGHTEDGE MENUITEM SEPARATOR MENUITEM "Soldaki Sayfa", IDM_SCROLL_PAGELEFT - MENUITEM "Saðdaki Sayfa", IDM_SCROLL_PAGERIGHT - MENUITEM SEPARATOR - MENUITEM "Sola Kaydýr", IDM_SCROLL_LEFT - MENUITEM "Saða Kaydýr", IDM_SCROLL_RIGHT + MENUITEM "SaÄdaki Sayfa", IDM_SCROLL_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "Sola KaydÄ±r", IDM_SCROLL_LEFT + MENUITEM "SaÄa KaydÄ±r", IDM_SCROLL_RIGHT } } Modified: trunk/reactos/dll/win32/shdoclc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shdoclc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdoclc/rsrc.rc [iso-8859-1] Sun Mar 3 03:30:57 2013 @@ -49,9 +49,6 @@ #ifdef LANGUAGE_SV_SE #include "Sv.rc" #endif -#ifdef LANGUAGE_TR_TR - #include "Tr.rc" -#endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE @@ -90,6 +87,9 @@ #ifdef LANGUAGE_SL_SI #include "Si.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "Uk.rc" #endif Added: trunk/reactos/dll/win32/shdocvw/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Tr.rc?re… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/Tr.rc (added) +++ trunk/reactos/dll/win32/shdocvw/Tr.rc [iso-8859-1] Sun Mar 3 03:30:57 2013 @@ -1,0 +1,91 @@ +/* + * Copyright 2010 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> + * + * Ãeviri 2012 Arda TanrÄ±kulu <ardatanrikulu(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "AÃ§" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Bir belgenin veya klasÃ¶rÃ¼n Internet adresini yazÄ±n. Internet Explorer sizin iÃ§in aÃ§acaktÄ±r.",-1,25, 5, 150,15 + LTEXT "AÃ§:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "Tamam", IDOK, 25, 50, 50, 15 + PUSHBUTTON "Ä°ptal", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Dosya" + { + POPUP "Y&eni" + { + MENUITEM "Pen&cere", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&AÃ§...", ID_BROWSE_OPEN + MENUITEM "&Kaydet", ID_BROWSE_SAVE + MENUITEM "&FarklÄ± Kaydet....", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Sayfa YapÄ±sÄ±...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Pr&int...", ID_BROWSE_PRINT + MENUITEM "BaskÄ± Ã&nizleme...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "Ã&zellikler", ID_BROWSE_PROPERTIES + MENUITEM "&Kapat", ID_BROWSE_QUIT + } + POPUP "&GÃ¶rÃ¼nÃ¼m" + { + POPUP "&AraÃ§ ÃubuklarÄ±" + { + MENUITEM "Standart Ã&ubuk", ID_BROWSE_BAR_STD + MENUITEM "&Adres ÃubuÄu", ID_BROWSE_BAR_ADDR + } + } + POPUP "&SÄ±k KullanÄ±lanlar" + { + MENUITEM "SÄ±k KullanÄ±lanlara &Ekle", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&YardÄ±m" + { + MENUITEM "Internet Explorer &HakkÄ±nda", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Geri" + IDS_TB_FORWARD "Ä°leri" + IDS_TB_STOP "Dur" + IDS_TB_REFRESH "Yenile" + IDS_TB_HOME "GiriÅ" + IDS_TB_PRINT "YazdÄ±r" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adres" +} Propchange: trunk/reactos/dll/win32/shdocvw/Tr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] Sun Mar 3 03:30:57 2013 @@ -80,6 +80,9 @@ #ifdef LANGUAGE_SV_SE #include "Sv.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "Tr.rc" +#endif #ifdef LANGUAGE_UK_UA #include "Uk.rc" #endif

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2013