Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tfaber] 60869: [NTOS:MM] - Fix an invalid free

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 5 20:41:25 2013 New Revision: 60869 URL: http://svn.reactos.org/svn/reactos?rev=60869&view=rev Log: [NTOS:MM] - Fix an invalid free Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Nov 5 20:41:25 2013 @@ -1158,7 +1158,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePoolWithTag(NonPagedPool, 'bDmM'); + ExFreePoolWithTag(LdrEntry, 'bDmM'); _SEH2_YIELD(return); } _SEH2_END;

11 years, 1 month

[tfaber] 60868: [NDK][DDK][RTL] - Correct prototypes and annotations and add missing declarations for Rtl string functions

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 5 20:40:01 2013 New Revision: 60868 URL: http://svn.reactos.org/svn/reactos?rev=60868&view=rev Log: [NDK][DDK][RTL] - Correct prototypes and annotations and add missing declarations for Rtl string functions Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=60… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Tue Nov 5 20:40:01 2013 @@ -4993,7 +4993,7 @@ NTAPI RtlUpperString( _Inout_ PSTRING DestinationString, - _In_ const PSTRING SourceString); + _In_ const STRING *SourceString); _IRQL_requires_max_(PASSIVE_LEVEL) _When_(AllocateDestinationString, _Must_inspect_result_) @@ -5029,8 +5029,8 @@ LONG NTAPI RtlCompareString( - _In_ const PSTRING String1, - _In_ const PSTRING String2, + _In_ const STRING *String1, + _In_ const STRING *String2, _In_ BOOLEAN CaseInSensitive); NTSYSAPI @@ -5038,7 +5038,7 @@ NTAPI RtlCopyString( _Out_ PSTRING DestinationString, - _In_opt_ const PSTRING SourceString); + _In_opt_ const STRING *SourceString); _IRQL_requires_max_(PASSIVE_LEVEL) _Must_inspect_result_ @@ -5046,8 +5046,8 @@ BOOLEAN NTAPI RtlEqualString( - _In_ const PSTRING String1, - _In_ const PSTRING String2, + _In_ const STRING *String1, + _In_ const STRING *String2, _In_ BOOLEAN CaseInSensitive); _IRQL_requires_max_(PASSIVE_LEVEL) Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=60… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Tue Nov 5 20:40:01 2013 @@ -1005,6 +1005,16 @@ _Out_ _At_(DestinationString->Buffer, __drv_allocatesMem(Mem)) PUNICODE_STRING DestinationString, _In_z_ PCWSTR SourceString); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +BOOLEAN +NTAPI +RtlPrefixString( + _In_ const STRING *String1, + _In_ const STRING *String2, + _In_ BOOLEAN CaseInsensitive); _IRQL_requires_max_(APC_LEVEL) NTSYSAPI Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Nov 5 20:40:01 2013 @@ -2161,22 +2161,74 @@ INT *Flags ); +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlPrefixString( - PSTRING String1, - PSTRING String2, - BOOLEAN CaseInsensitive -); - + _In_ const STRING *String1, + _In_ const STRING *String2, + _In_ BOOLEAN CaseInsensitive +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ NTSYSAPI BOOLEAN NTAPI RtlPrefixUnicodeString( - PCUNICODE_STRING String1, - PCUNICODE_STRING String2, - BOOLEAN CaseInsensitive + _In_ PCUNICODE_STRING String1, + _In_ PCUNICODE_STRING String2, + _In_ BOOLEAN CaseInsensitive +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSYSAPI +VOID +NTAPI +RtlUpperString( + _Inout_ PSTRING DestinationString, + _In_ const STRING *SourceString +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +LONG +NTAPI +RtlCompareString( + _In_ const STRING *String1, + _In_ const STRING *String2, + _In_ BOOLEAN CaseInSensitive +); + +NTSYSAPI +VOID +NTAPI +RtlCopyString( + _Out_ PSTRING DestinationString, + _In_opt_ const STRING *SourceString +); + +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +BOOLEAN +NTAPI +RtlEqualString( + _In_ const STRING *String1, + _In_ const STRING *String2, + _In_ BOOLEAN CaseInSensitive +); + +_IRQL_requires_max_(APC_LEVEL) +NTSYSAPI +NTSTATUS +NTAPI +RtlAppendStringToString( + _Inout_ PSTRING Destination, + _In_ const STRING *Source ); _IRQL_requires_max_(PASSIVE_LEVEL) @@ -2190,7 +2242,7 @@ PUNICODE_STRING DestinationString, _In_ PCUNICODE_STRING SourceString, _In_ BOOLEAN AllocateDestinationString - ); +); _IRQL_requires_max_(PASSIVE_LEVEL) NTSYSAPI Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=6086… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Tue Nov 5 20:40:01 2013 @@ -173,7 +173,7 @@ NTSTATUS NTAPI RtlAppendStringToString(IN PSTRING Destination, - IN PSTRING Source) + IN const STRING *Source) { USHORT SourceLength = Source->Length; @@ -346,8 +346,8 @@ LONG NTAPI RtlCompareString( - IN PSTRING s1, - IN PSTRING s2, + IN const STRING *s1, + IN const STRING *s2, IN BOOLEAN CaseInsensitive) { unsigned int len; @@ -382,8 +382,8 @@ BOOLEAN NTAPI RtlEqualString( - IN PSTRING s1, - IN PSTRING s2, + IN const STRING *s1, + IN const STRING *s2, IN BOOLEAN CaseInsensitive) { if (s1->Length != s2->Length) return FALSE; @@ -835,8 +835,8 @@ BOOLEAN NTAPI RtlPrefixString( - PSTRING String1, - PSTRING String2, + const STRING *String1, + const STRING *String2, BOOLEAN CaseInsensitive) { PCHAR pc1; @@ -2115,7 +2115,7 @@ NTAPI RtlCopyString( IN OUT PSTRING DestinationString, - IN PSTRING SourceString OPTIONAL) + IN const STRING *SourceString OPTIONAL) { ULONG SourceLength; PCHAR p1, p2; @@ -2362,7 +2362,7 @@ VOID NTAPI RtlUpperString(PSTRING DestinationString, - PSTRING SourceString) + const STRING *SourceString) { USHORT Length; PCHAR Src, Dest;

11 years, 1 month

[jimtabor] 60867: - Fix win test crash.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 5 19:53:56 2013 New Revision: 60867 URL: http://svn.reactos.org/svn/reactos?rev=60867&view=rev Log: - Fix win test crash. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Tue Nov 5 19:53:56 2013 @@ -236,8 +236,8 @@ WCHAR ClassNameBuf[MAX_PATH] = {0}; BOOL Ret = FALSE; HMODULE hLibModule = NULL; - - if (is_comctl32_class( pszClass )) + + if (!IS_ATOM(pszClass) && is_comctl32_class( pszClass )) { _SEH2_TRY {

11 years, 1 month

[gadamopoulos] 60866: [shell32_apitest] - CLSID_ShellFSFolder should also export IID_IStorage

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Nov 5 09:28:05 2013 New Revision: 60866 URL: http://svn.reactos.org/svn/reactos?rev=60866&view=rev Log: [shell32_apitest] - CLSID_ShellFSFolder should also export IID_IStorage Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Tue Nov 5 09:28:05 2013 @@ -160,6 +160,7 @@ ID_NAME(IID_IRunnableObject), ID_NAME(IID_IServerSecurity), ID_NAME(IID_IServiceProvider), + ID_NAME(IID_ISFHelper), ID_NAME(IID_IShellBrowser), ID_NAME(IID_IShellBrowserService), ID_NAME(IID_IShellChangeNotify), @@ -198,6 +199,7 @@ ID_NAME(IID_IShellView2), ID_NAME(IID_IShellView3), ID_NAME(IID_IShellWindows), + ID_NAME(IID_IStorage), ID_NAME(IID_IStream), ID_NAME(IID_ISurrogate), ID_NAME(IID_ISynchronize), Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Tue Nov 5 09:28:05 2013 @@ -128,3 +128,5 @@ DEFINE_GUID(IID_CDefView, 0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62); DEFINE_GUID(IID_FolderItems2, 0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f); DEFINE_GUID(IID_FolderItems3, 0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f); + +DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Tue Nov 5 09:28:05 2013 @@ -304,6 +304,7 @@ { -0x8, &CLSID_ShellDesktop }, { -0x8, &IID_IObjectWithSite }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IStorage }, { 0x8, &IID_IPersistFolder2 }, { 0x8, &IID_IPersistFolder }, { 0x8, &IID_IPersist }, @@ -325,6 +326,7 @@ { 0x18, &IID_IPersistFolder2 }, { 0x18, &IID_IPersistFolder }, { 0x18, &IID_IPersist }, + { 0x1c, &IID_IStorage }, { 0x2c, &IID_IContextMenuCB }, { 0x34, &IID_IOleCommandTarget }, }

