dlls/user32/dde_client.c warning fixes (RESEND)

Gerald Pfeifer gerald at pfeifer.com
Tue Dec 30 02:39:28 CST 2008


The current version likely is actually broken since the ! operator has
a higher priority than bitwise & in C.  Unless someone really wanted to
use a very, hmm, unusual construct here?

Gerald

ChangeLog:
Add explict parentheses to fix two incorrect checks for flags.

Index: dlls/user32/dde_client.c
===================================================================
RCS file: /home/wine/wine/dlls/user32/dde_client.c,v
retrieving revision 1.23
diff -u -3 -p -r1.23 dde_client.c
--- dlls/user32/dde_client.c	5 Sep 2008 11:58:37 -0000	1.23
+++ dlls/user32/dde_client.c	31 Oct 2008 13:13:29 -0000
@@ -812,7 +812,7 @@ static WDML_QUEUE_STATE WDML_HandleTermi
 	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);
@@ -895,7 +895,7 @@ static WDML_QUEUE_STATE WDML_HandleIncom
 	return WDML_QS_PASS;
 
     pConv->wStatus |= ST_TERMINATED;
-    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);



More information about the wine-patches mailing list