[ros-diffs] [cwittich] 44183: sync dde with wine 1.1.33
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Sun Nov 15 23:45:31 CET 2009
Author: cwittich
Date: Sun Nov 15 23:45:31 2009
New Revision: 44183
URL: http://svn.reactos.org/svn/reactos?rev=44183&view=rev
Log:
sync dde with wine 1.1.33
Modified:
trunk/reactos/dll/win32/user32/misc/dde.c
Modified: trunk/reactos/dll/win32/user32/misc/dde.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.c?rev=44183&r1=44182&r2=44183&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Sun Nov 15 23:45:31 2009
@@ -368,6 +368,7 @@
pInstance->nodeList = NULL; /* node will be added later */
pInstance->monitorFlags = afCmd & MF_MASK;
pInstance->wStatus = 0;
+ pInstance->lastError = DMLERR_NO_ERROR;
pInstance->servers = NULL;
pInstance->convs[0] = NULL;
pInstance->convs[1] = NULL;
@@ -718,7 +719,7 @@
TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n",
pInstance->callback, uType, uFmt,
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);
return ret;
}
More information about the Ros-diffs
mailing list