11 years, 1 month

[jimtabor] 60865: - Fix condition when lParam is null and not allow it to go into exception.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 4 04:26:40 2013 New Revision: 60865 URL: http://svn.reactos.org/svn/reactos?rev=60865&view=rev Log: - Fix condition when lParam is null and not allow it to go into exception. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Nov 4 04:26:40 2013 @@ -174,7 +174,14 @@ } else if (MMS_SIZE_LPARAMSZ == MsgMemoryEntry->Size) { - Size = (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR)); + // WM_SETTEXT and WM_SETTINGCHANGE can be null! + if (!lParam) + { + TRACE("lParam is NULL!\n"); + Size = 0; + } + else + Size = (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR)); } else if (MMS_SIZE_SPECIAL == MsgMemoryEntry->Size) { @@ -436,6 +443,7 @@ /* Copy data if required */ if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { + TRACE("Copy Message %d from usermode buffer\n", KernelModeMsg->message); Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); if (! NT_SUCCESS(Status)) {

11 years, 1 month

[jimtabor] 60864: - Fix msvc build.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 4 02:54:21 2013 New Revision: 60864 URL: http://svn.reactos.org/svn/reactos?rev=60864&view=rev Log: - Fix msvc build. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Nov 4 02:54:21 2013 @@ -577,8 +577,9 @@ case WM_GETTEXT: case WM_ASKCBFORMATNAME: { + LPWSTR Buffer; if (!AnsiMsg->lParam) break; - LPWSTR Buffer = RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam * sizeof(WCHAR)); + Buffer = RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam * sizeof(WCHAR)); if (!Buffer) return FALSE; UnicodeMsg->lParam = (LPARAM)Buffer; break;

11 years, 1 month

