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

Michael Stefaniuc mstefani at redhat.de
Tue Jan 27 08:38:32 CST 2009


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 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c
index 12856cc..602a39f 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) */
-- 
1.6.0.6
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090127/66ea3991/attachment.pgp 


More information about the wine-patches mailing list