Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[pschweitzer] 50836: [RTL] - Fixed RtlMultiByteToUnicodeN & RtlAnsiCharToUnicodeChar prototype - Added missing paged code marker to RtlAnsiCharToUnicodeChar - Added a small hack to RtlAnsiCharToUni...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 20 19:28:34 2011 New Revision: 50836 URL: http://svn.reactos.org/svn/reactos?rev=50836&view=rev Log: [RTL] - Fixed RtlMultiByteToUnicodeN & RtlAnsiCharToUnicodeChar prototype - Added missing paged code marker to RtlAnsiCharToUnicodeChar - Added a small hack to RtlAnsiCharToUnicodeChar. Indeed, when it's called during second stage, it's failing due to missing NLS table. Probably usetup that doesn't define a registry entry. And then, FreeLdr just passes null pointer. Modified: trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=50836&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sun Feb 20 19:28:34 2011 @@ -226,9 +226,9 @@ */ NTSTATUS NTAPI RtlMultiByteToUnicodeN( - IN PWCHAR UnicodeString, + OUT PWCHAR UnicodeString, IN ULONG UnicodeSize, - IN PULONG ResultSize, + OUT PULONG ResultSize, IN PCSTR MbString, IN ULONG MbSize) { @@ -286,7 +286,7 @@ *ResultSize = i * sizeof(WCHAR); } - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5083… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sun Feb 20 19:28:34 2011 @@ -33,13 +33,23 @@ */ WCHAR NTAPI -RtlAnsiCharToUnicodeChar(IN PUCHAR *AnsiChar) +RtlAnsiCharToUnicodeChar(IN OUT PUCHAR *AnsiChar) { ULONG Size; NTSTATUS Status; WCHAR UnicodeChar = L' '; - Size = (NlsLeadByteInfo[**AnsiChar] == 0) ? 1 : 2; + PAGED_CODE_RTL(); + + if (NlsLeadByteInfo) + { + Size = (NlsLeadByteInfo[**AnsiChar] == 0) ? 1 : 2; + } + else + { + DPRINT1("HACK::Shouldn't have happened! Consider fixing Usetup and registry entries it creates on install\n"); + Size = 1; + } Status = RtlMultiByteToUnicodeN(&UnicodeChar, sizeof(WCHAR),

13 years, 7 months

[pschweitzer] 50835: [WIN32CSR] Add a new API GetTempFile() that returns an identifier to be used for creating temporary files. This API should be in basesrv.dll

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 20 19:23:46 2011 New Revision: 50835 URL: http://svn.reactos.org/svn/reactos?rev=50835&view=rev Log: [WIN32CSR] Add a new API GetTempFile() that returns an identifier to be used for creating temporary files. This API should be in basesrv.dll Added: trunk/reactos/subsystems/win32/csrss/win32csr/file.c (with props) trunk/reactos/subsystems/win32/csrss/win32csr/file.h (with props) Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -511,7 +511,12 @@ DWORD NumberOfHistoryBuffers; DWORD dwFlags; } CSRSS_GET_HISTORY_INFO, *PCSRSS_GET_HISTORY_INFO, - CSRSS_SET_HISTORY_INFO, *PCSRSS_SET_HISTORY_INFO; + CSRSS_SET_HISTORY_INFO, *PCSRSS_SET_HISTORY_INFO;; + +typedef struct +{ + UINT UniqueID; +} CSRSS_GET_TEMP_FILE, *PCSRSS_GET_TEMP_FILE; #define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) @@ -592,6 +597,7 @@ #define SET_HISTORY_NUMBER_COMMANDS (0x45) #define GET_HISTORY_INFO (0x46) #define SET_HISTORY_INFO (0x47) +#define GET_TEMP_FILE (0x48) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -673,6 +679,7 @@ CSRSS_SET_HISTORY_NUMBER_COMMANDS SetHistoryNumberCommands; CSRSS_GET_HISTORY_INFO GetHistoryInfo; CSRSS_SET_HISTORY_INFO SetHistoryInfo; + CSRSS_GET_TEMP_FILE GetTempFile; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -87,6 +87,7 @@ CSRSS_DEFINE_API(SET_HISTORY_NUMBER_COMMANDS, CsrSetHistoryNumberCommands), CSRSS_DEFINE_API(GET_HISTORY_INFO, CsrGetHistoryInfo), CSRSS_DEFINE_API(SET_HISTORY_INFO, CsrSetHistoryInfo), + CSRSS_DEFINE_API(GET_TEMP_FILE, CsrGetTempFile), { 0, 0, NULL } }; Added: trunk/reactos/subsystems/win32/csrss/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.c (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -1,0 +1,33 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: subsys/csrss/win32csr/file.c + * PURPOSE: File handling + * PROGRAMMERS: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) + * NOTE: Belongs to basesrv.dll + */ + +/* INCLUDES ******************************************************************/ + +#include <w32csr.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +UINT CsrGetTempFileUnique; + +/* FUNCTIONS *****************************************************************/ + +CSR_API(CsrGetTempFile) +{ + DPRINT1("CsrGetTempFile entered\n"); + + /* Return 16-bits ID */ + Request->Data.GetTempFile.UniqueID = (++CsrGetTempFileUnique & 0xFFFF); + + DPRINT1("Returning: %u\n", Request->Data.GetTempFile.UniqueID); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/file.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/win32/csrss/win32csr/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.h (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.h [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -1,0 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: subsystem/win32/csrss/win32csr/file.h + * PURPOSE: File handling + * PROGRAMMERS: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) + * NOTE: Belongs to basesrv.dll + */ + +#pragma once + +#include "api.h" + +/* Api functions */ +CSR_API(CsrGetTempFile); + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/csrss/win32csr/file.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -18,6 +18,7 @@ #include <conio.h> #include <csrplugin.h> #include <desktopbg.h> +#include "file.h" #include "guiconsole.h" #include "tuiconsole.h" #include <win32csr.h> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sun Feb 20 19:23:46 2011 @@ -24,6 +24,7 @@ <file>desktopbg.c</file> <file>dllmain.c</file> <file>exitros.c</file> + <file>file.c</file> <file>guiconsole.c</file> <file>handle.c</file> <file>harderror.c</file>