[jimtabor] 60863: [User32] - Fix message A to W to A to W. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 4 02:41:28 2013 New Revision: 60863 URL: http://svn.reactos.org/svn/reactos?rev=60863&view=rev Log: [User32] - Fix message A to W to A to W. See CORE-7447. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Mon Nov 4 02:41:28 2013 @@ -236,839 +236,27 @@ return Ret; } -static -BOOL FASTCALL -MsgiUMToKMMessage(PMSG UMMsg, PMSG KMMsg, BOOL Posted) -{ - *KMMsg = *UMMsg; - - switch (UMMsg->message) - { - case WM_DDE_ACK: - { - PKMDDELPARAM DdeLparam; - DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDELPARAM)); - if (!DdeLparam || - !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) - return FALSE; - /* - If this is a reply to WM_DDE_EXECUTE then - uiHi will contain a hMem, hence >= 0x10000. - Otherwise, it will be be an atom, a 16-bit value. - */ - if (!IS_ATOM(DdeLparam->uiHi)) - { - HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - if (h) - { - GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); - DdeLparam->uiHi = (UINT_PTR) h; - } - } - FreeDDElParam(UMMsg->message, UMMsg->lParam); - KMMsg->lParam = (LPARAM) DdeLparam; - } - break; - - case WM_DDE_EXECUTE: - { - SIZE_T Size; - PKMDDEEXECUTEDATA KMDdeExecuteData; - PVOID Data; - - Size = GlobalSize((HGLOBAL) UMMsg->lParam); - Data = GlobalLock((HGLOBAL) UMMsg->lParam); - if (!Data) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - KMDdeExecuteData = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDEEXECUTEDATA) + Size); - if (!KMDdeExecuteData) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - KMDdeExecuteData->Sender = (HWND) UMMsg->wParam; - KMDdeExecuteData->ClientMem = (HGLOBAL) UMMsg->lParam; - memcpy((PVOID) (KMDdeExecuteData + 1), Data, Size); - KMMsg->wParam = sizeof(KMDDEEXECUTEDATA) + Size; - KMMsg->lParam = (LPARAM) KMDdeExecuteData; - GlobalUnlock((HGLOBAL) UMMsg->lParam); - } - break; - - case WM_COPYDATA: - { - PCOPYDATASTRUCT pUMCopyData = (PCOPYDATASTRUCT)UMMsg->lParam; - PCOPYDATASTRUCT pKMCopyData; - - pKMCopyData = HeapAlloc(GetProcessHeap(), 0, - sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); - if (!pKMCopyData) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - pKMCopyData->dwData = pUMCopyData->dwData; - pKMCopyData->cbData = pUMCopyData->cbData; - pKMCopyData->lpData = pKMCopyData + 1; - - RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, - pUMCopyData->cbData); - - KMMsg->lParam = (LPARAM)pKMCopyData; - } - break; - - default: - break; - } - - return TRUE; -} - -static -VOID FASTCALL -MsgiUMToKMCleanup(PMSG UMMsg, PMSG KMMsg) -{ - switch (KMMsg->message) - { - case WM_DDE_ACK: - case WM_DDE_EXECUTE: - case WM_COPYDATA: - HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); - break; - default: - break; - } - - return; -} - -static BOOL FASTCALL -MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) -{ - *UMMsg = *KMMsg; - - switch (UMMsg->message) - { - case WM_CREATE: - case WM_NCCREATE: - { - CREATESTRUCTW *Cs = (CREATESTRUCTW *) KMMsg->lParam; - PCHAR Class; - Cs->lpszName = (LPCWSTR) ((PCHAR) Cs + (DWORD_PTR) Cs->lpszName); - Class = (PCHAR) Cs + (DWORD_PTR) Cs->lpszClass; - if (L'A' == *((WCHAR *) Class)) - { - Class += sizeof(WCHAR); - Cs->lpszClass = (LPCWSTR)(DWORD_PTR) (*((ATOM *) Class)); - } - else - { - ASSERT(L'S' == *((WCHAR *) Class)); - Class += sizeof(WCHAR); - Cs->lpszClass = (LPCWSTR) Class; - } - } - break; - - case WM_DDE_ACK: - { - PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; - UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); - } - break; - - case WM_DDE_EXECUTE: - { - PKMDDEEXECUTEDATA KMDdeExecuteData; - HGLOBAL GlobalData; - PVOID Data; - - KMDdeExecuteData = (PKMDDEEXECUTEDATA) KMMsg->lParam; - GlobalData = GlobalAlloc(GMEM_MOVEABLE, KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - if (!GlobalData) - { - return FALSE; - } - Data = GlobalLock(GlobalData); - if (!Data) - { - GlobalFree(GlobalData); - return FALSE; - } - memcpy(Data, (PVOID) (KMDdeExecuteData + 1), KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); - GlobalUnlock(GlobalData); - if (!DdeAddPair(KMDdeExecuteData->ClientMem, GlobalData)) - { - GlobalFree(GlobalData); - return FALSE; - } - UMMsg->wParam = (WPARAM) KMDdeExecuteData->Sender; - UMMsg->lParam = (LPARAM) GlobalData; - } - break; - - case WM_COPYDATA: - { - PCOPYDATASTRUCT pKMCopyData = (PCOPYDATASTRUCT)KMMsg->lParam; - pKMCopyData->lpData = pKMCopyData + 1; - } - break; - - default: - break; - } - - return TRUE; -} - -static VOID FASTCALL -MsgiKMToUMCleanup(PMSG KMMsg, PMSG UMMsg) -{ - switch (KMMsg->message) - { - case WM_DDE_EXECUTE: -#ifdef TODO - HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); - GlobalUnlock((HGLOBAL) UMMsg->lParam); -#endif - break; - default: - break; - } - - return; -} - -static BOOL FASTCALL -MsgiKMToUMReply(PMSG KMMsg, PMSG UMMsg, LRESULT *Result) -{ - MsgiKMToUMCleanup(KMMsg, UMMsg); - - return TRUE; -} - -static BOOL FASTCALL -MsgiAnsiToUnicodeMessage(HWND hwnd, LPMSG UnicodeMsg, LPMSG AnsiMsg) -{ - UNICODE_STRING UnicodeString; - - *UnicodeMsg = *AnsiMsg; - - switch (AnsiMsg->message) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPWSTR Buffer = HeapAlloc(GetProcessHeap(), 0, - AnsiMsg->wParam * sizeof(WCHAR)); - if (!Buffer) - { - return FALSE; - } - UnicodeMsg->lParam = (LPARAM)Buffer; - break; - } - - /* AnsiMsg->lParam is string (0-terminated) */ - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); - UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; - break; - } - - case LB_ADDSTRING: - case LB_ADDSTRING_LOWER: - case LB_ADDSTRING_UPPER: - case LB_INSERTSTRING: - case LB_INSERTSTRING_UPPER: - case LB_INSERTSTRING_LOWER: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - { - if (listbox_has_strings(AnsiMsg->hwnd)) - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); - UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; - } - break; - } - - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - { - if (combobox_has_strings(AnsiMsg->hwnd)) - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); - UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; - } - break; - } - - case WM_NCCREATE: - case WM_CREATE: - { - MDICREATESTRUCTW mdi_cs; - struct s - { - CREATESTRUCTW cs; /* new structure */ - LPCWSTR lpszName; /* allocated Name */ - LPCWSTR lpszClass; /* allocated Class */ - }; - - struct s *xs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct s)); - if (!xs) - { - return FALSE; - } - xs->cs = *(CREATESTRUCTW *)AnsiMsg->lParam; - if (!IS_INTRESOURCE(xs->cs.lpszName)) - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)xs->cs.lpszName); - xs->lpszName = xs->cs.lpszName = UnicodeString.Buffer; - } - if (!IS_ATOM(xs->cs.lpszClass)) - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)xs->cs.lpszClass); - xs->lpszClass = xs->cs.lpszClass = UnicodeString.Buffer; - } - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; - mdi_cs.szTitle = xs->cs.lpszName; - mdi_cs.szClass = xs->cs.lpszClass; - xs->cs.lpCreateParams = &mdi_cs; - } - - UnicodeMsg->lParam = (LPARAM)xs; - break; - } - - case WM_MDICREATE: - { - MDICREATESTRUCTW *cs = - (MDICREATESTRUCTW *)HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)); - - if (!cs) - { - return FALSE; - } - - *cs = *(MDICREATESTRUCTW *)AnsiMsg->lParam; - - if (!IS_ATOM(cs->szClass)) - { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)cs->szClass); - cs->szClass = UnicodeString.Buffer; - } - - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)cs->szTitle); - cs->szTitle = UnicodeString.Buffer; - - UnicodeMsg->lParam = (LPARAM)cs; - break; - } - } - - return TRUE; -} - -static BOOL FASTCALL -MsgiAnsiToUnicodeCleanup(LPMSG UnicodeMsg, LPMSG AnsiMsg) -{ - UNICODE_STRING UnicodeString; - - switch (AnsiMsg->message) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - HeapFree(GetProcessHeap(), 0, (PVOID) UnicodeMsg->lParam); - break; - } - - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); - RtlFreeUnicodeString(&UnicodeString); - break; - } - - case LB_ADDSTRING: - case LB_ADDSTRING_LOWER: - case LB_ADDSTRING_UPPER: - case LB_INSERTSTRING: - case LB_INSERTSTRING_UPPER: - case LB_INSERTSTRING_LOWER: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - { - if (listbox_has_strings(AnsiMsg->hwnd)) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); - RtlFreeUnicodeString(&UnicodeString); - } - break; - } - - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - { - if (combobox_has_strings(AnsiMsg->hwnd)) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); - RtlFreeUnicodeString(&UnicodeString); - } - break; - } - - case WM_NCCREATE: - case WM_CREATE: - { - struct s - { - CREATESTRUCTW cs; /* new structure */ - LPWSTR lpszName; /* allocated Name */ - LPWSTR lpszClass; /* allocated Class */ - }; - - struct s *xs = (struct s *)UnicodeMsg->lParam; - if (xs->lpszName) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)xs->lpszName); - RtlFreeUnicodeString(&UnicodeString); - } - if (xs->lpszClass) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)xs->lpszClass); - RtlFreeUnicodeString(&UnicodeString); - } - HeapFree(GetProcessHeap(), 0, xs); - break; - } - - case WM_MDICREATE: - { - MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)UnicodeMsg->lParam; - RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szTitle); - RtlFreeUnicodeString(&UnicodeString); - if (!IS_ATOM(cs->szClass)) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szClass); - RtlFreeUnicodeString(&UnicodeString); - } - HeapFree(GetProcessHeap(), 0, cs); - break; - } - } - - return(TRUE); -} - -static BOOL FASTCALL -MsgiAnsiToUnicodeReply(LPMSG UnicodeMsg, LPMSG AnsiMsg, LRESULT *Result) -{ - LRESULT Size; - switch (AnsiMsg->message) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPWSTR Buffer = (LPWSTR)UnicodeMsg->lParam; - LPSTR AnsiBuffer = (LPSTR)AnsiMsg->lParam; - if (UnicodeMsg->wParam > 0 && - !WideCharToMultiByte(CP_ACP, 0, Buffer, -1, AnsiBuffer, UnicodeMsg->wParam, NULL, NULL)) - { - AnsiBuffer[UnicodeMsg->wParam - 1] = 0; - } - break; - } - case LB_GETTEXT: - { - LPWSTR Buffer = (LPWSTR) UnicodeMsg->lParam; - LPSTR AnsiBuffer = (LPSTR) AnsiMsg->lParam; - if (!listbox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageW( UnicodeMsg->hwnd, LB_GETTEXTLEN, UnicodeMsg->wParam, 0 ); - if (Size == LB_ERR) break; - Size = Size + 1; - if (Size > 1 && - !WideCharToMultiByte(CP_ACP, 0, Buffer, -1, AnsiBuffer, Size, NULL, NULL)) - { - AnsiBuffer[Size - 1] = 0; - } - break; - } - case CB_GETLBTEXT: - { - LPWSTR Buffer = (LPWSTR) UnicodeMsg->lParam; - LPSTR AnsiBuffer = (LPSTR) AnsiMsg->lParam; - if (!combobox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageW( UnicodeMsg->hwnd, CB_GETLBTEXTLEN, UnicodeMsg->wParam, 0 ); - if (Size == CB_ERR) break; - Size = Size + 1; - if (Size > 1 && - !WideCharToMultiByte(CP_ACP, 0, Buffer, -1, AnsiBuffer, Size, NULL, NULL)) - { - AnsiBuffer[Size - 1] = 0; - } - break; - } - } - - MsgiAnsiToUnicodeCleanup(UnicodeMsg, AnsiMsg); - - return TRUE; -} - -static BOOL FASTCALL -MsgiUnicodeToAnsiMessage(HWND hwnd, LPMSG AnsiMsg, LPMSG UnicodeMsg) -{ - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - - *AnsiMsg = *UnicodeMsg; - - switch(UnicodeMsg->message) - { - case WM_CREATE: - case WM_NCCREATE: - { - MDICREATESTRUCTA *pmdi_cs; - CREATESTRUCTA* CsA; - CREATESTRUCTW* CsW; - NTSTATUS Status; - - CsW = (CREATESTRUCTW*)(UnicodeMsg->lParam); - CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA)); - if (NULL == CsA) - { - return FALSE; - } - memcpy(CsA, CsW, sizeof(CREATESTRUCTW)); - - /* pmdi_cs starts right after CsA */ - pmdi_cs = (MDICREATESTRUCTA*)(CsA + 1); - - RtlInitUnicodeString(&UnicodeString, CsW->lpszName); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); - if (! NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, CsA); - return FALSE; - } - CsA->lpszName = AnsiString.Buffer; - if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) - { - RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); - Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); - if (! NT_SUCCESS(Status)) - { - RtlInitAnsiString(&AnsiString, CsA->lpszName); - RtlFreeAnsiString(&AnsiString); - RtlFreeHeap(GetProcessHeap(), 0, CsA); - return FALSE; - } - CsA->lpszClass = AnsiString.Buffer; - } - - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) - { - *pmdi_cs = *(MDICREATESTRUCTA *)CsW->lpCreateParams; - pmdi_cs->szTitle = CsA->lpszName; - pmdi_cs->szClass = CsA->lpszClass; - CsA->lpCreateParams = pmdi_cs; - } - - AnsiMsg->lParam = (LPARAM)CsA; - break; - } - case WM_GETTEXT: - { - /* Ansi string might contain MBCS chars so we need 2 * the number of chars */ - AnsiMsg->wParam = UnicodeMsg->wParam * 2; - AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam); - if (NULL == (PVOID) AnsiMsg->lParam) - { - return FALSE; - } - break; - } - case WM_SETTEXT: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - { - RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); - if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - TRUE))) - { - return FALSE; - } - AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; - break; - } - - case LB_ADDSTRING: - case LB_ADDSTRING_LOWER: - case LB_ADDSTRING_UPPER: - case LB_INSERTSTRING: - case LB_INSERTSTRING_UPPER: - case LB_INSERTSTRING_LOWER: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - { - if (listbox_has_strings(AnsiMsg->hwnd)) - { - RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); - if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - TRUE))) - { - return FALSE; - } - AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; - } - break; - } - - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - { - if (combobox_has_strings(AnsiMsg->hwnd)) - { - RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); - if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - TRUE))) - { - return FALSE; - } - AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; - } - break; - } - - case WM_MDICREATE: - { - MDICREATESTRUCTA *cs = - (MDICREATESTRUCTA *)HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)); - - if (!cs) - { - return FALSE; - } - - *cs = *(MDICREATESTRUCTA *)UnicodeMsg->lParam; - - if (!IS_ATOM(cs->szClass)) - { - RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szClass); - if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - TRUE))) - { - HeapFree(GetProcessHeap(), 0, cs); - return FALSE; - } - cs->szClass = AnsiString.Buffer; - } - - RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szTitle); - if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, - &UnicodeString, - TRUE))) - { - if (!IS_ATOM(cs->szClass)) - { - RtlInitAnsiString(&AnsiString, cs->szClass); - RtlFreeAnsiString(&AnsiString); - } - - HeapFree(GetProcessHeap(), 0, cs); - return FALSE; - } - cs->szTitle = AnsiString.Buffer; - - AnsiMsg->lParam = (LPARAM)cs; - break; - } - } - - return TRUE; -} - -static BOOL FASTCALL -MsgiUnicodeToAnsiCleanup(LPMSG AnsiMsg, LPMSG UnicodeMsg) -{ - ANSI_STRING AnsiString; - - switch(UnicodeMsg->message) - { - case WM_GETTEXT: - { - RtlFreeHeap(GetProcessHeap(), 0, (PVOID) AnsiMsg->lParam); - break; - } - case WM_SETTEXT: - { - RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); - RtlFreeAnsiString(&AnsiString); - break; - } - case WM_CREATE: - case WM_NCCREATE: - { - CREATESTRUCTA* Cs; - - Cs = (CREATESTRUCTA*) AnsiMsg->lParam; - RtlInitAnsiString(&AnsiString, Cs->lpszName); - RtlFreeAnsiString(&AnsiString); - if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) - { - RtlInitAnsiString(&AnsiString, Cs->lpszClass); - RtlFreeAnsiString(&AnsiString); - } - RtlFreeHeap(GetProcessHeap(), 0, Cs); - break; - } - - case LB_ADDSTRING: - case LB_ADDSTRING_LOWER: - case LB_ADDSTRING_UPPER: - case LB_INSERTSTRING: - case LB_INSERTSTRING_UPPER: - case LB_INSERTSTRING_LOWER: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - { - if (listbox_has_strings(AnsiMsg->hwnd)) - { - RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); - RtlFreeAnsiString(&AnsiString); - } - break; - } - - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - { - DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE); - if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) && - (dwStyle & CBS_HASSTRINGS)) - { - RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); - RtlFreeAnsiString(&AnsiString); - } - break; - } - - case WM_MDICREATE: - { - MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)AnsiMsg->lParam; - RtlInitAnsiString(&AnsiString, (PCSTR)cs->szTitle); - RtlFreeAnsiString(&AnsiString); - if (!IS_ATOM(cs->szClass)) - { - RtlInitAnsiString(&AnsiString, (PCSTR)cs->szClass); - RtlFreeAnsiString(&AnsiString); - } - HeapFree(GetProcessHeap(), 0, cs); - break; - } - - } - - return TRUE; -} - -static BOOL FASTCALL -MsgiUnicodeToAnsiReply(LPMSG AnsiMsg, LPMSG UnicodeMsg, LRESULT *Result) -{ - LRESULT Size; - switch (UnicodeMsg->message) - { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPSTR Buffer = (LPSTR) AnsiMsg->lParam; - LPWSTR UBuffer = (LPWSTR) UnicodeMsg->lParam; - if (0 < AnsiMsg->wParam && - ! MultiByteToWideChar(CP_ACP, 0, Buffer, -1, UBuffer, UnicodeMsg->wParam)) - { - UBuffer[UnicodeMsg->wParam - 1] = L'\0'; - } - break; - } - case LB_GETTEXT: - { - LPSTR Buffer = (LPSTR) AnsiMsg->lParam; - LPWSTR UBuffer = (LPWSTR) UnicodeMsg->lParam; - if (!listbox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageW( UnicodeMsg->hwnd, LB_GETTEXTLEN, UnicodeMsg->wParam, 0 ); - if (Size == LB_ERR) break; - Size = Size + 1; - if (1 < Size && - ! MultiByteToWideChar(CP_ACP, 0, Buffer, -1, UBuffer, Size)) - { - UBuffer[Size - 1] = L'\0'; - } - break; - } - case CB_GETLBTEXT: - { - LPSTR Buffer = (LPSTR) AnsiMsg->lParam; - LPWSTR UBuffer = (LPWSTR) UnicodeMsg->lParam; - if (!combobox_has_strings( UnicodeMsg->hwnd )) break; - Size = SendMessageW( UnicodeMsg->hwnd, CB_GETLBTEXTLEN, UnicodeMsg->wParam, 0 ); - if (Size == CB_ERR) break; - Size = Size + 1; - if (1 < Size && - ! MultiByteToWideChar(CP_ACP, 0, Buffer, -1, UBuffer, Size)) - { - UBuffer[Size - 1] = L'\0'; - } - break; - } - } - - MsgiUnicodeToAnsiCleanup(AnsiMsg, UnicodeMsg); - - return TRUE; +DWORD FASTCALL get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + +static WPARAM FASTCALL map_wparam_char_WtoA( WPARAM wParam, DWORD len ) +{ + WCHAR wch = wParam; + BYTE ch[2]; + DWORD cp = get_input_codepage(); + + len = WideCharToMultiByte( cp, 0, &wch, 1, (LPSTR)ch, len, NULL, NULL ); + if (len == 2) + return MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wParam) ); + else + return MAKEWPARAM( ch[0], HIWORD(wParam) ); } /*********************************************************************** @@ -1076,7 +264,7 @@ * * Convert the wparam of an ASCII message to Unicode. */ -static WPARAM +static WPARAM FASTCALL map_wparam_AtoW( UINT message, WPARAM wparam ) { char ch[2]; @@ -1161,6 +349,984 @@ return wparam; } +static +BOOL FASTCALL +MsgiUMToKMMessage(PMSG UMMsg, PMSG KMMsg, BOOL Posted) +{ + *KMMsg = *UMMsg; + + switch (UMMsg->message) + { + case WM_DDE_ACK: + { + PKMDDELPARAM DdeLparam; + DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDELPARAM)); + if (!DdeLparam || + !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) + return FALSE; + /* + If this is a reply to WM_DDE_EXECUTE then + uiHi will contain a hMem, hence >= 0x10000. + Otherwise, it will be be an atom, a 16-bit value. + */ + if (!IS_ATOM(DdeLparam->uiHi)) + { + HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); + if (h) + { + GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->uiHi); + DdeLparam->uiHi = (UINT_PTR) h; + } + } + FreeDDElParam(UMMsg->message, UMMsg->lParam); + KMMsg->lParam = (LPARAM) DdeLparam; + } + break; + + case WM_DDE_EXECUTE: + { + SIZE_T Size; + PKMDDEEXECUTEDATA KMDdeExecuteData; + PVOID Data; + + Size = GlobalSize((HGLOBAL) UMMsg->lParam); + Data = GlobalLock((HGLOBAL) UMMsg->lParam); + if (!Data) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + KMDdeExecuteData = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDEEXECUTEDATA) + Size); + if (!KMDdeExecuteData) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + KMDdeExecuteData->Sender = (HWND) UMMsg->wParam; + KMDdeExecuteData->ClientMem = (HGLOBAL) UMMsg->lParam; + memcpy((PVOID) (KMDdeExecuteData + 1), Data, Size); + KMMsg->wParam = sizeof(KMDDEEXECUTEDATA) + Size; + KMMsg->lParam = (LPARAM) KMDdeExecuteData; + GlobalUnlock((HGLOBAL) UMMsg->lParam); + } + break; + + case WM_COPYDATA: + { + PCOPYDATASTRUCT pUMCopyData = (PCOPYDATASTRUCT)UMMsg->lParam; + PCOPYDATASTRUCT pKMCopyData; + + pKMCopyData = HeapAlloc(GetProcessHeap(), 0, + sizeof(COPYDATASTRUCT) + pUMCopyData->cbData); + if (!pKMCopyData) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + pKMCopyData->dwData = pUMCopyData->dwData; + pKMCopyData->cbData = pUMCopyData->cbData; + pKMCopyData->lpData = pKMCopyData + 1; + + RtlCopyMemory(pKMCopyData + 1, pUMCopyData->lpData, + pUMCopyData->cbData); + + KMMsg->lParam = (LPARAM)pKMCopyData; + } + break; + + default: + break; + } + + return TRUE; +} + +static +VOID FASTCALL +MsgiUMToKMCleanup(PMSG UMMsg, PMSG KMMsg) +{ + switch (KMMsg->message) + { + case WM_DDE_ACK: + case WM_DDE_EXECUTE: + case WM_COPYDATA: + HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); + break; + default: + break; + } + + return; +} + +static BOOL FASTCALL +MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) +{ + *UMMsg = *KMMsg; + + switch (UMMsg->message) + { + case WM_CREATE: + case WM_NCCREATE: + { + CREATESTRUCTW *Cs = (CREATESTRUCTW *) KMMsg->lParam; + PCHAR Class; + Cs->lpszName = (LPCWSTR) ((PCHAR) Cs + (DWORD_PTR) Cs->lpszName); + Class = (PCHAR) Cs + (DWORD_PTR) Cs->lpszClass; + if (L'A' == *((WCHAR *) Class)) + { + Class += sizeof(WCHAR); + Cs->lpszClass = (LPCWSTR)(DWORD_PTR) (*((ATOM *) Class)); + } + else + { + ASSERT(L'S' == *((WCHAR *) Class)); + Class += sizeof(WCHAR); + Cs->lpszClass = (LPCWSTR) Class; + } + } + break; + + case WM_DDE_ACK: + { + PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; + UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); + } + break; + + case WM_DDE_EXECUTE: + { + PKMDDEEXECUTEDATA KMDdeExecuteData; + HGLOBAL GlobalData; + PVOID Data; + + KMDdeExecuteData = (PKMDDEEXECUTEDATA) KMMsg->lParam; + GlobalData = GlobalAlloc(GMEM_MOVEABLE, KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); + if (!GlobalData) + { + return FALSE; + } + Data = GlobalLock(GlobalData); + if (!Data) + { + GlobalFree(GlobalData); + return FALSE; + } + memcpy(Data, (PVOID) (KMDdeExecuteData + 1), KMMsg->wParam - sizeof(KMDDEEXECUTEDATA)); + GlobalUnlock(GlobalData); + if (!DdeAddPair(KMDdeExecuteData->ClientMem, GlobalData)) + { + GlobalFree(GlobalData); + return FALSE; + } + UMMsg->wParam = (WPARAM) KMDdeExecuteData->Sender; + UMMsg->lParam = (LPARAM) GlobalData; + } + break; + + case WM_COPYDATA: + { + PCOPYDATASTRUCT pKMCopyData = (PCOPYDATASTRUCT)KMMsg->lParam; + pKMCopyData->lpData = pKMCopyData + 1; + } + break; + + default: + break; + } + + return TRUE; +} + +static VOID FASTCALL +MsgiKMToUMCleanup(PMSG KMMsg, PMSG UMMsg) +{ + switch (KMMsg->message) + { + case WM_DDE_EXECUTE: +#ifdef TODO + HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); + GlobalUnlock((HGLOBAL) UMMsg->lParam); +#endif + break; + default: + break; + } + + return; +} + +static BOOL FASTCALL +MsgiKMToUMReply(PMSG KMMsg, PMSG UMMsg, LRESULT *Result) +{ + MsgiKMToUMCleanup(KMMsg, UMMsg); + + return TRUE; +} + +static BOOL FASTCALL +MsgiAnsiToUnicodeMessage(HWND hwnd, LPMSG UnicodeMsg, LPMSG AnsiMsg) +{ + UNICODE_STRING UnicodeString; + + *UnicodeMsg = *AnsiMsg; + + switch (AnsiMsg->message) + { + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + if (!AnsiMsg->lParam) break; + LPWSTR Buffer = RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam * sizeof(WCHAR)); + if (!Buffer) return FALSE; + UnicodeMsg->lParam = (LPARAM)Buffer; + break; + } + + case LB_GETTEXT: + { + DWORD Size; + if (!AnsiMsg->lParam || !listbox_has_strings( AnsiMsg->hwnd )) break; + Size = SendMessageW( AnsiMsg->hwnd, LB_GETTEXTLEN, AnsiMsg->wParam, 0 ); + if (Size == LB_ERR) + { + ERR("LB_GETTEXT LB_ERR\n"); + Size = sizeof(ULONG_PTR); + } + Size = (Size + 1) * sizeof(WCHAR); + UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + if (!UnicodeMsg->lParam) return FALSE; + break; + } + + case CB_GETLBTEXT: + { + DWORD Size; + if (!AnsiMsg->lParam || !combobox_has_strings( AnsiMsg->hwnd )) break; + Size = SendMessageW( AnsiMsg->hwnd, CB_GETLBTEXTLEN, AnsiMsg->wParam, 0 ); + if (Size == LB_ERR) + { + ERR("CB_GETTEXT LB_ERR\n"); + Size = sizeof(ULONG_PTR); + } + Size = (Size + 1) * sizeof(WCHAR); + UnicodeMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + if (!UnicodeMsg->lParam) return FALSE; + break; + } + + /* AnsiMsg->lParam is string (0-terminated) */ + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + { + if (!AnsiMsg->lParam) break; + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); + UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; + break; + } + + case LB_ADDSTRING: + case LB_ADDSTRING_LOWER: + case LB_ADDSTRING_UPPER: + case LB_INSERTSTRING: + case LB_INSERTSTRING_UPPER: + case LB_INSERTSTRING_LOWER: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + { + if (AnsiMsg->lParam && listbox_has_strings(AnsiMsg->hwnd)) + { + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); + UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; + } + break; + } + + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + { + if (AnsiMsg->lParam && combobox_has_strings(AnsiMsg->hwnd)) + { + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)AnsiMsg->lParam); + UnicodeMsg->lParam = (LPARAM)UnicodeString.Buffer; + } + break; + } + + case WM_NCCREATE: + case WM_CREATE: + { + MDICREATESTRUCTW mdi_cs; + struct s + { + CREATESTRUCTW cs; /* new structure */ + LPCWSTR lpszName; /* allocated Name */ + LPCWSTR lpszClass; /* allocated Class */ + }; + + struct s *xs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct s)); + if (!xs) + { + return FALSE; + } + xs->cs = *(CREATESTRUCTW *)AnsiMsg->lParam; + if (!IS_INTRESOURCE(xs->cs.lpszName)) + { + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)xs->cs.lpszName); + xs->lpszName = xs->cs.lpszName = UnicodeString.Buffer; + } + if (!IS_ATOM(xs->cs.lpszClass)) + { + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)xs->cs.lpszClass); + xs->lpszClass = xs->cs.lpszClass = UnicodeString.Buffer; + } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams; + mdi_cs.szTitle = xs->cs.lpszName; + mdi_cs.szClass = xs->cs.lpszClass; + xs->cs.lpCreateParams = &mdi_cs; + } + + UnicodeMsg->lParam = (LPARAM)xs; + break; + } + + case WM_MDICREATE: + { + MDICREATESTRUCTW *cs = + (MDICREATESTRUCTW *)HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)); + + if (!cs) + { + return FALSE; + } + + *cs = *(MDICREATESTRUCTW *)AnsiMsg->lParam; + + if (!IS_ATOM(cs->szClass)) + { + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)cs->szClass); + cs->szClass = UnicodeString.Buffer; + } + + RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)cs->szTitle); + cs->szTitle = UnicodeString.Buffer; + + UnicodeMsg->lParam = (LPARAM)cs; + break; + } + + case WM_GETDLGCODE: + if (UnicodeMsg->lParam) + { + MSG newmsg = *(MSG *)UnicodeMsg->lParam; + newmsg.wParam = map_wparam_AtoW( newmsg.message, newmsg.wParam); + } + break; + + case WM_CHARTOITEM: + case WM_MENUCHAR: + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case EM_SETPASSWORDCHAR: + case WM_IME_CHAR: + UnicodeMsg->wParam = map_wparam_AtoW( AnsiMsg->message, AnsiMsg->wParam ); + break; + } + + return TRUE; +} + +static BOOL FASTCALL +MsgiAnsiToUnicodeCleanup(LPMSG UnicodeMsg, LPMSG AnsiMsg) +{ + UNICODE_STRING UnicodeString; + + switch (AnsiMsg->message) + { + case LB_GETTEXT: + if (!listbox_has_strings( UnicodeMsg->hwnd )) break; + case CB_GETLBTEXT: + if (UnicodeMsg->message == CB_GETLBTEXT && !combobox_has_strings( UnicodeMsg->hwnd )) break; + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + if (!UnicodeMsg->lParam) break; + RtlFreeHeap(GetProcessHeap(), 0, (PVOID) UnicodeMsg->lParam); + break; + } + + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + { + if (!UnicodeMsg->lParam) break; + RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); + RtlFreeUnicodeString(&UnicodeString); + break; + } + + case LB_ADDSTRING: + case LB_ADDSTRING_LOWER: + case LB_ADDSTRING_UPPER: + case LB_INSERTSTRING: + case LB_INSERTSTRING_UPPER: + case LB_INSERTSTRING_LOWER: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + { + if (UnicodeMsg->lParam && listbox_has_strings(AnsiMsg->hwnd)) + { + RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); + RtlFreeUnicodeString(&UnicodeString); + } + break; + } + + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + { + if (UnicodeMsg->lParam && combobox_has_strings(AnsiMsg->hwnd)) + { + RtlInitUnicodeString(&UnicodeString, (PCWSTR)UnicodeMsg->lParam); + RtlFreeUnicodeString(&UnicodeString); + } + break; + } + + case WM_NCCREATE: + case WM_CREATE: + { + struct s + { + CREATESTRUCTW cs; /* new structure */ + LPWSTR lpszName; /* allocated Name */ + LPWSTR lpszClass; /* allocated Class */ + }; + + struct s *xs = (struct s *)UnicodeMsg->lParam; + if (xs->lpszName) + { + RtlInitUnicodeString(&UnicodeString, (PCWSTR)xs->lpszName); + RtlFreeUnicodeString(&UnicodeString); + } + if (xs->lpszClass) + { + RtlInitUnicodeString(&UnicodeString, (PCWSTR)xs->lpszClass); + RtlFreeUnicodeString(&UnicodeString); + } + HeapFree(GetProcessHeap(), 0, xs); + break; + } + + case WM_MDICREATE: + { + MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)UnicodeMsg->lParam; + RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szTitle); + RtlFreeUnicodeString(&UnicodeString); + if (!IS_ATOM(cs->szClass)) + { + RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szClass); + RtlFreeUnicodeString(&UnicodeString); + } + HeapFree(GetProcessHeap(), 0, cs); + break; + } + } + + return(TRUE); +} + +/* + * Unicode Result to Ansi Result + */ +static BOOL FASTCALL +MsgiAnsiToUnicodeReply(LPMSG UnicodeMsg, LPMSG AnsiMsg, LRESULT *Result) +{ + LPWSTR Buffer = (LPWSTR)UnicodeMsg->lParam; + LPSTR AnsiBuffer = (LPSTR)AnsiMsg->lParam; + + switch (AnsiMsg->message) + { + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + if (UnicodeMsg->wParam) + { + DWORD len = 0; + if (*Result) RtlUnicodeToMultiByteN( AnsiBuffer, UnicodeMsg->wParam - 1, &len, Buffer, strlenW(Buffer) * sizeof(WCHAR) ); + AnsiBuffer[len] = 0; + *Result = len; + } + break; + } + case LB_GETTEXT: + { + if (!AnsiBuffer || !listbox_has_strings( UnicodeMsg->hwnd )) break; + if (*Result >= 0) + { + DWORD len; + RtlUnicodeToMultiByteN( AnsiBuffer, ~0u, &len, Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR) ); + *Result = len - 1; + } + break; + } + case CB_GETLBTEXT: + { + if (!AnsiBuffer || !combobox_has_strings( UnicodeMsg->hwnd )) break; + if (*Result >= 0) + { + DWORD len; + RtlUnicodeToMultiByteN( AnsiBuffer, ~0u, &len, Buffer, (strlenW(Buffer) + 1) * sizeof(WCHAR) ); + *Result = len - 1; + } + break; + } + } + + MsgiAnsiToUnicodeCleanup(UnicodeMsg, AnsiMsg); + + return TRUE; +} + +static BOOL FASTCALL +MsgiUnicodeToAnsiMessage(HWND hwnd, LPMSG AnsiMsg, LPMSG UnicodeMsg) +{ + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + + *AnsiMsg = *UnicodeMsg; + + switch(UnicodeMsg->message) + { + case WM_CREATE: + case WM_NCCREATE: + { + MDICREATESTRUCTA *pmdi_cs; + CREATESTRUCTA* CsA; + CREATESTRUCTW* CsW; + NTSTATUS Status; + + CsW = (CREATESTRUCTW*)(UnicodeMsg->lParam); + CsA = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(CREATESTRUCTA) + sizeof(MDICREATESTRUCTA)); + if (NULL == CsA) + { + return FALSE; + } + memcpy(CsA, CsW, sizeof(CREATESTRUCTW)); + + /* pmdi_cs starts right after CsA */ + pmdi_cs = (MDICREATESTRUCTA*)(CsA + 1); + + RtlInitUnicodeString(&UnicodeString, CsW->lpszName); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + if (! NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, CsA); + return FALSE; + } + CsA->lpszName = AnsiString.Buffer; + if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) + { + RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); + Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); + if (! NT_SUCCESS(Status)) + { + RtlInitAnsiString(&AnsiString, CsA->lpszName); + RtlFreeAnsiString(&AnsiString); + RtlFreeHeap(GetProcessHeap(), 0, CsA); + return FALSE; + } + CsA->lpszClass = AnsiString.Buffer; + } + + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) + { + *pmdi_cs = *(MDICREATESTRUCTA *)CsW->lpCreateParams; + pmdi_cs->szTitle = CsA->lpszName; + pmdi_cs->szClass = CsA->lpszClass; + CsA->lpCreateParams = pmdi_cs; + } + + AnsiMsg->lParam = (LPARAM)CsA; + break; + } + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + if (!UnicodeMsg->lParam) break; + /* Ansi string might contain MBCS chars so we need 2 * the number of chars */ + AnsiMsg->wParam = UnicodeMsg->wParam * 2; + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, AnsiMsg->wParam); + if (!AnsiMsg->lParam) return FALSE; + break; + } + + case LB_GETTEXT: + { + DWORD Size; + if (!UnicodeMsg->lParam || !listbox_has_strings( UnicodeMsg->hwnd )) break; + Size = SendMessageA( UnicodeMsg->hwnd, LB_GETTEXTLEN, UnicodeMsg->wParam, 0 ); + if (Size == LB_ERR) + { + ERR("LB_GETTEXT LB_ERR\n"); + Size = sizeof(ULONG_PTR); + } + Size = (Size + 1) * sizeof(WCHAR); + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + if (!AnsiMsg->lParam) return FALSE; + break; + } + + case CB_GETLBTEXT: + { + DWORD Size; + if (!UnicodeMsg->lParam || !combobox_has_strings( UnicodeMsg->hwnd )) break; + Size = SendMessageA( UnicodeMsg->hwnd, CB_GETLBTEXTLEN, UnicodeMsg->wParam, 0 ); + if (Size == LB_ERR) + { + ERR("CB_GETTEXT LB_ERR\n"); + Size = sizeof(ULONG_PTR); + } + Size = (Size + 1) * sizeof(WCHAR); + AnsiMsg->lParam = (LPARAM) RtlAllocateHeap(GetProcessHeap(), 0, Size); + if (!AnsiMsg->lParam) return FALSE; + break; + } + + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + { + if (!UnicodeMsg->lParam) break; + RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + TRUE))) + { + return FALSE; + } + AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; + break; + } + + case LB_ADDSTRING: + case LB_ADDSTRING_LOWER: + case LB_ADDSTRING_UPPER: + case LB_INSERTSTRING: + case LB_INSERTSTRING_UPPER: + case LB_INSERTSTRING_LOWER: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + { + if (UnicodeMsg->lParam && listbox_has_strings(AnsiMsg->hwnd)) + { + RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + TRUE))) + { + return FALSE; + } + AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; + } + break; + } + + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + { + if (UnicodeMsg->lParam && combobox_has_strings(AnsiMsg->hwnd)) + { + RtlInitUnicodeString(&UnicodeString, (PWSTR) UnicodeMsg->lParam); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + TRUE))) + { + return FALSE; + } + AnsiMsg->lParam = (LPARAM) AnsiString.Buffer; + } + break; + } + + case WM_MDICREATE: + { + MDICREATESTRUCTA *cs = + (MDICREATESTRUCTA *)HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)); + + if (!cs) + { + return FALSE; + } + + *cs = *(MDICREATESTRUCTA *)UnicodeMsg->lParam; + + if (!IS_ATOM(cs->szClass)) + { + RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szClass); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + TRUE))) + { + HeapFree(GetProcessHeap(), 0, cs); + return FALSE; + } + cs->szClass = AnsiString.Buffer; + } + + RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szTitle); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + TRUE))) + { + if (!IS_ATOM(cs->szClass)) + { + RtlInitAnsiString(&AnsiString, cs->szClass); + RtlFreeAnsiString(&AnsiString); + } + + HeapFree(GetProcessHeap(), 0, cs); + return FALSE; + } + cs->szTitle = AnsiString.Buffer; + + AnsiMsg->lParam = (LPARAM)cs; + break; + } + + case WM_GETDLGCODE: + if (UnicodeMsg->lParam) + { + MSG newmsg = *(MSG *)UnicodeMsg->lParam; + switch(newmsg.message) + { + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + newmsg.wParam = map_wparam_char_WtoA( newmsg.wParam, 1 ); + break; + case WM_IME_CHAR: + newmsg.wParam = map_wparam_char_WtoA( newmsg.wParam, 2 ); + break; + } + } + break; + + case WM_CHAR: + { + WCHAR wch = UnicodeMsg->wParam; + char ch[2]; + DWORD cp = get_input_codepage(); + DWORD len = WideCharToMultiByte( cp, 0, &wch, 1, ch, 2, NULL, NULL ); + AnsiMsg->wParam = (BYTE)ch[0]; + if (len == 2) AnsiMsg->wParam = (BYTE)ch[1]; + } + break; + + case WM_CHARTOITEM: + case WM_MENUCHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case EM_SETPASSWORDCHAR: + AnsiMsg->wParam = map_wparam_char_WtoA(UnicodeMsg->wParam,1); + break; + + case WM_IME_CHAR: + AnsiMsg->wParam = map_wparam_char_WtoA(UnicodeMsg->wParam,2); + break; + } + return TRUE; +} + +static BOOL FASTCALL +MsgiUnicodeToAnsiCleanup(LPMSG AnsiMsg, LPMSG UnicodeMsg) +{ + ANSI_STRING AnsiString; + + switch(UnicodeMsg->message) + { + case LB_GETTEXT: + if (!listbox_has_strings( AnsiMsg->hwnd )) break; + case CB_GETLBTEXT: + if (AnsiMsg->message == CB_GETLBTEXT && !combobox_has_strings( AnsiMsg->hwnd )) break; + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + if (!AnsiMsg->lParam) break; + RtlFreeHeap(GetProcessHeap(), 0, (PVOID) AnsiMsg->lParam); + break; + } + case WM_CREATE: + case WM_NCCREATE: + { + CREATESTRUCTA* Cs; + + Cs = (CREATESTRUCTA*) AnsiMsg->lParam; + RtlInitAnsiString(&AnsiString, Cs->lpszName); + RtlFreeAnsiString(&AnsiString); + if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) + { + RtlInitAnsiString(&AnsiString, Cs->lpszClass); + RtlFreeAnsiString(&AnsiString); + } + RtlFreeHeap(GetProcessHeap(), 0, Cs); + break; + } + + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + { + if (!AnsiMsg->lParam) break; + RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); + RtlFreeAnsiString(&AnsiString); + break; + } + + case LB_ADDSTRING: + case LB_ADDSTRING_LOWER: + case LB_ADDSTRING_UPPER: + case LB_INSERTSTRING: + case LB_INSERTSTRING_UPPER: + case LB_INSERTSTRING_LOWER: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + { + if (AnsiMsg->lParam && listbox_has_strings(AnsiMsg->hwnd)) + { + RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); + RtlFreeAnsiString(&AnsiString); + } + break; + } + + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + { + if (AnsiMsg->lParam && combobox_has_strings(AnsiMsg->hwnd)) + { + RtlInitAnsiString(&AnsiString, (PSTR) AnsiMsg->lParam); + RtlFreeAnsiString(&AnsiString); + } + break; + } + + case WM_MDICREATE: + { + MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)AnsiMsg->lParam; + RtlInitAnsiString(&AnsiString, (PCSTR)cs->szTitle); + RtlFreeAnsiString(&AnsiString); + if (!IS_ATOM(cs->szClass)) + { + RtlInitAnsiString(&AnsiString, (PCSTR)cs->szClass); + RtlFreeAnsiString(&AnsiString); + } + HeapFree(GetProcessHeap(), 0, cs); + break; + } + + } + + return TRUE; +} + +/* + * Ansi Result to Unicode Result + */ +static BOOL FASTCALL +MsgiUnicodeToAnsiReply(LPMSG AnsiMsg, LPMSG UnicodeMsg, LRESULT *Result) +{ + LPSTR Buffer = (LPSTR) AnsiMsg->lParam; + LPWSTR UBuffer = (LPWSTR) UnicodeMsg->lParam; + + switch (UnicodeMsg->message) + { + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + DWORD len = AnsiMsg->wParam * 2; + if (len) + { + if (*Result) + { + RtlMultiByteToUnicodeN( UBuffer, AnsiMsg->wParam*sizeof(WCHAR), &len, Buffer, strlen(Buffer)+1 ); + *Result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ + } + UBuffer[*Result] = 0; + } + break; + } + case LB_GETTEXT: + { + if (!UBuffer || !listbox_has_strings( UnicodeMsg->hwnd )) break; + if (*Result >= 0) + { + DWORD len; + RtlMultiByteToUnicodeN( UBuffer, ~0u, &len, Buffer, strlen(Buffer) + 1 ); + *Result = len / sizeof(WCHAR) - 1; + } + break; + } + case CB_GETLBTEXT: + { + if (!UBuffer || !combobox_has_strings( UnicodeMsg->hwnd )) break; + if (*Result >= 0) + { + DWORD len; + RtlMultiByteToUnicodeN( UBuffer, ~0u, &len, Buffer, strlen(Buffer) + 1 ); + *Result = len / sizeof(WCHAR) - 1; + } + break; + } + } + + MsgiUnicodeToAnsiCleanup(AnsiMsg, UnicodeMsg); + + return TRUE; +} + + LRESULT WINAPI DesktopWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) @@ -1346,7 +1512,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; @@ -1395,7 +1561,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; @@ -1488,7 +1654,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg); + ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; @@ -1542,7 +1708,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg); + ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti); } _SEH2_END; @@ -2210,9 +2376,7 @@ if ( Window != NULL && Window->head.pti == ti && -// !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. - !ISITHOOKED(WH_CALLWNDPROC) && - !ISITHOOKED(WH_CALLWNDPROCRET) && + !IsThreadHooked(GetWin32ClientInfo()) && // This is why HOOKs are bad! They slow the system down! !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure @@ -2275,9 +2439,7 @@ if ( Window != NULL && Window->head.pti == ti && -// !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. - !ISITHOOKED(WH_CALLWNDPROC) && - !ISITHOOKED(WH_CALLWNDPROCRET) && + !IsThreadHooked(GetWin32ClientInfo()) && // This is why HOOKs are bad! They slow the system down! !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure @@ -2422,8 +2584,6 @@ MSG AnsiMsg, UcMsg; LRESULT Result; DOSENDMESSAGE dsm; - PWND Window; - PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2433,23 +2593,6 @@ if (lpdwResult) *lpdwResult = 0; - //// This is due to message system bug. - if (hWnd != HWND_TOPMOST && hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) - { - Window = ValidateHwnd(hWnd); - - if ( Window != NULL && - Window->head.pti == ti && - !ISITHOOKED(WH_CALLWNDPROC) && - !ISITHOOKED(WH_CALLWNDPROCRET) && - !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) - { - Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, TRUE); - if (lpdwResult) *lpdwResult = Result; - return TRUE; - } - } - //// SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; @@ -2499,8 +2642,6 @@ { LRESULT Result; DOSENDMESSAGE dsm; - PWND Window; - PTHREADINFO ti = GetW32ThreadInfo(); if ( Msg & ~WM_MAXIMUM || fuFlags & ~(SMTO_NOTIMEOUTIFNOTHUNG|SMTO_ABORTIFHUNG|SMTO_BLOCK)) { @@ -2510,23 +2651,6 @@ if (lpdwResult) *lpdwResult = 0; - //// This is due to message system bug. - if (hWnd != HWND_TOPMOST && hWnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) - { - Window = ValidateHwnd(hWnd); - - if ( Window != NULL && - Window->head.pti == ti && - !ISITHOOKED(WH_CALLWNDPROC) && - !ISITHOOKED(WH_CALLWNDPROCRET) && - !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) - { - Result = IntCallMessageProc(Window, hWnd, Msg, wParam, lParam, FALSE); - if (lpdwResult) *lpdwResult = Result; - return TRUE; - } - } - //// SPY_EnterMessage(SPY_SENDMESSAGE, hWnd, Msg, wParam, lParam); dsm.uFlags = fuFlags; @@ -2797,7 +2921,7 @@ } if (pci->CallbackWnd.hWnd == UMMsg.hwnd) - pWnd = pci->CallbackWnd.pWnd; + pWnd = pci->CallbackWnd.pWnd; CallbackArgs->Result = IntCallWindowProcW( CallbackArgs->IsAnsiProc, CallbackArgs->Proc,

