[ros-diffs] [gadamopoulos] 53309: [desk] - Use GdiGradientFill and GdiTransparentBlt instead of GradientFill and TransparentBlt - Do not link to msimg32

[gadamopoulos at svn.reactos.org]

Author: gadamopoulos
Date: Thu Aug 18 21:07:16 2011
New Revision: 53309

URL: http://svn.reactos.org/svn/reactos?rev=53309&view=rev
Log:
[desk]
- Use GdiGradientFill and GdiTransparentBlt instead of GradientFill and TransparentBlt
- Do not link to msimg32

Modified:
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild
    branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt?rev=53309&r1=53308&r2=53309&view=diff
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Thu Aug 18 21:07:16 2011
@@ -41,7 +41,6 @@
     ole32
     setupapi
     shell32
-    msimg32
     kernel32
     ntdll)
 

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c?rev=53309&r1=53308&r2=53309&view=diff
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/background.c [iso-8859-1] Thu Aug 18 21:07:16 2011
@@ -649,14 +649,14 @@
         }
     }
 
-    TransparentBlt(draw->hDC,
-                   draw->rcItem.left, draw->rcItem.top,
-                   draw->rcItem.right-draw->rcItem.left+1,
-                   draw->rcItem.bottom-draw->rcItem.top+1,
-                   hDC,
-                   0, 0,
-                   pData->cxSource, pData->cySource,
-                   0xFF00FF);
+    GdiTransparentBlt(draw->hDC,
+                      draw->rcItem.left, draw->rcItem.top,
+                      draw->rcItem.right-draw->rcItem.left+1,
+                      draw->rcItem.bottom-draw->rcItem.top+1,
+                      hDC,
+                      0, 0,
+                      pData->cxSource, pData->cySource,
+                      0xFF00FF);
 
     SelectObject(hDC, hOldObj);
     DeleteDC(hDC);

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild?rev=53309&r1=53308&r2=53309&view=diff
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/desk.rbuild [iso-8859-1] Thu Aug 18 21:07:16 2011
@@ -13,7 +13,6 @@
 	<library>setupapi</library>
 	<library>shell32</library>
 	<library>ntdll</library>
-	<library>msimg32</library>
 	<library>uuid</library>
 	<file>advmon.c</file>
 	<file>appearance.c</file>

Modified: branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c?rev=53309&r1=53308&r2=53309&view=diff
==============================================================================
--- branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c [iso-8859-1] (original)
+++ branches/GSoC_2011/ThemesSupport/dll/cpl/desk/draw.c [iso-8859-1] Thu Aug 18 21:07:16 2011
@@ -475,7 +475,7 @@
 		vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00;
 		vert[1].Alpha = 0;
 
-		GradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H);
+		GdiGradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H);
 	}
 	else
 	{