13 years, 7 months

[janderwald] 50834: [USETUP] - Get rid of indirection See issue #5190 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 20 16:50:38 2011 New Revision: 50834 URL: http://svn.reactos.org/svn/reactos?rev=50834&view=rev Log: [USETUP] - Get rid of indirection See issue #5190 for more details. Modified: trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/inffile.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/usetup.h trunk/reactos/lib/inflib/infros.h Modified: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -39,13 +39,6 @@ #ifdef __REACTOS__ -VOID WINAPI -InfpCloseInfFile( - IN HINF InfHandle) -{ - InfCloseFile(InfHandle); -} - BOOL WINAPI InfpFindFirstLineW( IN HINF InfHandle, @@ -63,28 +56,6 @@ memcpy(Context, pContext, sizeof(INFCONTEXT)); InfFreeContext(pContext); return TRUE; -} - -BOOL WINAPI -InfpGetMultiSzFieldW( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT PWSTR ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize) -{ - return InfGetMultiSzField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); -} - -BOOL WINAPI -InfpGetStringFieldW( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT PWSTR ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize) -{ - return InfGetStringField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); } HINF WINAPI @@ -238,12 +209,4 @@ #endif /* !__REACTOS__ */ } -VOID INF_SetHeap( - IN PVOID Heap) -{ -#ifdef __REACTOS__ - InfSetHeap(Heap); -#endif -} - /* EOF */ Modified: trunk/reactos/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -34,14 +34,9 @@ #include <infcommon.h> -#define SetupCloseInfFile InfpCloseInfFile #define SetupFindFirstLineW InfpFindFirstLineW -#define SetupFindNextLine InfFindNextLine -#define SetupGetBinaryField InfGetBinaryField #define SetupGetFieldCount InfGetFieldCount #define SetupGetIntField InfGetIntField -#define SetupGetMultiSzFieldW InfpGetMultiSzFieldW -#define SetupGetStringFieldW InfpGetStringFieldW #define SetupOpenInfFileW InfpOpenInfFileW #define INF_STYLE_WIN4 0x00000002 @@ -55,32 +50,12 @@ PVOID Line; } INFCONTEXT; -VOID WINAPI -InfpCloseInfFile( - IN HINF InfHandle); - BOOL WINAPI InfpFindFirstLineW( IN HINF InfHandle, IN PCWSTR Section, IN PCWSTR Key, IN OUT PINFCONTEXT Context); - -BOOL WINAPI -InfpGetMultiSzFieldW( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT PWSTR ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize); - -BOOL WINAPI -InfpGetStringFieldW( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT PWSTR ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize); HINF WINAPI InfpOpenInfFileW( @@ -113,7 +88,4 @@ IN LCID LocaleId, OUT PUINT ErrorLine); -VOID INF_SetHeap( - IN PVOID Heap); - /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -3978,7 +3978,7 @@ RtlNormalizeProcessParams(Peb->ProcessParameters); ProcessHeap = Peb->ProcessHeap; - INF_SetHeap(ProcessHeap); + InfSetHeap(ProcessHeap); RunUSetup(); } #endif /* __REACTOS__ */ Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -646,7 +646,7 @@ DPRINT1("registry_callback() failed\n"); } - SetupCloseInfFile (hInf); + InfCloseFile (hInf); return TRUE; } Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -78,6 +78,36 @@ extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId; +#ifdef __REACTOS__ + +extern VOID InfSetHeap(PVOID Heap); +extern VOID InfCloseFile(HINF InfHandle); +extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); +extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); +extern BOOLEAN InfGetStringField(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +#define SetupCloseInfFile InfCloseFile +#define SetupFindNextLine InfFindNextLine +#define SetupGetBinaryField InfGetBinaryField +#define SetupGetMultiSzFieldW InfGetMultiSzField +#define SetupGetStringFieldW InfGetStringField + +#endif /* __REACTOS__ */ + typedef enum _PAGE_NUMBER { START_PAGE, Modified: trunk/reactos/lib/inflib/infros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infros.h?rev=50… ============================================================================== --- trunk/reactos/lib/inflib/infros.h [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/infros.h [iso-8859-1] Sun Feb 20 16:50:38 2011 @@ -14,7 +14,6 @@ #include <infcommon.h> -extern VOID InfSetHeap(PVOID Heap); extern NTSTATUS InfOpenBufferedFile(PHINF InfHandle, PVOID Buffer, ULONG BufferSize, @@ -25,13 +24,10 @@ extern NTSTATUS InfWriteFile(HINF InfHandle, PUNICODE_STRING FileName, PUNICODE_STRING HeaderComment); -extern VOID InfCloseFile(HINF InfHandle); extern BOOLEAN InfFindFirstLine(HINF InfHandle, PCWSTR Section, PCWSTR Key, PINFCONTEXT *Context); -extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); extern BOOLEAN InfFindFirstMatchLine(PINFCONTEXT ContextIn, PCWSTR Key, PINFCONTEXT ContextOut); @@ -41,24 +37,9 @@ extern LONG InfGetLineCount(HINF InfHandle, PCWSTR Section); extern LONG InfGetFieldCount(PINFCONTEXT Context); -extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); extern BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, PINT IntegerValue); -extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); -extern BOOLEAN InfGetStringField(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); extern BOOLEAN InfGetData(PINFCONTEXT Context, PWCHAR *Key, PWCHAR *Data);

13 years, 7 months