11 years, 1 month

[jimtabor] 60862: - Use LoadLibrary and only free it only when loaded.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 4 01:31:19 2013 New Revision: 60862 URL: http://svn.reactos.org/svn/reactos?rev=60862&view=rev Log: - Use LoadLibrary and only free it only when loaded. Modified: trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Mon Nov 4 01:31:19 2013 @@ -241,8 +241,7 @@ { _SEH2_TRY { - hLibModule = GetModuleHandleW( comctl32W ); - if (!hLibModule) hLibModule = LoadLibraryW(comctl32W); + hLibModule = LoadLibraryW(comctl32W); if ( hLibModule ) { if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule, "RegisterClassNameW"))) Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Mon Nov 4 01:31:19 2013 @@ -571,8 +571,9 @@ WPARAM wParam = 0; LPARAM lParam = 0; LRESULT Result = 0; - BOOL Hit = FALSE; + BOOL Hit = FALSE, Loaded = FALSE; HMODULE mod = NULL; + NTSTATUS Status = STATUS_SUCCESS; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -586,6 +587,10 @@ if (!(mod = LoadLibraryExW((LPCWSTR)Common->ModuleName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) { ERR("Failed to load Hook Module.\n"); + } + else + { + Loaded = TRUE; // Free it only when loaded. } } if (mod) @@ -634,7 +639,7 @@ lParam = Common->lParam; break; default: - if (mod) FreeLibrary(mod); + if (Loaded) FreeLibrary(mod); ERR("HCBT_ not supported = %d\n", Common->Code); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } @@ -758,15 +763,16 @@ _SEH2_END; break; default: - if (mod) FreeLibrary(mod); + if (Loaded) FreeLibrary(mod); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } if (Hit) { ERR("Hook Exception! Id: %d, Code %d, Proc 0x%x\n",Common->HookId,Common->Code,Proc); - } - if (mod) FreeLibrary(mod); - return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); + Status = STATUS_UNSUCCESSFUL; + } + if (Loaded) FreeLibrary(mod); + return ZwCallbackReturn(&Result, sizeof(LRESULT), Status); } NTSTATUS WINAPI

