Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync dde with wine 1.1.33

Browse source 
svn path=/trunk/; revision=44183
This commit is contained in:
Christoph von Wittich 2009-11-15 22:45:31 +00:00
parent f3e43b25a8
commit 5db2650780
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/user32/misc/dde.c
View file

@ -368,6 +368,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback,
pInstance->nodeList = NULL; /* node will be added later */ pInstance->nodeList = NULL; /* node will be added later */
pInstance->monitorFlags = afCmd & MF_MASK; pInstance->monitorFlags = afCmd & MF_MASK;
pInstance->wStatus = 0; pInstance->wStatus = 0;
pInstance->lastError = DMLERR_NO_ERROR;
pInstance->servers = NULL; pInstance->servers = NULL;
pInstance->convs[0] = NULL; pInstance->convs[0] = NULL;
pInstance->convs[1] = NULL; pInstance->convs[1] = NULL;
@ -718,7 +719,7 @@ HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, H
TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n",
pInstance->callback, uType, uFmt, pInstance->callback, uType, uFmt,
hConv, hsz1, hsz2, hdata, dwData1, dwData2); hConv, hsz1, hsz2, hdata, dwData1, dwData2);
ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2);
TRACE("done => %p\n", ret); TRACE("done => %p\n", ret);
return ret; return ret;
} }