user32: Fix bogus "if (!x & y)" code.

The dde.c tests succeed on Windows and the DDE callback registered is set to trigger on all messages it gets. Thus it looks like Windows doesn't calls the callback in that case.

user32: Fix bogus "if (!x & y)" code.
56b3341f · Michael Stefaniuc · Alexandre Julliard · 58292e8a · 56b3341f
Commit 56b3341f authored Jan 27, 2009 by Michael Stefaniuc Committed by Alexandre Julliard Jan 27, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

dde_client.c dlls/user32/dde_client.c +1 -6

No files found.
--- a/dlls/user32/dde_client.c
+++ b/dlls/user32/dde_client.c
@@ -821,7 +821,7 @@ static WDML_QUEUE_STATE WDML_HandleTerminateReply(WDML_CONV* pConv, MSG* msg)
 	FIXME("hmmm shouldn't happen\n");
 	return WDML_QS_PASS;
    }
-    if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)
+    if (!(pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS))
    {
 	WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv,
 			    0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0);
@@ -904,11 +904,6 @@ static WDML_QUEUE_STATE WDML_HandleIncomingTerminate(WDML_CONV* pConv, MSG* msg,
 	return WDML_QS_PASS;

    pConv->wStatus |= ST_TERMINATED;
-    if (!pConv->instance->CBFflags & CBF_SKIP_DISCONNECTS)
-    {
-	WDML_InvokeCallback(pConv->instance, XTYP_DISCONNECT, 0, (HCONV)pConv,
-			    0, 0, 0, 0, (pConv->wStatus & ST_ISSELF) ? 1 : 0);
-    }
    if (pConv->wStatus & ST_CONNECTED)
    {
 	/* don't care about result code (if server exists or not) */