[WINED3D 4/9] Add D3DCOLORWRITEENABLE codes to the WINED3D namespace

[Ivan Gyurdiev]

Once again longs were used to make a DWORD - that just seems wrong to 
me.. (1L<<X).
Changed not to do that, because it's misleading.

-------------- next part --------------
---
 dlls/wined3d/device.c        |   24 ++++++++++++------------
 include/wine/wined3d_types.h |    5 +++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b6e56c1..7eb1a60 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4237,14 +4237,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_COLORWRITEENABLE          :
       {
         TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n",
-              Value & D3DCOLORWRITEENABLE_RED   ? 1 : 0,
-              Value & D3DCOLORWRITEENABLE_GREEN ? 1 : 0,
-              Value & D3DCOLORWRITEENABLE_BLUE  ? 1 : 0,
-              Value & D3DCOLORWRITEENABLE_ALPHA ? 1 : 0);
-        glColorMask(Value & D3DCOLORWRITEENABLE_RED   ? GL_TRUE : GL_FALSE,
-                    Value & D3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
-                    Value & D3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE,
-                    Value & D3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
+              Value & WINED3DCOLORWRITEENABLE_RED   ? 1 : 0,
+              Value & WINED3DCOLORWRITEENABLE_GREEN ? 1 : 0,
+              Value & WINED3DCOLORWRITEENABLE_BLUE  ? 1 : 0,
+              Value & WINED3DCOLORWRITEENABLE_ALPHA ? 1 : 0);
+        glColorMask(Value & WINED3DCOLORWRITEENABLE_RED   ? GL_TRUE : GL_FALSE,
+                    Value & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
+                    Value & WINED3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE,
+                    Value & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
         checkGLcall("glColorMask(...)");
       }
       break;
@@ -6128,10 +6128,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl
                      old_color_clear_value[1],
                      old_color_clear_value[2],
                      old_color_clear_value[3]);
-        glColorMask(This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE,
-                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
-                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE,
-                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & D3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
+        glColorMask(This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE,
+                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
+                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_BLUE  ? GL_TRUE : GL_FALSE,
+                    This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE] & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE);
     }
 
     glDisable(GL_SCISSOR_TEST);
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 1787859..48613e3 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -442,6 +442,11 @@ typedef enum _WINED3DRENDERSTATETYPE {
 #define WINEHIGHEST_RENDER_STATE   WINED3DRS_BLENDOPALPHA
         /* Highest WINED3DRS_ value   */
 
+#define WINED3DCOLORWRITEENABLE_RED   (1<<0)
+#define WINED3DCOLORWRITEENABLE_GREEN (1<<1)
+#define WINED3DCOLORWRITEENABLE_BLUE  (1<<2)
+#define WINED3DCOLORWRITEENABLE_ALPHA (1<<3)
+
 typedef enum _WINED3DBLEND {
     WINED3DBLEND_ZERO               =  1,
     WINED3DBLEND_ONE                =  2,
-- 
1.4.2.4