[janderwald] 50833: - Add french translation for runonce utility - Add svn:eol-style native property - Fix language id (SUBLANG_DEFAULT -> SUBLANG_NEUTRAL) See issue #5918 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 20 16:32:21 2011 New Revision: 50833 URL: http://svn.reactos.org/svn/reactos?rev=50833&view=rev Log: - Add french translation for runonce utility - Add svn:eol-style native property - Fix language id (SUBLANG_DEFAULT -> SUBLANG_NEUTRAL) See issue #5918 for more details. Added: trunk/reactos/base/system/runonce/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/system/runonce/rsrc.rc Added: trunk/reactos/base/system/runonce/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/f… ============================================================================== --- trunk/reactos/base/system/runonce/lang/fr-FR.rc (added) +++ trunk/reactos/base/system/runonce/lang/fr-FR.rc [iso-8859-1] Sun Feb 20 16:32:21 2011 @@ -1,0 +1,11 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_RUNONCE_DLG DIALOG DISCARDABLE 0, 0, 239, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS est en train d'installer les éléments suivants:", -1, 38, 8, 196, 18 + LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 5, 6, 21, 20 +END Propchange: trunk/reactos/base/system/runonce/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… ============================================================================== --- trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/rsrc.rc [iso-8859-1] Sun Feb 20 16:32:21 2011 @@ -1,5 +1,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/es-ES.rc" #include "lang/ja-JP.rc" #include "lang/ru-RU.rc"

13 years, 7 months

[tkreuzer] 50832: [KERNEL32] 64 bit compatibility fix for IsWow64Process. Patch by Thomas Faber <thfabba at gmx dot de>

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 20 12:07:28 2011 New Revision: 50832 URL: http://svn.reactos.org/svn/reactos?rev=50832&view=rev Log: [KERNEL32] 64 bit compatibility fix for IsWow64Process. Patch by Thomas Faber <thfabba at gmx dot de> Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Sun Feb 20 12:07:28 2011 @@ -1011,7 +1011,7 @@ IsWow64Process(HANDLE hProcess, PBOOL Wow64Process) { - ULONG pbi; + ULONG_PTR pbi; NTSTATUS Status; Status = NtQueryInformationProcess(hProcess,

13 years, 8 months

[tkreuzer] 50831: [NTOSKRNL] Halfplement (win32 only) ProcessWow64Information case in NtQueryInformationProcess. Patch by Samuel Serapion. See issue #5916 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 20 11:27:07 2011 New Revision: 50831 URL: http://svn.reactos.org/svn/reactos?rev=50831&view=rev Log: [NTOSKRNL] Halfplement (win32 only) ProcessWow64Information case in NtQueryInformationProcess. Patch by Samuel Serapion. See issue #5916 for more details. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=50… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Feb 20 11:27:07 2011 @@ -469,11 +469,26 @@ NULL); if (!NT_SUCCESS(Status)) break; - DPRINT1("Not implemented: ProcessWow64Information\n"); + /* Protect write in SEH */ + _SEH2_TRY + { +#ifdef _WIN64 + DPRINT1("Not implemented: ProcessWow64Information\n"); + Status = STATUS_NOT_IMPLEMENTED; +#else + /* Wow64 not present */ + *(PULONG_PTR)ProcessInformation = 0; +#endif + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Dereference the process */ ObDereferenceObject(Process); - Status = STATUS_NOT_IMPLEMENTED; break; /* Virtual Memory Statistics */

13 years, 8 months

