Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32ss]

Browse source 
- Remove hack to work around issue CORE-9039.
- Bypass two more DDE message calls from callback. Remove unneeded code.


svn path=/trunk/; revision=66032
This commit is contained in:
James Tabor 2015-01-12 22:50:12 +00:00
parent 5598f29e06
commit 924eb19e72
2 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/win32ss/user/ntuser/dde.c
View file

@ -94,14 +94,6 @@ IntDDEPostCallback(
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;
@ -165,14 +157,6 @@ IntDDEGetCallback(
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;
IntCbFreeMemory(Argument);
@ -222,6 +206,12 @@ IntDdePostMessageHook(
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 )
{
//// FIXME Remove Stuff if any...
@ -290,7 +280,7 @@ IntDdePostMessageHook(
break;
}
break;
}
}
default:
break;
}
@ -385,11 +375,6 @@ IntDdeSendMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
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);

2
reactos/win32ss/user/user32/misc/dde.c
View file

@ -276,7 +276,6 @@ User32CallDDEPostFromKernel(PVOID Arguments, ULONG ArgumentLength)
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 @@ User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength)
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);