[ros-diffs] [rharabien] 51322: [SHELL32] * Return 1 in WM_ERASEBKGND when desktop is painted * Fix background for desktop icons and their labels * Moreover fixes explorer_new background

[rharabien at svn.reactos.org]

Author: rharabien
Date: Tue Apr 12 18:45:06 2011
New Revision: 51322

URL: http://svn.reactos.org/svn/reactos?rev=51322&view=rev
Log:
[SHELL32]
* Return 1 in WM_ERASEBKGND when desktop is painted
* Fix background for desktop icons and their labels
* Moreover fixes explorer_new background

Modified:
    trunk/reactos/dll/win32/shell32/desktop.c
    trunk/reactos/dll/win32/shell32/shlview.c

Modified: trunk/reactos/dll/win32/shell32/desktop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.c?rev=51322&r1=51321&r2=51322&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] Tue Apr 12 18:45:06 2011
@@ -586,8 +586,7 @@
         switch (uMsg)
         {
             case WM_ERASEBKGND:
-                PaintDesktop((HDC)wParam);
-                break;
+                return (LRESULT)PaintDesktop((HDC)wParam);
 
             case WM_GETISHELLBROWSER:
                 Ret = (LRESULT)IShellBrowser_from_impl(This);

Modified: trunk/reactos/dll/win32/shell32/shlview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.c?rev=51322&r1=51321&r2=51322&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Tue Apr 12 18:45:06 2011
@@ -324,8 +324,11 @@
           * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow
           * and activate drop shadows if necessary
           */
-         if (0)
+         if (1)
+         {
            SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE);
+           SendMessageW(This->hWndList, LVM_SETBKCOLOR, 0, CLR_NONE);
+         }
          else
          {
            SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP));
@@ -1833,7 +1836,7 @@
 	  case WM_SHOWWINDOW:	UpdateWindow(pThis->hWndList);
 				break;
 
-	  case WM_GETDLGCODE:   return SendMessageA(pThis->hWndList,uMessage,0,0);
+	  case WM_GETDLGCODE:   return SendMessageW(pThis->hWndList,uMessage,0,0);
 
 	  case WM_DESTROY:
 	  			RevokeDragDrop(pThis->hWnd);
@@ -1843,7 +1846,7 @@
 	  case WM_ERASEBKGND:
 	    if ((pThis->FolderSettings.fFlags & FWF_DESKTOP) ||
 	        (pThis->FolderSettings.fFlags & FWF_TRANSPARENT))
-	      return 1;
+            return SendMessageW(pThis->hWndParent, WM_ERASEBKGND, wParam, lParam); /* redirect to parent */
 	    break;
       case CWM_GETISHELLBROWSER:
           return (LRESULT)pThis->pShellBrowser;