[tkreuzer] 50830: [CHARMAP] Patch by Carlo Bramini (carlo bramix at libero dot it) - Make the text copy field a richedit control. - Use WM_CHAR to copy the characters - Fix definition of MSFTEDIT_C...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 20 10:55:48 2011 New Revision: 50830 URL: http://svn.reactos.org/svn/reactos?rev=50830&view=rev Log: [CHARMAP] Patch by Carlo Bramini (carlo bramix at libero dot it) - Make the text copy field a richedit control. - Use WM_CHAR to copy the characters - Fix definition of MSFTEDIT_CLASS for the resource compiler See issue #5275 for more details. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/charmap/lang/bg-BG.rc trunk/reactos/base/applications/charmap/lang/ca-ES.rc trunk/reactos/base/applications/charmap/lang/cs-CZ.rc trunk/reactos/base/applications/charmap/lang/de-DE.rc trunk/reactos/base/applications/charmap/lang/el-GR.rc trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/lang/es-ES.rc trunk/reactos/base/applications/charmap/lang/fr-FR.rc trunk/reactos/base/applications/charmap/lang/id-ID.rc trunk/reactos/base/applications/charmap/lang/it-IT.rc trunk/reactos/base/applications/charmap/lang/ja-JP.rc trunk/reactos/base/applications/charmap/lang/ko-KR.rc trunk/reactos/base/applications/charmap/lang/lt-LT.rc trunk/reactos/base/applications/charmap/lang/nl-NL.rc trunk/reactos/base/applications/charmap/lang/no-NO.rc trunk/reactos/base/applications/charmap/lang/pl-PL.rc trunk/reactos/base/applications/charmap/lang/pt-BR.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/sk-SK.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/charmap/lang/zh-CN.rc trunk/reactos/base/applications/charmap/lang/zh-TW.rc trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/precomp.h trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -133,57 +133,96 @@ } } - +// Copy collected characters into the clipboard +static +void +CopyCharacters(HWND hDlg) +{ + HWND hText = GetDlgItem(hDlg, IDC_TEXTBOX); + DWORD dwStart, dwEnd; + + // Acquire selection limits + SendMessage(hText, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + + // Test if the whose text is unselected + if(dwStart == dwEnd) { + + // Select the whole text + SendMessageW(hText, EM_SETSEL, 0, -1); + + // Copy text + SendMessageW(hText, WM_COPY, 0, 0); + + // Restore previous values + SendMessageW(hText, EM_SETSEL, (WPARAM)dwStart, (LPARAM)dwEnd); + + } else { + + // Copy text + SendMessageW(hText, WM_COPY, 0, 0); + } +} + +// Recover charset for the given font +static +BYTE +GetFontMetrics(HWND hWnd, HFONT hFont) +{ + TEXTMETRIC tmFont; + HGDIOBJ hOldObj; + HDC hDC; + + hDC = GetDC(hWnd); + hOldObj = SelectObject(hDC, hFont); + GetTextMetrics(hDC, &tmFont); + SelectObject(hDC, hOldObj); + ReleaseDC(hWnd, hDC); + + return tmFont.tmCharSet; +} + +// Select a new character static VOID -AddCharToSelection(HWND hText, - WCHAR ch) -{ - LPWSTR lpText; - INT Len = GetWindowTextLength(hText); - - if (Len != 0) +AddCharToSelection(HWND hDlg, WCHAR ch) +{ + HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP); + HWND hText = GetDlgItem(hDlg, IDC_TEXTBOX); + HFONT hFont; + LOGFONT lFont; + CHARFORMAT cf; + + // Retrieve current character selected + if (ch == 0) { - lpText = HeapAlloc(GetProcessHeap(), - 0, - (Len + 2) * sizeof(WCHAR)); - - if (lpText) - { - LPWSTR lpStr = lpText; - - SendMessageW(hText, - WM_GETTEXT, - Len + 1, - (LPARAM)lpStr); - - lpStr += Len; - *lpStr = ch; - lpStr++; - *lpStr = L'\0'; - - SendMessageW(hText, - WM_SETTEXT, - 0, - (LPARAM)lpText); - - HeapFree(GetProcessHeap(), - 0, - lpText); - } - } - else - { - WCHAR szText[2]; - - szText[0] = ch; - szText[1] = L'\0'; - - SendMessageW(hText, - WM_SETTEXT, - 0, - (LPARAM)szText); - } + ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); + if (!ch) + return; + } + + // Retrieve current selected font + hFont = (HFONT)SendMessage(hMap, FM_GETHFONT, 0, 0); + + // Recover LOGFONT structure from hFont + if (!GetObject(hFont, sizeof(LOGFONT), &lFont)) + return; + + // Recover font properties of Richedit control + ZeroMemory(&cf, sizeof(cf)); + cf.cbSize = sizeof(cf); + SendMessage(hText, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + + // Apply properties of the new font + cf.bCharSet = GetFontMetrics(hText, hFont); + + // Update font name + wcscpy(cf.szFaceName, lFont.lfFaceName); + + // Update font properties + SendMessage(hText, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf); + + // Send selected character to Richedit + SendMessage(hText, WM_CHAR, (WPARAM)ch, 0); } @@ -204,6 +243,7 @@ case WM_INITDIALOG: { HMENU hSysMenu; + DWORD evMask; hSmIcon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_ICON), @@ -256,6 +296,12 @@ lpAboutText); } } + + // Configure Richedi control for sending notification changes. + evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0); + evMask |= ENM_CHANGE; + SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask); + return TRUE; } @@ -264,41 +310,39 @@ switch(LOWORD(wParam)) { case IDC_FONTMAP: - { switch (HIWORD(wParam)) { case FM_SETCHAR: - AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), - LOWORD(lParam)); + AddCharToSelection(hDlg, LOWORD(lParam)); break; } - } - break; + break; case IDC_FONTCOMBO: - { if (HIWORD(wParam) == CBN_SELCHANGE) { ChangeMapFont(hDlg); } - } - break; + break; case IDC_SELECT: - { - WCHAR ch; - HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP); - - ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0); - - if (ch) - { - AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), - ch); + AddCharToSelection(hDlg, 0); + break; + + case IDC_TEXTBOX: + switch (HIWORD(wParam)) { + case EN_CHANGE: + if (GetWindowTextLength(GetDlgItem(hDlg, IDC_TEXTBOX)) == 0) + EnableWindow(GetDlgItem(hDlg, IDC_COPY), FALSE); + else + EnableWindow(GetDlgItem(hDlg, IDC_COPY), TRUE); + break; } - - break; - } + break; + + case IDC_COPY: + CopyCharacters(hDlg); + break; case IDOK: if (hSmIcon) @@ -306,7 +350,7 @@ if (hBgIcon) DestroyIcon(hBgIcon); EndDialog(hDlg, 0); - break; + break; } } break; @@ -347,6 +391,7 @@ { INITCOMMONCONTROLSEX iccx; INT Ret = 1; + HMODULE hRichEd20; hInstance = hInst; @@ -356,11 +401,17 @@ if (RegisterMapClasses(hInstance)) { - Ret = DialogBoxW(hInstance, - MAKEINTRESOURCEW(IDD_CHARMAP), - NULL, - DlgProc) >= 0; - + hRichEd20 = LoadLibraryW(L"RICHED20.DLL"); + + if (hRichEd20 != NULL) + { + Ret = DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_CHARMAP), + NULL, + DlgProc) >= 0; + + FreeLibrary(hRichEd20); + } UnregisterMapClasses(hInstance); } Modified: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -1,5 +1,6 @@ #include <windows.h> #include <commctrl.h> +#include <richedit.h> #include "resource.h" Modified: trunk/reactos/base/applications/charmap/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/bg-BG.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Ïîìîù", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Çíàöè çà çàïîìíÿíå:", IDC_STATIC, 3, 188, 75, 9 - EDITTEXT IDC_TEXTBOX, 79, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Èçáîð", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Çàïîìíÿíå", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Ðaçøèðåí èçãëåä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ca-ES.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Ajuda", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Caràcters a copiar :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copia", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Vista avançada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/cs-CZ.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -15,7 +15,7 @@ PUSHBUTTON "Nápovìda", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Znaky ke zkopírování:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Oznaèit", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopírovat", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Pokroèilé zobrazení", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/de-DE.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Hilfe", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Zeichenauswahl:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Auswählen", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Erweiterte Ansicht", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/el-GR.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -12,7 +12,7 @@ CONTROL "",IDC_FONTMAP,"FontMapWnd",WS_VSCROLL | WS_TABSTOP,20, 22,266,156 LTEXT "×áñáêôÞñåò ðñïò áíôéãñáöÞ :",IDC_STATIC,6,184,66,17 - EDITTEXT IDC_TEXTBOX,74,186,114,13 + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "ÅðéëïãÞ",IDC_SELECT,194,186,44,13 PUSHBUTTON "ÁíôéãñáöÞ",IDC_COPY,242,186,44,13,WS_DISABLED END Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Characters to copy:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/es-ES.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Ayuda", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Caracteres a copiar :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Seleccionar", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copiar", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Vista Avanzada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Aide", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Caractères à copier :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Sélectionner", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Vue avancée", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/id-ID.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Bantuan", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Karakter untuk di-copy :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Pilih", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/it-IT.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Aiuto", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Caratteri da copiare :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Selezionare", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copiare", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Visualizzazione avanzata", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ja-JP.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "wv", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Rs[·é¶:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Ið", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Rs[", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Ú×\\¦", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ko-KR.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -13,7 +13,7 @@ PUSHBUTTON "µµ¿ò¸»", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "º¹»çÇÒ ¹®ÀÚ:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "¼±ÅÃ", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "º¹»ç", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "È®Àå ¸ðµå", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/lt-LT.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -19,7 +19,7 @@ PUSHBUTTON "Pagalba", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9 - EDITTEXT IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopijuoti", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/nl-NL.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Te kopiëren tekens:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Selecteren", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopiëren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Geavanceerde weergave", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/no-NO.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Hjelp", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Kopier følgende tegn:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Velg", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopier", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Avansert visning", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/pl-PL.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -16,7 +16,7 @@ PUSHBUTTON "Pomo&c", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "&Znaki do skopiowania:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Wy&bierz", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "&Kopiuj", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Widok z&aawansowany", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/pt-BR.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -10,7 +10,7 @@ PUSHBUTTON "Aj&uda", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Caracteres a serem copiados :", IDC_STATIC, 6, 183, 66, 17 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Selecionar", IDC_SELECT, 194, 186, 46, 13 PUSHBUTTON "Copiar", IDC_COPY, 244, 186, 46, 13, WS_DISABLED //AUTOCHECKBOX "Modo de exibição avançado", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -12,7 +12,7 @@ PUSHBUTTON "Ñïðàâêà", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Êîïèðîâàòü ñèìâîë:", IDC_STATIC, 6, 188, 95, 9 - EDITTEXT IDC_TEXTBOX, 80, 186, 109, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -19,7 +19,7 @@ PUSHBUTTON "&Pomocník", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Kopírova &znaky:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "&Vybra", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "&Kopírova", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "R&ozírené zobrazenie", IDC_ADVVIEW, 10, 204, 75, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -18,7 +18,7 @@ PUSHBUTTON "Äîâ³äêà", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "Äëÿ êîï³þâàííÿ :", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîï³þâàòè", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Ðîçøèðåíèé âèãëÿä", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/zh-CN.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -12,7 +12,7 @@ PUSHBUTTON "ËµÃ÷", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "´ý¸´ÖÆµÄ×Ö·û:", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Ñ¡Ôñ", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "¸´ÖÆ", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/zh-TW.rc [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -12,7 +12,7 @@ PUSHBUTTON "»¡©ú", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 LTEXT "«Ý½Æ»sªº¦r²Å¡G", IDC_STATIC, 6, 188, 66, 9 - EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "¿ï¾Ü", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "½Æ»s", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -529,6 +529,9 @@ return infoPtr->pActiveCell->ch; } + case FM_GETHFONT: + return (LRESULT)infoPtr->hFont; + case WM_PAINT: { OnPaint(infoPtr, Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -5,6 +5,7 @@ #include <stdlib.h> #include <windows.h> #include <commctrl.h> +#include <richedit.h> #include "resource.h" #define XCELLS 20 @@ -12,9 +13,10 @@ #define XLARGE 45 #define YLARGE 25 -#define FM_SETFONT (WM_USER + 1) -#define FM_GETCHAR (WM_USER + 2) -#define FM_SETCHAR (WM_USER + 3) +#define FM_SETFONT (WM_USER + 1) +#define FM_GETCHAR (WM_USER + 2) +#define FM_SETCHAR (WM_USER + 3) +#define FM_GETHFONT (WM_USER + 4) extern HINSTANCE hInstance; Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Sun Feb 20 10:55:48 2011 @@ -32,19 +32,20 @@ #define cchTextLimitDefault 0x7fff -#if defined(__GNUC__) +#if defined(_MSC_VER) || defined(RC_INVOKED) +# define MSFTEDIT_CLASS L"RichEdit50W" +#elif defined(__GNUC__) # define MSFTEDIT_CLASS (const WCHAR []){ 'R','i','c','h','E','d','i','t','5','0','W',0 } -#elif defined(_MSC_VER) -# define MSFTEDIT_CLASS L"RichEdit50W" #else static const WCHAR MSFTEDIT_CLASS[] = { 'R','i','c','h','E','d','i','t','5','0','W',0 }; #endif #define RICHEDIT_CLASS20A "RichEdit20A" -#if defined(__GNUC__) + +#if defined(_MSC_VER) || defined(RC_INVOKED) +# define RICHEDIT_CLASS20W L"RichEdit20W" +#elif defined(__GNUC__) # define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 } -#elif defined(_MSC_VER) -# define RICHEDIT_CLASS20W L"RichEdit20W" #else static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; #endif

