[ros-diffs] [gadamopoulos] 53492: [win32k] - revert r53355. - it's changes are not needed as wine's spy channel is better, and this time we will get rid of all unwanted changes ( my previous commit did not fix...

gadamopoulos at svn.reactos.org gadamopoulos at svn.reactos.org
Mon Aug 29 17:30:11 UTC 2011


Author: gadamopoulos
Date: Mon Aug 29 17:30:11 2011
New Revision: 53492

URL: http://svn.reactos.org/svn/reactos?rev=53492&view=rev
Log:
[win32k]
- revert r53355.
- it's changes are not needed as wine's spy channel is better, and this time we will get rid of all unwanted changes ( my previous commit did not fix all unwanted changes)

Modified:
    trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
    trunk/reactos/subsystems/win32/win32k/ntuser/callback.c
    trunk/reactos/subsystems/win32/win32k/ntuser/focus.c
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c
    trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c

Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h?rev=53492&r1=53491&r2=53492&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Mon Aug 29 17:30:11 2011
@@ -97,7 +97,6 @@
         DbgChUserMisc,
         DbgChUserMonitor,
         DbgChUserMsg,
-        DbgChUserMsgCall,
         DbgChUserMsgQ,
         DbgChUserObj,
         DbgChUserPainting,

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/callback.c?rev=53492&r1=53491&r2=53492&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Aug 29 17:30:11 2011
@@ -173,8 +173,6 @@
    ULONG ResultLength;
    ULONG ArgumentLength;
    LRESULT Result;
-
-   TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam);
 
    if (0 < lParamBufferSize)
    {

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/focus.c?rev=53492&r1=53491&r2=53492&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Aug 29 17:30:11 2011
@@ -164,9 +164,8 @@
 {
    if (hWndPrev)
    {
-      TRACE("sending WM_KILLFOCUS to hwnd 0x%x\n", hWndPrev);
       IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0);
-      co_IntSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0);
+      co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0);
    }
 }
 
@@ -177,7 +176,7 @@
    {
       PWND pWnd = UserGetWindowObject(hWnd);
       IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0);
-      co_IntSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0);
+      co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0);
    }
 }
 
@@ -403,14 +402,13 @@
          return 0;
       }
       ThreadQueue->FocusWindow = Window->head.h;
-      TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, Window->head.h);
+      TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h);
 
       co_IntSendKillFocusMessages(hWndPrev, Window->head.h);
       co_IntSendSetFocusMessages(hWndPrev, Window->head.h);
    }
    else
    {
-      TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, 0);
       ThreadQueue->FocusWindow = 0;
       if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)0, (LPARAM)hWndPrev))
       {
@@ -699,7 +697,7 @@
    DECLARE_RETURN(HWND);
    HWND ret;
 
-   TRACE("Enter NtUserSetFocus(0x%x)\n", hWnd);
+   TRACE("Enter NtUserSetFocus(%x)\n", hWnd);
    UserEnterExclusive();
 
    if (hWnd)

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/message.c?rev=53492&r1=53491&r2=53492&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Aug 29 17:30:11 2011
@@ -1182,7 +1182,6 @@
 
     if (!(Window = UserGetWindowObject(hWnd)))
     {
-        ERR("UserGetWindowObject filed!\n");
         RETURN( FALSE);
     }
 
@@ -1197,7 +1196,6 @@
     {
         if (Win32Thread->TIF_flags & TIF_INCLEANUP)
         {
-            ERR("Trying to send message to a thread in cleanup\n");
             /* Never send messages to exiting threads */
             RETURN( FALSE);
         }

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c?rev=53492&r1=53491&r2=53492&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Mon Aug 29 17:30:11 2011
@@ -78,7 +78,6 @@
     {L"UserMisc", DbgChUserMisc},
     {L"UserMonitor", DbgChUserMonitor},
     {L"UserMsg", DbgChUserMsg},
-    {L"UserMsgCall", DbgChUserMsgCall},
     {L"UserMsgQ", DbgChUserMsgQ},
     {L"UserObj", DbgChUserObj},
     {L"UserPainting", DbgChUserPainting},




More information about the Ros-diffs mailing list