11 years, 1 month

[jimtabor] 60861: - Init module handle.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Nov 4 00:58:32 2013 New Revision: 60861 URL: http://svn.reactos.org/svn/reactos?rev=60861&view=rev Log: - Init module handle. Modified: trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Mon Nov 4 00:58:32 2013 @@ -300,7 +300,7 @@ { UNICODE_STRING ClassName = {0}; LPCSTR pszMenuName; - HMODULE hLibModule; + HMODULE hLibModule = NULL; DWORD save_error; BOOL Ret, ClassFound = FALSE; @@ -401,7 +401,7 @@ { UNICODE_STRING ClassName = {0}; LPWSTR pszMenuName; - HMODULE hLibModule; + HMODULE hLibModule = NULL; DWORD save_error; BOOL Ret, ClassFound = FALSE; @@ -1429,7 +1429,7 @@ UNICODE_STRING MenuName = {0}; CLSMENUNAME clsMenuName; ANSI_STRING AnsiMenuName; - HMODULE hLibModule; + HMODULE hLibModule = NULL; DWORD save_error; BOOL ClassFound = FALSE; Modified: trunk/reactos/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Mon Nov 4 00:58:32 2013 @@ -169,7 +169,7 @@ UNICODE_STRING ClassName; WNDCLASSEXA wceA; WNDCLASSEXW wceW; - HMODULE hLibModule; + HMODULE hLibModule = NULL; DWORD save_error; BOOL Unicode, ClassFound = FALSE; HWND Handle = NULL;