13 years, 8 months

[ekohl] 50829: [SETUPAPI] Implement CM_Get_Hardware_Profile_Info[_Ex]A/W.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 20 10:44:30 2011 New Revision: 50829 URL: http://svn.reactos.org/svn/reactos?rev=50829&view=rev Log: [SETUPAPI] Implement CM_Get_Hardware_Profile_Info[_Ex]A/W. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 20 10:44:30 2011 @@ -2627,6 +2627,114 @@ { ret = PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName, ulHardwareProfile, pulValue, NULL, NULL, 0, 0); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** + * CM_Get_Hardware_Profile_InfoA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoA( + ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags) +{ + TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags); + + return CM_Get_Hardware_Profile_Info_ExA(ulIndex, pHWProfileInfo, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Hardware_Profile_InfoW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoW( + ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags) +{ + TRACE("%lu %p %lx\n", ulIndex, pHWProfileInfo, ulFlags); + + return CM_Get_Hardware_Profile_Info_ExW(ulIndex, pHWProfileInfo, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Hardware_Profile_Info_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExA( + ULONG ulIndex, PHWPROFILEINFO_A pHWProfileInfo, ULONG ulFlags, + HMACHINE hMachine) +{ + HWPROFILEINFO_W LocalProfileInfo; + CONFIGRET ret; + + TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine); + + if (pHWProfileInfo == NULL) + return CR_INVALID_POINTER; + + ret = CM_Get_Hardware_Profile_Info_ExW(ulIndex, &LocalProfileInfo, + ulFlags, hMachine); + if (ret == CR_SUCCESS) + { + pHWProfileInfo->HWPI_ulHWProfile = LocalProfileInfo.HWPI_ulHWProfile; + pHWProfileInfo->HWPI_dwFlags = LocalProfileInfo.HWPI_dwFlags; + + if (WideCharToMultiByte(CP_ACP, + 0, + LocalProfileInfo.HWPI_szFriendlyName, + lstrlenW(LocalProfileInfo.HWPI_szFriendlyName) + 1, + pHWProfileInfo->HWPI_szFriendlyName, + MAX_PROFILE_LEN, + NULL, + NULL) == 0) + ret = CR_FAILURE; + } + + return ret; +} + + +/*********************************************************************** + * CM_Get_Hardware_Profile_Info_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExW( + ULONG ulIndex, PHWPROFILEINFO_W pHWProfileInfo, ULONG ulFlags, + HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + CONFIGRET ret; + + TRACE("%lu %p %lx %lx\n", ulIndex, pHWProfileInfo, ulFlags, hMachine); + + if (pHWProfileInfo == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + RpcTryExcept + { + ret = PNP_GetHwProfInfo(BindingHandle, ulIndex, pHWProfileInfo, + sizeof(HWPROFILEINFO_W), 0); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 20 10:44:30 2011 @@ -110,10 +110,10 @@ @ stdcall CM_Get_HW_Prof_FlagsW(wstr long ptr long) @ stdcall CM_Get_HW_Prof_Flags_ExA(str long ptr long long) @ stdcall CM_Get_HW_Prof_Flags_ExW(wstr long ptr long long) -@ stub CM_Get_Hardware_Profile_InfoA -@ stub CM_Get_Hardware_Profile_InfoW -@ stub CM_Get_Hardware_Profile_Info_ExA -@ stub CM_Get_Hardware_Profile_Info_ExW +@ stdcall CM_Get_Hardware_Profile_InfoA(long ptr long) +@ stdcall CM_Get_Hardware_Profile_InfoW(long ptr long) +@ stdcall CM_Get_Hardware_Profile_Info_ExA(long ptr long long) +@ stdcall CM_Get_Hardware_Profile_Info_ExW(long ptr long long) @ stdcall CM_Get_Log_Conf_Priority(ptr ptr long) @ stdcall CM_Get_Log_Conf_Priority_Ex(ptr ptr long long) @ stdcall CM_Get_Next_Log_Conf(ptr ptr long)

