Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 12:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync dde.c to wine 1.1.34

Browse source 
svn path=/trunk/; revision=44421
This commit is contained in:
Christoph von Wittich 2009-12-05 20:04:54 +00:00
parent 0f9bc5c1a4
commit ef635964be
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1971,7 +1971,13 @@ WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected)
/* FIXME: should do better checking */
if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL;
if (!pConv->instance || pConv->instance->threadID != GetCurrentThreadId())
if (!pConv->instance)
{
WARN("wrong thread ID, no instance\n");
return NULL;
}
if (pConv->instance->threadID != GetCurrentThreadId())
{
WARN("wrong thread ID\n");
pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */