sync dde.c to wine 1.1.34

svn path=/trunk/; revision=44421

diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c
index 9373d91..c9cfcef 100644 (file)
--- a/reactos/dll/win32/user32/misc/dde.c
+++ b/reactos/dll/win32/user32/misc/dde.c
@@ -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 */