13 years, 8 months

[fireball] 50828: [RTL/DPH] - Fix a bug with node count in RtlpDphAddNewPool(). - Unprotect needed amount of memory in RtlpDphSetProtectionBeforeUse() instead of always assuming PAGE_SIZE. - Fix an...

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 20 09:54:01 2011 New Revision: 50828 URL: http://svn.reactos.org/svn/reactos?rev=50828&view=rev Log: [RTL/DPH] - Fix a bug with node count in RtlpDphAddNewPool(). - Unprotect needed amount of memory in RtlpDphSetProtectionBeforeUse() instead of always assuming PAGE_SIZE. - Fix an incorrect virtual block pointer calculation in RtlpPageHeapAllocate(). - Silence RtlpDphShouldAllocateInPageHeap() debug print. - Add helpful debug prints (disabled by default). - Some code cleanup for better readibility. - Heap create, destroy and allocating a block from the heap work now. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sun Feb 20 09:54:01 2011 @@ -313,7 +313,7 @@ &Size, Type, Protection); - DPRINT1("Page heap: AllocVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); + DPRINT("Page heap: AllocVm (%p, %p, %x) status %x \n", Base, Size, Type, Status); /* Check for failures */ if (!NT_SUCCESS(Status)) { @@ -434,6 +434,8 @@ BOOLEAN NewElement; PVOID AddressUserData; + DPRINT("RtlpDphPlaceOnBusyList(%p %p)\n", DphRoot, DphNode); + /* Add it to the AVL busy nodes table */ DphRoot->NodeToAllocate = DphNode; AddressUserData = RtlInsertElementGenericTableAvl(&DphRoot->BusyNodesTable, @@ -451,35 +453,35 @@ } VOID NTAPI -RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { /* DphNode is being added to the tail of the list */ - DphNode->pNextAlloc = NULL; + Node->pNextAlloc = NULL; /* Add it to the tail of the linked list */ if (DphRoot->pNodePoolListTail) - DphRoot->pNodePoolListTail->pNextAlloc = DphNode; + DphRoot->pNodePoolListTail->pNextAlloc = Node; else - DphRoot->pNodePoolListHead = DphNode; - DphRoot->pNodePoolListTail = DphNode; + DphRoot->pNodePoolListHead = Node; + DphRoot->pNodePoolListTail = Node; /* Update byte counts taking in account this new node */ DphRoot->nNodePools++; - DphRoot->nNodePoolBytes += DphNode->nVirtualBlockSize; -} - -VOID NTAPI -RtlpDphPlaceOnVirtualList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) + DphRoot->nNodePoolBytes += Node->nVirtualBlockSize; +} + +VOID NTAPI +RtlpDphPlaceOnVirtualList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK Node) { /* Add it to the head of the virtual list */ - DphNode->pNextAlloc = DphRoot->pVirtualStorageListHead; + Node->pNextAlloc = DphRoot->pVirtualStorageListHead; if (!DphRoot->pVirtualStorageListHead) - DphRoot->pVirtualStorageListTail = DphNode; - DphRoot->pVirtualStorageListHead = DphNode; + DphRoot->pVirtualStorageListTail = Node; + DphRoot->pVirtualStorageListHead = Node; /* Update byte counts taking in account this new node */ DphRoot->nVirtualStorageRanges++; - DphRoot->nVirtualStorageBytes += DphNode->nVirtualBlockSize; + DphRoot->nVirtualStorageBytes += Node->nVirtualBlockSize; } PDPH_HEAP_BLOCK NTAPI @@ -508,7 +510,8 @@ { /* Add it back to the head of the unused list */ Node->pNextAlloc = DphRoot->pUnusedNodeListHead; - if (!DphRoot->pUnusedNodeListHead) DphRoot->pUnusedNodeListTail = Node; + if (!DphRoot->pUnusedNodeListHead) + DphRoot->pUnusedNodeListTail = Node; DphRoot->pUnusedNodeListHead = Node; /* Increase amount of unused nodes */ @@ -522,6 +525,8 @@ /* Make sure Adjacency list pointers are biased */ //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); + + DPRINT("RtlpDphRemoveFromAvailableList(%p %p)\n", DphRoot, Node); /* Remove it from the list */ RemoveEntryList(&Node->AvailableEntry); @@ -565,6 +570,8 @@ PLIST_ENTRY AvailListHead; PLIST_ENTRY CurEntry; + DPRINT("RtlpDphCoalesceNodeIntoAvailable(%p %p)\n", DphRoot, Node); + /* Update heap counters */ DphRoot->nAvailableAllocationBytesCommitted += Node->nVirtualBlockSize; DphRoot->nAvailableAllocations++; @@ -658,14 +665,18 @@ RtlpDphAddNewPool(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK NodeBlock, PVOID Virtual, SIZE_T Size, BOOLEAN PlaceOnPool) { PDPH_HEAP_BLOCK DphNode, DphStartNode; - ULONG NodeCount; - - NodeCount = (Size >> 6) - 1; + ULONG NodeCount, i; + + //NodeCount = (Size >> 6) - 1; + NodeCount = (Size / sizeof(DPH_HEAP_BLOCK)); DphStartNode = Virtual; /* Set pNextAlloc for all blocks */ - for (DphNode = Virtual; NodeCount > 0; DphNode++, NodeCount--) + for (DphNode = Virtual, i=NodeCount-1; i > 0; i--) + { DphNode->pNextAlloc = DphNode + 1; + DphNode = DphNode->pNextAlloc; + } /* and the last one */ DphNode->pNextAlloc = NULL; @@ -797,13 +808,13 @@ } else { - Base = VirtualBlock + UserSize; + Base = VirtualBlock + PAGE_SIZE; } // FIXME: It should be different, but for now it's fine Protection = PAGE_READWRITE; - return RtlpDphProtectVm(Base, PAGE_SIZE, Protection); + return RtlpDphProtectVm(Base, UserSize, Protection); } PDPH_HEAP_BLOCK NTAPI @@ -1284,7 +1295,8 @@ RtlpDphShouldAllocateInPageHeap(PDPH_HEAP_ROOT DphRoot, SIZE_T Size) { - UNIMPLEMENTED; + //UNIMPLEMENTED; + /* Always use page heap for now */ return TRUE; } @@ -1517,9 +1529,10 @@ PDPH_HEAP_ROOT DphRoot; PDPH_HEAP_BLOCK Node, AllocatedNode; BOOLEAN Biased = FALSE; - ULONG TotalSize, UserSize; + ULONG TotalSize, AccessSize; NTSTATUS Status; SIZE_T UserActualSize; + PVOID Ptr; /* Check requested size */ if (Size > 0x7FF00000) @@ -1569,8 +1582,8 @@ } /* Calculate sizes */ - UserSize = ROUND_UP(Size + sizeof(DPH_BLOCK_INFORMATION), PAGE_SIZE); - TotalSize = UserSize + PAGE_SIZE; + AccessSize = ROUND_UP(Size + sizeof(DPH_BLOCK_INFORMATION), PAGE_SIZE); + TotalSize = AccessSize + PAGE_SIZE; // RtlpDphAllocateNode(DphRoot); Node = RtlpDphFindAvailableMemory(DphRoot, TotalSize, TRUE); @@ -1587,11 +1600,13 @@ ASSERT(Node->nVirtualBlockSize >= TotalSize); /* Set protection */ - Status = RtlpDphSetProtectionBeforeUse(DphRoot, Node->pVirtualBlock, UserSize); + Status = RtlpDphSetProtectionBeforeUse(DphRoot, Node->pVirtualBlock, AccessSize); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); } + + Ptr = Node->pVirtualBlock; /* Check node's size */ if (Node->nVirtualBlockSize > TotalSize) @@ -1603,7 +1618,7 @@ AllocatedNode = RtlpDphAllocateNode(DphRoot); ASSERT(AllocatedNode != NULL); - AllocatedNode->pVirtualBlock = Node->pVirtualBlock - TotalSize; + AllocatedNode->pVirtualBlock = Ptr; AllocatedNode->nVirtualBlockSize = TotalSize; } else @@ -1620,7 +1635,7 @@ UserActualSize = ROUND_UP(Size, 8); /* Set up the block */ - AllocatedNode->nVirtualAccessSize = UserSize; + AllocatedNode->nVirtualAccessSize = AccessSize; AllocatedNode->nUserActualSize = UserActualSize; AllocatedNode->nUserRequestedSize = Size; @@ -1647,7 +1662,7 @@ /* Write DPH info */ if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) { - RtlpDphWritePageHeapBlockInformation(DphRoot, AllocatedNode->pUserAllocation, Size, UserSize); + RtlpDphWritePageHeapBlockInformation(DphRoot, AllocatedNode->pUserAllocation, Size, AccessSize); } /* Finally allocation is done, perform validation again if required */ @@ -1658,6 +1673,8 @@ /* Release the lock */ RtlpDphPostProcessing(DphRoot); + + DPRINT("Allocated user block pointer: %p\n", AllocatedNode->pUserAllocation); /* Return pointer to user allocation */ return AllocatedNode->pUserAllocation; @@ -1668,6 +1685,7 @@ ULONG Flags, PVOID Ptr) { + UNIMPLEMENTED; return FALSE; } @@ -1677,6 +1695,7 @@ PVOID Ptr, SIZE_T Size) { + UNIMPLEMENTED; return NULL; } @@ -1687,6 +1706,7 @@ PVOID *UserValue, PULONG UserFlags) { + UNIMPLEMENTED; return FALSE; } @@ -1696,6 +1716,7 @@ PVOID BaseAddress, PVOID UserValue) { + UNIMPLEMENTED; return FALSE; } @@ -1707,6 +1728,7 @@ ULONG UserFlagsReset, ULONG UserFlagsSet) { + UNIMPLEMENTED; return FALSE; } @@ -1715,6 +1737,7 @@ ULONG Flags, PVOID Ptr) { + UNIMPLEMENTED; return 0; }

