From 56b3341f8eeeee49679d5fb79a26927106fefab6 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 27 Jan 2009 15:38:32 +0100 Subject: [PATCH] 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. --- dlls/user32/dde_client.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 12856cc398d..602a39fa954 100644 --- 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) */