Huw Davies : gdi32: Add a solid_rects primitive.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f382478377037eae92c2b8722b8066f5d85d21dd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f382478377037eae92c2b8722b...

Author: Huw Davies 
Date:   Thu Apr  7 13:46:11 2011 +0100

gdi32: Add a solid_rects primitive.

---

dlls/gdi32/dibdrv/dibdrv.h     |    1 +
 dlls/gdi32/dibdrv/primitives.c |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h
index 9ed7661..346b17a 100644
--- a/dlls/gdi32/dibdrv/dibdrv.h
+++ b/dlls/gdi32/dibdrv/dibdrv.h
@@ -25,6 +25,7 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev )

typedef struct primitive_funcs
 {
+    void        (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor);
     DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color);
 } primitive_funcs;

diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c
index 92559d2..c8d60cb 100644
--- a/dlls/gdi32/dibdrv/primitives.c
+++ b/dlls/gdi32/dibdrv/primitives.c
@@ -21,6 +21,35 @@
 #include "gdi_private.h"
 #include "dibdrv.h"

+static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y)
+{
+    return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4);
+}
+
+static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor)
+{
+    *ptr = (*ptr & and) ^ xor;
+}
+
+static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor)
+{
+    DWORD *ptr, *start;
+    int x, y, i;
+
+    for(i = 0; i < num; i++, rc++)
+    {
+        start = ptr = get_pixel_ptr_32(dib, rc->left, rc->top);
+        for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 4)
+            for(x = rc->left, ptr = start; x < rc->right; x++)
+                do_rop_32(ptr++, and, xor);
+    }
+}
+
+static void solid_rects_null(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor)
+{
+    return;
+}
+
 static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color)
 {
     return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) );
@@ -58,15 +87,18 @@ static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color)

const primitive_funcs funcs_8888 =
 {
+    solid_rects_32,
     colorref_to_pixel_888
 };

const primitive_funcs funcs_32 =
 {
+    solid_rects_32,
     colorref_to_pixel_masks
 };

const primitive_funcs funcs_null =
 {
+    solid_rects_null,
     colorref_to_pixel_null
 };