13 years, 8 months

[tkreuzer] 50827: [WIN32K] NtGdiSelectBitmap. Don't exclusively lock the old bitmap. This could cause pool corruptions, when the share count reachted 0, the object was deleted and unlocked after th...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 19 23:44:36 2011 New Revision: 50827 URL: http://svn.reactos.org/svn/reactos?rev=50827&view=rev Log: [WIN32K] NtGdiSelectBitmap. Don't exclusively lock the old bitmap. This could cause pool corruptions, when the share count reachted 0, the object was deleted and unlocked after that. Use InterlockedCompareExchange to check and exchange the new bitmaps dc. This is commented out, because it causes a lot of drawing problems. Do the referencing manually instead of calling DC_vSelectSurface. Use a shared reference instead of an exclusive lock for the new bitmap. add code for proper handling of DEFAULT_BITMAP, currently hacked due to restrictions in other parts of win32k. Fixes bug 5498 and probably a lot of other problems. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Sat Feb 19 23:44:36 2011 @@ -251,89 +251,119 @@ HBITMAP APIENTRY NtGdiSelectBitmap( - IN HDC hDC, - IN HBITMAP hBmp) -{ - PDC pDC; + IN HDC hdc, + IN HBITMAP hbmp) +{ + PDC pdc; PDC_ATTR pdcattr; - HBITMAP hOrgBmp; - PSURFACE psurfBmp, psurfOld; + HBITMAP hbmpOld; + PSURFACE psurfNew, psurfOld; HRGN hVisRgn; - - if (hDC == NULL || hBmp == NULL) return NULL; - - pDC = DC_LockDc(hDC); - if (!pDC) - { - return NULL; - } - pdcattr = pDC->pdcattr; - - /* must be memory dc to select bitmap */ - if (pDC->dctype != DC_TYPE_MEMORY) - { - DC_UnlockDc(pDC); - return NULL; - } - - psurfBmp = SURFACE_LockSurface(hBmp); - if (!psurfBmp) - { - DC_UnlockDc(pDC); - return NULL; - } - - /* Get the handle for the old bitmap */ - ASSERT(pDC->dclevel.pSurface); - hOrgBmp = pDC->dclevel.pSurface->BaseObject.hHmgr; - - /* Lock it, to be sure while we mess with it*/ - psurfOld = SURFACE_LockSurface(hOrgBmp); - - /* Reset hdc, this surface isn't selected anymore */ - psurfOld->hdc = NULL; - - /* Release the old bitmap, reference the new */ - DC_vSelectSurface(pDC, psurfBmp); - - /* And unlock it, now we're done */ - SURFACE_UnlockSurface(psurfOld); - - // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. - psurfBmp->hdc = hDC; - + SIZEL sizlBitmap = {1, 1}; + ASSERT_NOGDILOCKS(); + + /* Verify parameters */ + if (hdc == NULL || hbmp == NULL) return NULL; + + /* First lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return NULL; + } + pdcattr = pdc->pdcattr; + + /* Must be a memory dc to select a bitmap */ + if (pdc->dctype != DC_TYPE_MEMORY) + { + DC_UnlockDc(pdc); + return NULL; + } + + /* Save the old bitmap */ + psurfOld = pdc->dclevel.pSurface; + + /* Check if the default bitmap was passed */ + if (hbmp == StockObjects[DEFAULT_BITMAP]) + { + psurfNew = NULL; + + // HACK + psurfNew = SURFACE_ShareLockSurface(hbmp); + } + else + { + /* Reference the new bitmap and check if it's valid */ + psurfNew = SURFACE_ShareLockSurface(hbmp); + if (!psurfNew) + { + DC_UnlockDc(pdc); + return NULL; + } +#if 0 // FIXME: bug bug, causes problems + /* Set the bitmp's hdc */ + if (InterlockedCompareExchangePointer((PVOID*)&psurfNew->hdc, hdc, 0)) + { + /* The bitmap is already selected, fail */ + SURFACE_ShareUnlockSurface(psurfNew); + DC_UnlockDc(pdc); + return NULL; + } +#endif + /* Get the bitmap size */ + sizlBitmap = psurfNew->SurfObj.sizlBitmap; + + /* Check if the bitmap is a dibsection */ + if(psurfNew->hSecure) + { + /* Set DIBSECTION attribute */ + pdcattr->ulDirty_ |= DC_DIBSECTION; + } + else + { + pdcattr->ulDirty_ &= ~DC_DIBSECTION; + } + } + + /* Select the new bitmap */ + pdc->dclevel.pSurface = psurfNew; + + /* Check if there was a bitmap selected before */ + if (psurfOld) + { + hbmpOld = psurfOld->BaseObject.hHmgr; + + /* Reset hdc of old bitmap, this surface isn't selected anymore */ + psurfOld->hdc = NULL; + + /* Release the old bitmap */ + SURFACE_ShareUnlockSurface(psurfOld); + } + else + { + /* Return default bitmap */ + hbmpOld = StockObjects[DEFAULT_BITMAP]; + } + + /* Mark the dc brushes invalid */ + pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; + + /* Unlock the DC */ + DC_UnlockDc(pdc); /* FIXME; improve by using a region without a handle and selecting it */ hVisRgn = IntSysCreateRectRgn( 0, 0, - psurfBmp->SurfObj.sizlBitmap.cx, - psurfBmp->SurfObj.sizlBitmap.cy); - - if(psurfBmp->hSecure) - { - /* Set DIBSECTION attribute */ - pdcattr->ulDirty_ |= DC_DIBSECTION; - } - else - { - pdcattr->ulDirty_ &= ~DC_DIBSECTION; - } - - /* Release the exclusive lock */ - SURFACE_UnlockSurface(psurfBmp); - - /* Mark the brushes invalid */ - pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; - - DC_UnlockDc(pDC); - + sizlBitmap.cx, + sizlBitmap.cy); if (hVisRgn) { - GdiSelectVisRgn(hDC, hVisRgn); + GdiSelectVisRgn(hdc, hVisRgn); REGION_FreeRgnByHandle(hVisRgn); } - return hOrgBmp; + /* Return the old bitmp handle */ + return hbmpOld; }

13 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011