[gvg] 18451: Merge from trunk. Goplat <[e-mail]>:

Merge from trunk. Goplat [e-mail]:
SetPixel should return the new color. Bug 909.
Modified:
branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c
  _____

Modified:
branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c
--- branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c
2005-10-14 18:32:38 UTC (rev 18450)
+++ branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/bitmaps.c
2005-10-14 18:35:05 UTC (rev 18451)
@@ -1022,10 +1022,9 @@

INT  Y,
    COLORREF  Color)
 {
-	COLORREF cr = NtGdiGetPixel(hDC,X,Y);
-	if(cr != CLR_INVALID && NtGdiSetPixelV(hDC,X,Y,Color))
+	if (NtGdiSetPixelV(hDC,X,Y,Color))
    {
-		return(cr);
+		return NtGdiGetPixel(hDC,X,Y);
    }
    return ((COLORREF) -1);
 }