Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inform kernel whether Unicode or Ansi window proc is preferred

Browse source 
svn path=/trunk/; revision=7899
This commit is contained in:
Gé van Geldorp 2004-01-28 20:54:30 +00:00
parent 3d25387466
commit eb980ec861
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/user32/windows/message.c
View file

@ -1,4 +1,4 @@
/* $Id: message.c,v 1.34 2004/01/26 08:44:51 weiden Exp $ /* $Id: message.c,v 1.35 2004/01/28 20:54:30 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -703,6 +703,7 @@ SendMessageW(HWND Wnd,
NTUSERSENDMESSAGEINFO Info; NTUSERSENDMESSAGEINFO Info;
LRESULT Result; LRESULT Result;
Info.Ansi = FALSE;
Result = NtUserSendMessage(Wnd, Msg, wParam, lParam, &Info); Result = NtUserSendMessage(Wnd, Msg, wParam, lParam, &Info);
if (! Info.HandledByKernel) if (! Info.HandledByKernel)
{ {
@ -734,6 +735,7 @@ SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
} }
Info.Ansi = TRUE;
Result = NtUserSendMessage(UcMsg.hwnd, UcMsg.message, Result = NtUserSendMessage(UcMsg.hwnd, UcMsg.message,
UcMsg.wParam, UcMsg.lParam, &Info); UcMsg.wParam, UcMsg.lParam, &Info);
if (! Info.HandledByKernel) if (! Info.HandledByKernel)

13
reactos/subsys/win32k/ntuser/message.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: message.c,v 1.47 2004/01/27 13:21:35 gvg Exp $ /* $Id: message.c,v 1.48 2004/01/28 20:54:30 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -914,9 +914,14 @@ NtUserSendMessage(HWND Wnd,
{ {
if (0xFFFF0000 != ((DWORD) Window->WndProcA & 0xFFFF0000)) if (0xFFFF0000 != ((DWORD) Window->WndProcA & 0xFFFF0000))
{ {
/* Both Unicode and Ansi winprocs are real */ /* Both Unicode and Ansi winprocs are real, see what usermode prefers */
Info.Ansi = ! Window->Unicode; Status = MmCopyFromCaller(&(Info.Ansi), &(UnsafeInfo->Ansi),
Info.Proc = (Window->Unicode ? Window->WndProcW : Window->WndProcA); sizeof(BOOL));
if (! NT_SUCCESS(Status))
{
Info.Ansi = ! Window->Unicode;
}
Info.Proc = (Info.Ansi ? Window->WndProcA : Window->WndProcW);
} }
else else
{ {