Ignore:
Timestamp:
Jun 15, 2002, 7:17:17 PM (23 years ago)
Author:
sandervl
Message:

Do proper filtering for PeekMessage

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/windowmsg.cpp

    r7801 r8689  
    1 /* $Id: windowmsg.cpp,v 1.33 2002-02-05 17:59:02 sandervl Exp $ */
     1/* $Id: windowmsg.cpp,v 1.34 2002-06-15 17:17:17 sandervl Exp $ */
    22/*
    33 * Win32 window message APIs for OS/2
    … …  
    4141LONG WIN32API DispatchMessageA(const MSG * msg)
    4242{
    43   dprintf2(("DispatchMessageA %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
    44   return OSLibWinDispatchMsg((MSG *)msg);
     43    dprintf2(("DispatchMessageA %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
     44    return OSLibWinDispatchMsg((MSG *)msg);
    4545}
    4646//******************************************************************************
    … …  
    4848LONG WIN32API DispatchMessageW( const MSG * msg)
    4949{
    50   dprintf2(("DispatchMessageW %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
    51   return OSLibWinDispatchMsg((MSG *)msg, TRUE);
     50    dprintf2(("DispatchMessageW %x %x %x %x %x", msg->hwnd, msg->message, msg->wParam, msg->lParam, msg->time));
     51    return OSLibWinDispatchMsg((MSG *)msg, TRUE);
    5252}
    5353//******************************************************************************
    … …  
    5555BOOL WIN32API TranslateMessage(const MSG *msg)
    5656{
    57   // check the message code
    58   if ( (msg->message <  WM_KEYDOWN) ||
    59        (msg->message >  WM_SYSKEYUP)||
    60        (msg->message == WM_CHAR)    ||
    61        (msg->message == WM_DEADCHAR) )
    62   {
    63     SetLastError(ERROR_INVALID_PARAMETER);
    64     return FALSE;
    65   }
     57    // check the message code
     58    if ( (msg->message <  WM_KEYDOWN) ||
     59         (msg->message >  WM_SYSKEYUP)||
     60         (msg->message == WM_CHAR)    ||
     61         (msg->message == WM_DEADCHAR) )
     62    {
     63        SetLastError(ERROR_INVALID_PARAMETER);
     64        return FALSE;
     65    }
    6666 
    67   // only WM_KEYDOWN, WM_KEYUP, WM_SYSKEYDOWN, WM_SYSKEYUP
    68   // can go into TranslateMessage
     67    // only WM_KEYDOWN, WM_KEYUP, WM_SYSKEYDOWN, WM_SYSKEYUP
     68    // can go into TranslateMessage
    6969 
    70   return OSLibWinTranslateMessage((MSG *)msg);
     70    return OSLibWinTranslateMessage((MSG *)msg);
    7171}
    7272//******************************************************************************
    … …  
    7474BOOL WIN32API GetMessageA( LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax)
    7575{
    76   BOOL ret;
     76    BOOL ret;
    7777
    7878    dprintf2(("GetMessageA %x %x-%x", hwnd, uMsgFilterMin, uMsgFilterMax));
    … …  
    8686BOOL WIN32API GetMessageW( LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax)
    8787{
    88   BOOL ret;
     88    BOOL ret;
    8989
    9090    dprintf2(("GetMessageW %x %x-%x", hwnd, uMsgFilterMin, uMsgFilterMax));
    … …  
    9898                           UINT uMsgFilterMax, UINT fuRemoveMsg)
    9999{
    100  BOOL fFoundMsg;
     100    BOOL fFoundMsg;
    101101 
    102102    dprintf2(("PeekMessageA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
    … …  
    117117                           UINT uMsgFilterMax, UINT fuRemoveMsg)
    118118{
    119  BOOL fFoundMsg;
     119    BOOL fFoundMsg;
    120120
    121121    dprintf2(("PeekMessageW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
    … …  
    143143LPARAM WIN32API SetMessageExtraInfo(LPARAM lParam)
    144144{
    145   dprintf(("USER32: SetMessageExtraInfo %x", lParam));
    146   return SetThreadMessageExtraInfo(lParam);
     145    dprintf(("USER32: SetMessageExtraInfo %x", lParam));
     146    return SetThreadMessageExtraInfo(lParam);
    147147}
    148148//******************************************************************************
    … …  
    150150DWORD WIN32API GetMessagePos(void)
    151151{
    152  DWORD pos;
     152    DWORD pos;
    153153
    154154    pos = OSLibWinGetMessagePos();
    … …  
    195195UINT WIN32API RegisterWindowMessageA(LPCSTR lpString)
    196196{
    197  UINT rc;
     197    UINT rc;
    198198
    199199    rc = GlobalAddAtomA(lpString);
    … …  
    213213BOOL WIN32API SetMessageQueue(int cMessagesMax)
    214214{
    215   dprintf(("USER32:  SetMessageQueue\n"));
    216   return(TRUE);
     215    dprintf(("USER32:  SetMessageQueue\n"));
     216    return(TRUE);
    217217}
    218218//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.