From ef635964be283f8a4af9fc2578e234aff6d1f868 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 5 Dec 2009 20:04:54 +0000
Subject: [PATCH] sync dde.c to wine 1.1.34

svn path=/trunk/; revision=44421
---
 reactos/dll/win32/user32/misc/dde.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c
index 9373d91f28f..c9cfcefe150 100644
--- 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 */