[ros-diffs] [fireball] 43937: - Merge 43934, 43935.

Author: fireball
Date: Tue Nov  3 22:19:36 2009
New Revision: 43937

URL: http://svn.reactos.org/svn/reactos?rev=43937&view=rev
Log:
- Merge 43934, 43935.

Modified:
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c   (contents, props changed)

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32...
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Tue Nov  3 22:19:36 2009
@@ -42,24 +42,19 @@
 LRESULT CALLBACK
 DtbgWindowProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
-  switch(Msg)
+  PAINTSTRUCT PS;
+  HDC hDC;
+
+    switch(Msg)
     {
       case WM_ERASEBKGND:
+        PaintDesktop((HDC)wParam);
         return 1;

case WM_PAINT:
       {
-        PAINTSTRUCT PS;
-        RECT rc;
-        HDC hDC;
-
-        if(GetUpdateRect(Wnd, &rc, FALSE) &&
-           (hDC = BeginPaint(Wnd, &PS)))
-        {
-          // arwinss, commented out due to desktop flickering
-          //PaintDesktop(hDC);
+        if((hDC = BeginPaint(Wnd, &PS)))
           EndPaint(Wnd, &PS);
-        }
         return 0;
       }

@@ -70,6 +65,9 @@
         return (LRESULT) TRUE;

case WM_CREATE:
+        return 0;
+
+      case WM_CLOSE:
         return 0;

case WM_NOTIFY:
@@ -112,6 +110,9 @@
             return 0;
         }
       }
+
+      default:
+        return DefWindowProcW(Wnd, Msg, wParam, lParam);
     }

return 0;

Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov  3 22:19:36 2009
@@ -1,0 +1,2 @@
+/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
+/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935