11 years, 1 month

[hbelusca] 60860: [NTVDM] - Add a missing "goto Cleanup; " - Add DPRINT1s at the beginning and the end of ntvdm, so that one can easily localize in debug logs where one started it. Suggested by Vamp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 4 00:22:29 2013 New Revision: 60860 URL: http://svn.reactos.org/svn/reactos?rev=60860&view=rev Log: [NTVDM] - Add a missing "goto Cleanup;" - Add DPRINT1s at the beginning and the end of ntvdm, so that one can easily localize in debug logs where one started it. Suggested by Vampyre ;) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Mon Nov 4 00:22:29 2013 @@ -101,6 +101,8 @@ } #endif + DPRINT1("\n\n\nNTVDM - Starting '%s'...\n\n\n", CommandLine); + if (!EmulatorInitialize()) { wprintf(L"FATAL: Failed to initialize the CPU emulator\n"); @@ -135,7 +137,7 @@ if (!DosCreateProcess(CommandLine, 0)) { DisplayMessage(L"Could not start program: %S", CommandLine); - return -1; + goto Cleanup; } /* Find the starting performance and tick count */ @@ -226,6 +228,8 @@ BiosCleanup(); EmulatorCleanup(); + DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n"); + return 0; }

11 years, 1 month

← Newer
1
...
27
28
29
30
31
32
33
34
35
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 November 2013