[ros-diffs] [jimtabor] 37193: - Patch by hto: Fix bugs in Gdi32.dll and User32.dll, see bug 3847.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Tue Nov  4 17:32:11 2008
New Revision: 37193

URL: http://svn.reactos.org/svn/reactos?rev=37193&view=rev
Log:
- Patch by hto: Fix bugs in Gdi32.dll and User32.dll, see bug 3847.

Modified:
    trunk/reactos/dll/win32/gdi32/include/gdi32p.h
    trunk/reactos/dll/win32/user32/controls/combo.c
    trunk/reactos/dll/win32/user32/misc/ddeclient.c

Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gdi32p.h?rev=37193&r1=37192&r2=37193&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Tue Nov  4 17:32:11 2008
@@ -31,7 +31,8 @@
 #define METAFILE_DISK   2
 
 /* MACRO ********************************************************************/
-#define ROP_USES_SOURCE(Rop)   ((Rop << 2) ^ Rop) & 0xCC0000
+
+#define ROP_USES_SOURCE(Rop)   (((Rop) << 2 ^ Rop) & 0xCC0000)
 
 /* TYPES *********************************************************************/
 

Modified: trunk/reactos/dll/win32/user32/controls/combo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/combo.c?rev=37193&r1=37192&r2=37193&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Tue Nov  4 17:32:11 2008
@@ -783,7 +783,7 @@
 	 clipRegion=NULL;
        }
 
-       if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED;
+       if (!(IsWindowEnabled(lphc->self) & WS_DISABLED)) itemState |= ODS_DISABLED;
 
        dis.CtlType	= ODT_COMBOBOX;
        dis.CtlID	= ctlid;

Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddeclient.c?rev=37193&r1=37192&r2=37193&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/ddeclient.c [iso-8859-1] Tue Nov  4 17:32:11 2008
@@ -811,7 +811,7 @@
 	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);
@@ -894,7 +894,7 @@
 	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);