[ros-diffs] [jimtabor] 66032: [Win32ss] - Remove hack to work around issue CORE-9039. - Bypass two more DDE message calls from callback. Remove unneeded code.

Author: jimtabor
Date: Mon Jan 12 22:50:12 2015
New Revision: 66032

URL: http://svn.reactos.org/svn/reactos?rev=66032&view=rev
Log:
[Win32ss]
- Remove hack to work around issue CORE-9039.
- Bypass two more DDE message calls from callback. Remove unneeded code.


Modified:
    trunk/reactos/win32ss/user/ntuser/dde.c
    trunk/reactos/win32ss/user/user32/misc/dde.c

Modified: trunk/reactos/win32ss/user/ntuser/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/dde.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/dde.c	[iso-8859-1] Mon Jan 12 22:50:12 2015
@@ -94,14 +94,6 @@
 
    RtlCopyMemory(Common, ResultPointer, ArgumentLength);
 
-   ///// HAX!
-   if ( Common->size == 0xdeadbeef )
-   {
-      ERR("DDE Post callback failed! 2 status %p\n",Status);
-      IntCbFreeMemory(Argument);
-      return 0;
-   }
-
    size    = Common->size;
    *lParam = Common->lParam;
    *Buffer = Common->pvData;
@@ -164,14 +156,6 @@
    }
 
    RtlMoveMemory(Common, ResultPointer, ArgumentLength);
-
-   ///// HAX!
-   if ( Common->size == 0xdeadbeef )
-   {
-      ERR("DDE Get callback failed! 2 status %p\n",Status);
-      IntCbFreeMemory(Argument);
-      return FALSE;
-   }
 
    pMsg->lParam = Common->lParam;
 
@@ -220,6 +204,12 @@
          }
          TRACE("Invalid DDE Client Window handle\n");
          return FALSE;
+      }
+
+      if ( Msg == WM_DDE_REQUEST || Msg == WM_DDE_UNADVISE )
+      {
+         // Do not bother to callback after validation.
+         return TRUE;
       }
 
       if ( Msg == WM_DDE_TERMINATE )
@@ -290,7 +280,7 @@
                     break;
               }
               break;
-           }
+          }
           default:
               break;
       }
@@ -385,11 +375,6 @@
    PWND pWndServer;
    PDDE_PROP pddeProp;
 
-   if (Msg == WM_DDE_ACK)
-   {
-      TRACE("Sending WM_DDE_ACK Client hwnd %p\n",pWnd->head.h);
-   }
-
    if (pWnd->head.pti->ppi != gptiCurrent->ppi)
    {
       TRACE("Sending long DDE 0x%x\n",Msg);

Modified: trunk/reactos/win32ss/user/user32/misc/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/dde.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/dde.c	[iso-8859-1] Mon Jan 12 22:50:12 2015
@@ -276,7 +276,6 @@
   else
   {
      ERR("DDE Post CB Return bad msg 0x%x Size
%d\n",Common->message,Common->size);
-     Common->size = 0xdeadbeef; // HACKSSS!! Return status does not work!
      Status = STATUS_UNSUCCESSFUL;
   }
 
@@ -301,7 +300,6 @@
   if (!Ret)
   {
      ERR("DDE Get CB Return bad msg 0x%x\n",Common->message);
-     Common->size = 0xdeadbeef; // HACKSSS!! Return status does not work!
      Status = STATUS_UNSUCCESSFUL;
   }
   return ZwCallbackReturn(Arguments, ArgumentLength, Status);