From 382675fc0de2b473c13e27be43ad4b60bbae72c1 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Thu, 21 Nov 2019 18:18:47 +0900
Subject: [PATCH] [SDK][INCLUDE] Update winxx.h and msgdump.h

---
 sdk/include/reactos/msgdump.h | 27 ++++++++-------------------
 sdk/include/reactos/winxx.h   | 10 +++++++++-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h
index a2ae64c4156..eeea6a2cae8 100644
--- a/sdk/include/reactos/msgdump.h
+++ b/sdk/include/reactos/msgdump.h
@@ -5,7 +5,7 @@
  * COPYRIGHT:   Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
  */
 #ifndef _INC_MSGDUMP
-#define _INC_MSGDUMP    16   /* Version 16 */
+#define _INC_MSGDUMP    17   /* Version 17 */
 
 /*
  * NOTE: MD_msgdump function in this file provides Win32API message dump feature.
@@ -261,22 +261,12 @@ MD_OnShowWindow(HWND hwnd, BOOL fShow, UINT status)
                     MSGDUMP_PREFIX, (void *)hwnd, fShow, status);
 }
 
-static __inline void MSGDUMP_API
-MD_OnWinIniChange(HWND hwnd, LPCTSTR lpszSectionName)
-{
-    if (IsWindowUnicode(hwnd))
-        MSGDUMP_TPRINTF(TEXT("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%ls)\n"),
-                        MSGDUMP_PREFIX, (void *)hwnd, (LPCWSTR)lpszSectionName);
-    else
-        MSGDUMP_TPRINTF(TEXT("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%hs)\n"),
-                        MSGDUMP_PREFIX, (void *)hwnd, (LPCSTR)lpszSectionName);
-}
-
-static __inline void MSGDUMP_API
-MD_OnSettingChange(HWND hwnd, WPARAM wParam, LPARAM lParam)
+static __inline LRESULT MSGDUMP_API
+MD_OnSettingChange(HWND hwnd, UINT_PTR wFlag, LPCTSTR pszSection)
 {
-    MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p)\n"),
-                    MSGDUMP_PREFIX, (void *)hwnd);
+    MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p, wFlag:%p, pszSection:%s)\n"),
+                    MSGDUMP_PREFIX, (void *)hwnd, (void *)wFlag, pszSection);
+    return 0;
 }
 
 static __inline void MSGDUMP_API
@@ -5122,9 +5112,8 @@ MD_msgdump(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
         HANDLE_MSG(hwnd, WM_ERASEBKGND, MD_OnEraseBkgnd);
         HANDLE_MSG(hwnd, WM_SYSCOLORCHANGE, MD_OnSysColorChange);
         HANDLE_MSG(hwnd, WM_SHOWWINDOW, MD_OnShowWindow);
-        HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange);
-        /*HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);*/
-            /* WM_SETTINGCHANGE duplicates WM_WININICHANGE */
+        /* HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); */
+        HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);
         HANDLE_MSG(hwnd, WM_DEVMODECHANGE, MD_OnDevModeChange);
         HANDLE_MSG(hwnd, WM_ACTIVATEAPP, MD_OnActivateApp);
         HANDLE_MSG(hwnd, WM_FONTCHANGE, MD_OnFontChange);
diff --git a/sdk/include/reactos/winxx.h b/sdk/include/reactos/winxx.h
index e4acbbd8d6c..4921b106100 100644
--- a/sdk/include/reactos/winxx.h
+++ b/sdk/include/reactos/winxx.h
@@ -6,7 +6,7 @@
  */
 
 #ifndef _INC_WINXX
-#define _INC_WINXX      7   /* Version 7 */
+#define _INC_WINXX      8   /* Version 8 */
 
 #pragma once
 
@@ -538,6 +538,14 @@
 #define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_NCACTIVATE, (WPARAM)(BOOL)(fActive), 0L)
 
+/* LRESULT Cls_OnSettingChange(HWND hwnd, UINT_PTR wFlag, LPCTSTR pszSection) */
+#undef HANDLE_WM_SETTINGCHANGE
+#define HANDLE_WM_SETTINGCHANGE(hwnd,wParam,lParam,fn) \
+    ((fn)((hwnd), (UINT_PTR)(wParam), (LPCTSTR)(LPARAM)(lParam)), 0L)
+#undef FORWARD_WM_SETTINGCHANGE
+#define FORWARD_WM_SETTINGCHANGE(hwnd,wFlag,pszSection,fn) \
+    (LRESULT)(fn)((hwnd), WM_SETTINGCHANGE, (WPARAM)(UINT_PTR)(wFlag), (LPARAM)(LPCTSTR)(pszSection))
+
 /* LONG Edit_OnGetSel(HWND hwnd, LPDWORD lpdwStart, LPDWORD lpdwEnd) */
 #define HANDLE_EM_GETSEL(hwnd, wParam, lParam, fn) \
     (LRESULT)(LONG)(fn)((hwnd), (LPDWORD)(wParam), (LPDWORD)(lParam))
-- 
2.17.1