[ros-diffs] [cwittich] 44421: sync dde.c to wine 1.1.34

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat Dec  5 21:04:54 2009
New Revision: 44421

URL: http://svn.reactos.org/svn/reactos?rev=44421&view=rev
Log:
sync dde.c to wine 1.1.34

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=44421&r1=44420&r2=44421&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] Sat Dec  5 21:04:54 2009
@@ -1971,7 +1971,13 @@
     /* 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 */