[ros-diffs] [gedmurphy] 51937: [SHELL32_NEW] - Merge 51436, 51448 and 51526 - Properly support WM_SYSCOLORCHANGE in ShellView window. Changing system colors in ReactOS works perfectly now :)

Author: gedmurphy
Date: Thu May 26 21:36:39 2011
New Revision: 51937

URL: http://svn.reactos.org/svn/reactos?rev=51937&view=rev
Log:
[SHELL32_NEW]
- Merge 51436, 51448 and 51526

- Properly support WM_SYSCOLORCHANGE in ShellView window. Changing system colors in
ReactOS works perfectly now :)

Modified:
    branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp
    branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp

Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Thu May 26
21:36:39 2011
@@ -1429,8 +1429,10 @@
 void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename)
 {
     WCHAR msg[2048];
-    DWORD error_code = GetLastError();
     DWORD_PTR msgArguments[3]  = { (DWORD_PTR)filename, 0, 0 };
+    DWORD error_code;
+
+    error_code = GetLastError();
 
     if (retval == SE_ERR_NOASSOC)
         LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg,
sizeof(msg)/sizeof(WCHAR));

Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…
==============================================================================
--- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original)
+++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu May 26
21:36:39 2011
@@ -200,6 +200,7 @@
 	LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
+	LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
 	LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);
@@ -258,6 +259,7 @@
 	MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode)
 	MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
 	MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
+	MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange)
 	MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser)
 END_MSG_MAP()
 
@@ -854,6 +856,12 @@
 	return 0;
 }
 
+LRESULT CDefView::OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
&bHandled)
+{
+	/* Forward WM_SYSCOLORCHANGE to common controls */
+	return SendMessageW(hWndList, uMsg, 0, 0);
+}
+
 LRESULT CDefView::OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
&bHandled)
 {
 	return (LRESULT)pShellBrowser.p;