[SDK][INCLUDE] Update winxx.h and msgdump.h

This commit is contained in:
Katayama Hirofumi MZ 2019-11-21 18:18:47 +09:00
parent ebfb62b420
commit 382675fc0d
2 changed files with 17 additions and 20 deletions

View file

@ -5,7 +5,7 @@
* COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com) * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
#ifndef _INC_MSGDUMP #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. * 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); MSGDUMP_PREFIX, (void *)hwnd, fShow, status);
} }
static __inline void MSGDUMP_API static __inline LRESULT MSGDUMP_API
MD_OnWinIniChange(HWND hwnd, LPCTSTR lpszSectionName) MD_OnSettingChange(HWND hwnd, UINT_PTR wFlag, LPCTSTR pszSection)
{ {
if (IsWindowUnicode(hwnd)) MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p, wFlag:%p, pszSection:%s)\n"),
MSGDUMP_TPRINTF(TEXT("%sWM_WININICHANGE(hwnd:%p, lpszSectionName:%ls)\n"), MSGDUMP_PREFIX, (void *)hwnd, (void *)wFlag, pszSection);
MSGDUMP_PREFIX, (void *)hwnd, (LPCWSTR)lpszSectionName); return 0;
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)
{
MSGDUMP_TPRINTF(TEXT("%sWM_SETTINGCHANGE(hwnd:%p)\n"),
MSGDUMP_PREFIX, (void *)hwnd);
} }
static __inline void MSGDUMP_API 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_ERASEBKGND, MD_OnEraseBkgnd);
HANDLE_MSG(hwnd, WM_SYSCOLORCHANGE, MD_OnSysColorChange); HANDLE_MSG(hwnd, WM_SYSCOLORCHANGE, MD_OnSysColorChange);
HANDLE_MSG(hwnd, WM_SHOWWINDOW, MD_OnShowWindow); HANDLE_MSG(hwnd, WM_SHOWWINDOW, MD_OnShowWindow);
HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); /* HANDLE_MSG(hwnd, WM_WININICHANGE, MD_OnWinIniChange); */
/*HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);*/ HANDLE_MSG(hwnd, WM_SETTINGCHANGE, MD_OnSettingChange);
/* WM_SETTINGCHANGE duplicates WM_WININICHANGE */
HANDLE_MSG(hwnd, WM_DEVMODECHANGE, MD_OnDevModeChange); HANDLE_MSG(hwnd, WM_DEVMODECHANGE, MD_OnDevModeChange);
HANDLE_MSG(hwnd, WM_ACTIVATEAPP, MD_OnActivateApp); HANDLE_MSG(hwnd, WM_ACTIVATEAPP, MD_OnActivateApp);
HANDLE_MSG(hwnd, WM_FONTCHANGE, MD_OnFontChange); HANDLE_MSG(hwnd, WM_FONTCHANGE, MD_OnFontChange);

View file

@ -6,7 +6,7 @@
*/ */
#ifndef _INC_WINXX #ifndef _INC_WINXX
#define _INC_WINXX 7 /* Version 7 */ #define _INC_WINXX 8 /* Version 8 */
#pragma once #pragma once
@ -538,6 +538,14 @@
#define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \ #define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \
(BOOL)(DWORD)(fn)((hwnd), WM_NCACTIVATE, (WPARAM)(BOOL)(fActive), 0L) (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) */ /* LONG Edit_OnGetSel(HWND hwnd, LPDWORD lpdwStart, LPDWORD lpdwEnd) */
#define HANDLE_EM_GETSEL(hwnd, wParam, lParam, fn) \ #define HANDLE_EM_GETSEL(hwnd, wParam, lParam, fn) \
(LRESULT)(LONG)(fn)((hwnd), (LPDWORD)(wParam), (LPDWORD)(lParam)) (LRESULT)(LONG)(fn)((hwnd), (LPDWORD)(wParam), (LPDWORD)(lParam))