Revert some really unwanted changes to the DDE code (Take 2)
Dmitry Timoshkov
dmitry at baikal.ru
Sun May 25 02:58:33 CDT 2003
Hello,
Please use this patch instead of the previous one. Count of remaining
transactions must be decremented before calling a callback. It explains
why I see it set to 0 in my tests under Windows.
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Revert some really unwanted changes to the DDE code.
--- cvs/hq/wine/dlls/user/dde/server.c Tue May 20 14:07:31 2003
+++ wine/dlls/user/dde/server.c Sun May 25 16:31:26 2003
@@ -101,7 +101,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst,
if (DdeCmpStringHandles(hszItem, pLink->hszItem) == 0)
{
hDdeData = WDML_InvokeCallback(pInstance, XTYP_ADVREQ, pLink->uFmt, pLink->hConv,
- hszTopic, hszItem, 0, 0, 0);
+ hszTopic, hszItem, 0, --count, 0);
if (hDdeData == (HDDEDATA)CBR_BLOCK)
{
@@ -581,10 +581,10 @@ static WDML_QUEUE_STATE WDML_ServerHandl
break;
default:
{
- HGLOBAL hMem = WDML_DataHandle2Global(hDdeData, TRUE, TRUE, FALSE, FALSE);
+ HGLOBAL hMem = WDML_DataHandle2Global(hDdeData, TRUE, FALSE, FALSE, FALSE);
if (!PostMessageA(pConv->hwndClient, WM_DDE_DATA, (WPARAM)pConv->hwndServer,
ReuseDDElParam(pXAct->lParam, WM_DDE_REQUEST, WM_DDE_DATA,
- (UINT)hMem, (UINT)pXAct->atom)))
+ (UINT_PTR)hMem, (UINT_PTR)pXAct->atom)))
{
DdeFreeDataHandle(hDdeData);
GlobalFree(hMem);
More information about the wine-patches
mailing list