--- mstools/h/windowsx.h16	2018/08/09 18:21:15	1.1
+++ mstools/h/windowsx.h16	2018/08/09 18:23:11	1.1.1.2
@@ -17,7 +17,7 @@
 
 #ifdef __cplusplus
 extern "C" {            /* Assume C declarations for C++ */
-#endif	/* __cplusplus */
+#endif  /* __cplusplus */
 
 /****** KERNEL Macro APIs ****************************************************/
 
@@ -27,29 +27,29 @@ extern "C" {            /* Assume C decl
 #define     GlobalPtrHandle(lp)         \
                 ((HGLOBAL)LOWORD(GlobalHandle(SELECTOROF(lp))))
 
-#define     GlobalLockPtr(lp)		\
+#define     GlobalLockPtr(lp)           \
                 ((BOOL)SELECTOROF(GlobalLock(GlobalPtrHandle(lp))))
-#define     GlobalUnlockPtr(lp) 	\
+#define     GlobalUnlockPtr(lp)         \
                 GlobalUnlock(GlobalPtrHandle(lp))
 
-#define     GlobalAllocPtr(flags, cb)	\
+#define     GlobalAllocPtr(flags, cb)   \
                 (GlobalLock(GlobalAlloc((flags), (cb))))
-#define     GlobalReAllocPtr(lp, cbNew, flags)	\
+#define     GlobalReAllocPtr(lp, cbNew, flags)  \
                 (GlobalUnlockPtr(lp), GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) , (cbNew), (flags))))
-#define     GlobalFreePtr(lp)		\
+#define     GlobalFreePtr(lp)           \
                 (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp)))
 
 /****** GDI Macro APIs *******************************************************/
 
-#define     DeletePen(hpen)	    DeleteObject((HGDIOBJ)(HPEN)(hpen))
+#define     DeletePen(hpen)         DeleteObject((HGDIOBJ)(HPEN)(hpen))
 #define     SelectPen(hdc, hpen)    ((HPEN)SelectObject((hdc), (HGDIOBJ)(HPEN)(hpen)))
-#define     GetStockPen(i)	    ((HPEN)GetStockObject(i))
+#define     GetStockPen(i)          ((HPEN)GetStockObject(i))
 
-#define     DeleteBrush(hbr)	    DeleteObject((HGDIOBJ)(HBRUSH)(hbr))
+#define     DeleteBrush(hbr)        DeleteObject((HGDIOBJ)(HBRUSH)(hbr))
 #define     SelectBrush(hdc, hbr)   ((HBRUSH)SelectObject((hdc), (HGDIOBJ)(HBRUSH)(hbr)))
-#define     GetStockBrush(i)	    ((HBRUSH)GetStockObject(i))
+#define     GetStockBrush(i)        ((HBRUSH)GetStockObject(i))
 
-#define     DeleteRgn(hrgn)	    DeleteObject((HGDIOBJ)(HRGN)(hrgn))
+#define     DeleteRgn(hrgn)         DeleteObject((HGDIOBJ)(HRGN)(hrgn))
 
 #define     CopyRgn(hrgnDst, hrgnSrc)               CombineRgn(hrgnDst, hrgnSrc, 0, RGN_COPY)
 #define     IntersectRgn(hrgnResult, hrgnA, hrgnB)  CombineRgn(hrgnResult, hrgnA, hrgnB, RGN_AND)
@@ -59,9 +59,9 @@ extern "C" {            /* Assume C decl
 
 #define     DeletePalette(hpal)     DeleteObject((HGDIOBJ)(HPALETTE)(hpal))
 
-#define     DeleteFont(hfont)	    DeleteObject((HGDIOBJ)(HFONT)(hfont))
+#define     DeleteFont(hfont)       DeleteObject((HGDIOBJ)(HFONT)(hfont))
 #define     SelectFont(hdc, hfont)  ((HFONT)SelectObject((hdc), (HGDIOBJ)(HFONT)(hfont)))
-#define     GetStockFont(i)	    ((HFONT)GetStockObject(i))
+#define     GetStockFont(i)         ((HFONT)GetStockObject(i))
 
 #define     DeleteBitmap(hbm)       DeleteObject((HGDIOBJ)(HBITMAP)(hbm))
 #define     SelectBitmap(hdc, hbm)  ((HBITMAP)SelectObject((hdc), (HGDIOBJ)(HBITMAP)(hbm)))
@@ -83,16 +83,16 @@ extern "C" {            /* Assume C decl
 #define     GetNextSibling(hwnd)    GetWindow(hwnd, GW_HWNDNEXT)
 #define     GetPrevSibling(hwnd)    GetWindow(hwnd, GW_HWNDPREV)
 
-#define     GetWindowID(hwnd)	    GetDlgCtrlID(hwnd)
+#define     GetWindowID(hwnd)       GetDlgCtrlID(hwnd)
 
 #define     SetWindowRedraw(hwnd, fRedraw)  \
                     ((void)SendMessage(hwnd, WM_SETREDRAW, (WPARAM)(BOOL)(fRedraw), 0L))
 
-#define     SubclassWindow(hwnd, lpfn)	\
-		((WNDPROC)SetWindowLong((hwnd), GWL_WNDPROC, (LPARAM)(WNDPROC)(lpfn)))
+#define     SubclassWindow(hwnd, lpfn)  \
+                ((WNDPROC)SetWindowLong((hwnd), GWL_WNDPROC, (LPARAM)(WNDPROC)(lpfn)))
 
-#define     IsMinimized(hwnd)	IsIconic(hwnd)
-#define     IsMaximized(hwnd)	IsZoomed(hwnd)
+#define     IsMinimized(hwnd)   IsIconic(hwnd)
+#define     IsMaximized(hwnd)   IsZoomed(hwnd)
 #define     IsRestored(hwnd)    ((GetWindowStyle(hwnd) & (WS_MINIMIZE | WS_MAXIMIZE)) == 0L)
 
 #define     SetWindowFont(hwnd, hfont, fRedraw) FORWARD_WM_SETFONT((hwnd), (hfont), (fRedraw), SendMessage)
@@ -104,14 +104,14 @@ extern "C" {            /* Assume C decl
                     MapWindowPoints((hwndFrom), (hwndTo), (POINT FAR*)(lprc), 2)
 #endif  /* WINVER >= 0x030a */
 
-#define     IsLButtonDown()	(GetKeyState(VK_LBUTTON) < 0)
-#define     IsRButtonDown()	(GetKeyState(VK_RBUTTON) < 0)
-#define     IsMButtonDown()	(GetKeyState(VK_MBUTTON) < 0)
+#define     IsLButtonDown()     (GetKeyState(VK_LBUTTON) < 0)
+#define     IsRButtonDown()     (GetKeyState(VK_RBUTTON) < 0)
+#define     IsMButtonDown()     (GetKeyState(VK_MBUTTON) < 0)
 
 #define     SubclassDialog(hwndDlg, lpfn) \
-		((DLGPROC)SetWindowLong(hwndDlg, DWL_DLGPROC, (LPARAM)(DLGPROC)(lpfn)))
+                ((DLGPROC)SetWindowLong(hwndDlg, DWL_DLGPROC, (LPARAM)(DLGPROC)(lpfn)))
 
-#define     SetDlgMsgResult(hwnd, msg, result)	 \
+#define     SetDlgMsgResult(hwnd, msg, result)   \
     (((msg) == WM_CTLCOLOR || (msg) == WM_COMPAREITEM || (msg) == WM_VKEYTOITEM ||  \
     (msg) == WM_CHARTOITEM || (msg) == WM_QUERYDRAGICON || (msg) == WM_INITDIALOG)  \
     ? (BOOL)LOWORD(result) : (SetWindowLong((hwnd), DWL_MSGRESULT, (LPARAM)(LRESULT)(result)), TRUE))
@@ -127,91 +127,91 @@ extern "C" {            /* Assume C decl
 #define HANDLE_MSG(hwnd, message, fn)    \
     case (message): return HANDLE_##message((hwnd), (wParam), (lParam), (fn))
 
-/* void Cls_OnCompacting(HWND hwnd, UINT compactRatio); */
+/* void Cls_OnCompacting(HWND hwnd, UINT compactRatio) */
 #define HANDLE_WM_COMPACTING(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam)), 0L)
 #define FORWARD_WM_COMPACTING(hwnd, compactRatio, fn) \
     (void)(fn)((hwnd), WM_COMPACTING, (WPARAM)(UINT)(compactRatio), 0L)
 
-/* void Cls_OnWinIniChange(HWND hwnd, LPCSTR lpszSectionName); */
+/* void Cls_OnWinIniChange(HWND hwnd, LPCSTR lpszSectionName) */
 #define HANDLE_WM_WININICHANGE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (LPCSTR)(lParam)), 0L)
 #define FORWARD_WM_WININICHANGE(hwnd, lpszSectionName, fn) \
     (void)(fn)((hwnd), WM_WININICHANGE, 0, (LPARAM)(LPCSTR)(lpszSectionName))
 
-/* void Cls_OnSysColorChange(HWND hwnd); */
+/* void Cls_OnSysColorChange(HWND hwnd) */
 #define HANDLE_WM_SYSCOLORCHANGE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_SYSCOLORCHANGE(hwnd, fn) \
     (void)(fn)((hwnd), WM_SYSCOLORCHANGE, 0, 0L)
 
-/* BOOL Cls_OnQueryNewPalette(HWND hwnd); */
+/* BOOL Cls_OnQueryNewPalette(HWND hwnd) */
 #define HANDLE_WM_QUERYNEWPALETTE(hwnd, wParam, lParam, fn) \
     MAKELRESULT((BOOL)(fn)(hwnd), 0)
 #define FORWARD_WM_QUERYNEWPALETTE(hwnd, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_QUERYNEWPALETTE, 0, 0L)
 
-/* void Cls_OnPaletteIsChanging(HWND hwnd, HWND hwndPaletteChange); */
+/* void Cls_OnPaletteIsChanging(HWND hwnd, HWND hwndPaletteChange) */
 #define HANDLE_WM_PALETTEISCHANGING(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_PALETTEISCHANGING(hwnd, hwndPaletteChange, fn) \
     (void)(fn)((hwnd), WM_PALETTEISCHANGING, (WPARAM)(HWND)(hwndPaletteChange), 0L)
 
-/* void Cls_OnPaletteChanged(HWND hwnd, HWND hwndPaletteChange); */
+/* void Cls_OnPaletteChanged(HWND hwnd, HWND hwndPaletteChange) */
 #define HANDLE_WM_PALETTECHANGED(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_PALETTECHANGED(hwnd, hwndPaletteChange, fn) \
     (void)(fn)((hwnd), WM_PALETTECHANGED, (WPARAM)(HWND)(hwndPaletteChange), 0L)
 
-/* void Cls_OnFontChange(HWND hwnd); */
+/* void Cls_OnFontChange(HWND hwnd) */
 #define HANDLE_WM_FONTCHANGE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_FONTCHANGE(hwnd, fn) \
     (void)(fn)((hwnd), WM_FONTCHANGE, 0, 0L)
 
-/* void Cls_OnSpoolerStatus(HWND hwnd, UINT status, int cJobInQueue); */
+/* void Cls_OnSpoolerStatus(HWND hwnd, UINT status, int cJobInQueue) */
 #define HANDLE_WM_SPOOLERSTATUS(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_SPOOLERSTATUS(hwnd, status, cJobInQueue, fn) \
     (void)(fn)((hwnd), WM_SPOOLERSTATUS, (WPARAM)(status), MAKELPARAM((UINT)(cJobInQueue), 0))
 
-/* void Cls_OnDevModeChange(HWND hwnd, LPCSTR lpszDeviceName); */
+/* void Cls_OnDevModeChange(HWND hwnd, LPCSTR lpszDeviceName) */
 #define HANDLE_WM_DEVMODECHANGE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (LPCSTR)(lParam)), 0L)
 #define FORWARD_WM_DEVMODECHANGE(hwnd, lpszDeviceName, fn) \
     (void)(fn)((hwnd), WM_DEVMODECHANGE, 0,(LPARAM)(LPCSTR)(lpszDeviceName))
 
-/* void Cls_OnTimeChange(HWND hwnd); */
+/* void Cls_OnTimeChange(HWND hwnd) */
 #define HANDLE_WM_TIMECHANGE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_TIMECHANGE(hwnd, fn) \
     (void)(fn)((hwnd), WM_TIMECHANGE, 0, 0L)
 
-/* void Cls_OnPower(HWND hwnd, int code); */
+/* void Cls_OnPower(HWND hwnd, int code) */
 #define HANDLE_WM_POWER(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam)), 0L)
 #define FORWARD_WM_POWER(hwnd, code, fn) \
     (void)(fn)((hwnd), WM_POWER, (WPARAM)(code), 0L)
 
-/* BOOL Cls_OnQueryEndSession(HWND hwnd); */
+/* BOOL Cls_OnQueryEndSession(HWND hwnd) */
 #define HANDLE_WM_QUERYENDSESSION(hwnd, wParam, lParam, fn) \
     MAKELRESULT((BOOL)(fn)(hwnd), 0)
 #define FORWARD_WM_QUERYENDSESSION(hwnd, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_QUERYENDSESSION, 0, 0L)
 
-/* void Cls_OnEndSession(HWND hwnd, BOOL fEnding); */
+/* void Cls_OnEndSession(HWND hwnd, BOOL fEnding) */
 #define HANDLE_WM_ENDSESSION(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam)), 0L)
 #define FORWARD_WM_ENDSESSION(hwnd, fEnding, fn) \
     (void)(fn)((hwnd), WM_ENDSESSION, (WPARAM)(BOOL)(fEnding), 0L)
 
-/* void Cls_OnQuit(HWND hwnd, int exitCode); */
+/* void Cls_OnQuit(HWND hwnd, int exitCode) */
 #define HANDLE_WM_QUIT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam)), 0L)
 #define FORWARD_WM_QUIT(hwnd, exitCode, fn) \
     (void)(fn)((hwnd), WM_QUIT, (WPARAM)(exitCode), 0L)
 
-/* void Cls_OnSystemError(HWND hwnd, int errCode); */
+/* void Cls_OnSystemError(HWND hwnd, int errCode) */
 #define HANDLE_WM_SYSTEMERROR(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam)), 0L)
 #define FORWARD_WM_SYSTEMERROR(hwnd, errCode, fn) \
@@ -229,37 +229,37 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_NCCREATE(hwnd, lpCreateStruct, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_NCCREATE, 0, (LPARAM)(CREATESTRUCT FAR*)(lpCreateStruct))
 
-/* void Cls_OnDestroy(HWND hwnd); */
+/* void Cls_OnDestroy(HWND hwnd) */
 #define HANDLE_WM_DESTROY(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_DESTROY(hwnd, fn) \
     (void)(fn)((hwnd), WM_DESTROY, 0, 0L)
 
-/* void Cls_OnNCDestroy(HWND hwnd); */
+/* void Cls_OnNCDestroy(HWND hwnd) */
 #define HANDLE_WM_NCDESTROY(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_NCDESTROY(hwnd, fn) \
     (void)(fn)((hwnd), WM_NCDESTROY, 0, 0L)
 
-/* void Cls_OnShowWindow(HWND hwnd, BOOL fShow, UINT status); */
+/* void Cls_OnShowWindow(HWND hwnd, BOOL fShow, UINT status) */
 #define HANDLE_WM_SHOWWINDOW(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam), LOWORD(lParam)), 0L)
 #define FORWARD_WM_SHOWWINDOW(hwnd, fShow, status, fn) \
     (void)(fn)((hwnd), WM_SHOWWINDOW, (WPARAM)(BOOL)(fShow), MAKELPARAM((UINT)(status), 0))
 
-/* void Cls_OnSetRedraw(HWND hwnd, BOOL fRedraw); */
+/* void Cls_OnSetRedraw(HWND hwnd, BOOL fRedraw) */
 #define HANDLE_WM_SETREDRAW(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam)), 0L)
 #define FORWARD_WM_SETREDRAW(hwnd, fRedraw, fn) \
     (void)(fn)((hwnd), WM_SETREDRAW, (WPARAM)(fRedraw), 0L)
 
-/* void Cls_OnEnable(HWND hwnd, BOOL fEnable); */
+/* void Cls_OnEnable(HWND hwnd, BOOL fEnable) */
 #define HANDLE_WM_ENABLE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam)), 0L)
 #define FORWARD_WM_ENABLE(hwnd, fEnable, fn) \
     (void)(fn)((hwnd), WM_ENABLE, (WPARAM)(BOOL)(fEnable), 0L)
 
-/* void Cls_OnSetText(HWND hwnd, LPCSTR lpszText); */
+/* void Cls_OnSetText(HWND hwnd, LPCSTR lpszText) */
 #define HANDLE_WM_SETTEXT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (LPCSTR)(lParam)), 0L)
 #define FORWARD_WM_SETTEXT(hwnd, lpszText, fn) \
@@ -271,73 +271,73 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_GETTEXT(hwnd, cchTextMax, lpszText, fn) \
     (int)(DWORD)(fn)((hwnd), WM_GETTEXT, (WPARAM)(int)(cchTextMax), (LPARAM)(LPSTR)(lpszText))
 
-/* INT Cls_OnGetTextLength(HWND hwnd); */
+/* INT Cls_OnGetTextLength(HWND hwnd) */
 #define HANDLE_WM_GETTEXTLENGTH(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(int)(fn)(hwnd)
 #define FORWARD_WM_GETTEXTLENGTH(hwnd, fn) \
     (int)(DWORD)(fn)((hwnd), WM_GETTEXTLENGTH, 0, 0L)
 
-/* BOOL Cls_OnWindowPosChanging(HWND hwnd, WINDOWPOS FAR* lpwpos); */
+/* BOOL Cls_OnWindowPosChanging(HWND hwnd, WINDOWPOS FAR* lpwpos) */
 #define HANDLE_WM_WINDOWPOSCHANGING(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (WINDOWPOS FAR*)(lParam))
 #define FORWARD_WM_WINDOWPOSCHANGING(hwnd, lpwpos, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_WINDOWPOSCHANGING, 0, (LPARAM)(WINDOWPOS FAR*)(lpwpos))
 
-/* void Cls_OnWindowPosChanged(HWND hwnd, const WINDOWPOS FAR* lpwpos); */
+/* void Cls_OnWindowPosChanged(HWND hwnd, const WINDOWPOS FAR* lpwpos) */
 #define HANDLE_WM_WINDOWPOSCHANGED(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (const WINDOWPOS FAR*)(lParam)), 0L)
 #define FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, fn) \
     (void)(fn)((hwnd), WM_WINDOWPOSCHANGED, 0, (LPARAM)(const WINDOWPOS FAR*)(lpwpos))
 
-/* void Cls_OnMove(HWND hwnd, int x, int y); */
+/* void Cls_OnMove(HWND hwnd, int x, int y) */
 #define HANDLE_WM_MOVE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam)), 0L)
 #define FORWARD_WM_MOVE(hwnd, x, y, fn) \
     (void)(fn)((hwnd), WM_MOVE, 0, MAKELPARAM((int)(x), (int)(y)))
 
-/* void Cls_OnSize(HWND hwnd, UINT state, int cx, int cy); */
+/* void Cls_OnSize(HWND hwnd, UINT state, int cx, int cy) */
 #define HANDLE_WM_SIZE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam), (int)HIWORD(lParam)), 0L)
 #define FORWARD_WM_SIZE(hwnd, state, cx, cy, fn) \
     (void)(fn)((hwnd), WM_SIZE, (WPARAM)(UINT)(state), MAKELPARAM((int)(cx), (int)(cy)))
 
-/* void Cls_OnClose(HWND hwnd); */
+/* void Cls_OnClose(HWND hwnd) */
 #define HANDLE_WM_CLOSE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_CLOSE(hwnd, fn) \
     (void)(fn)((hwnd), WM_CLOSE, 0, 0L)
 
-/* BOOL Cls_OnQueryOpen(HWND hwnd); */
+/* BOOL Cls_OnQueryOpen(HWND hwnd) */
 #define HANDLE_WM_QUERYOPEN(hwnd, wParam, lParam, fn) \
     MAKELRESULT((BOOL)(fn)(hwnd), 0)
 #define FORWARD_WM_QUERYOPEN(hwnd, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_QUERYOPEN, 0, 0L)
 
-/* void Cls_OnGetMinMaxInfo(HWND hwnd, MINMAXINFO FAR* lpMinMaxInfo); */
+/* void Cls_OnGetMinMaxInfo(HWND hwnd, MINMAXINFO FAR* lpMinMaxInfo) */
 #define HANDLE_WM_GETMINMAXINFO(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (MINMAXINFO FAR*)(lParam)), 0L)
 #define FORWARD_WM_GETMINMAXINFO(hwnd, lpMinMaxInfo, fn) \
     (void)(fn)((hwnd), WM_GETMINMAXINFO, 0, (LPARAM)(MINMAXINFO FAR*)(lpMinMaxInfo))
 
-/* void Cls_OnPaint(HWND hwnd); */
+/* void Cls_OnPaint(HWND hwnd) */
 #define HANDLE_WM_PAINT(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_PAINT(hwnd, fn) \
     (void)(fn)((hwnd), WM_PAINT, 0, 0L)
 
-/* BOOL Cls_OnEraseBkgnd(HWND hwnd, HDC hdc); */
+/* BOOL Cls_OnEraseBkgnd(HWND hwnd, HDC hdc) */
 #define HANDLE_WM_ERASEBKGND(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (HDC)(wParam))
 #define FORWARD_WM_ERASEBKGND(hwnd, hdc, fn) \
    (BOOL)(DWORD)(fn)((hwnd), WM_ERASEBKGND, (WPARAM)(HDC)(hdc), 0L)
 
-/* BOOL Cls_OnIconEraseBkgnd(HWND hwnd, HDC hdc); */
+/* BOOL Cls_OnIconEraseBkgnd(HWND hwnd, HDC hdc) */
 #define HANDLE_WM_ICONERASEBKGND(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (HDC)(wParam))
 #define FORWARD_WM_ICONERASEBKGND(hwnd, hdc, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_ICONERASEBKGND, (WPARAM)(HDC)(hdc), 0L)
 
-/* void Cls_OnNCPaint(HWND hwnd, HRGN hrgn); */
+/* void Cls_OnNCPaint(HWND hwnd, HRGN hrgn) */
 #define HANDLE_WM_NCPAINT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HRGN)(wParam)), 0L)
 #define FORWARD_WM_NCPAINT(hwnd, hrgn, fn) \
@@ -349,39 +349,39 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_NCCALCSIZE(hwnd, fCalcValidRects, lpcsp, fn) \
     (UINT)(DWORD)(fn)((hwnd), WM_NCCALCSIZE, (WPARAM)(fCalcValidRects), (LPARAM)(NCCALCSIZE_PARAMS FAR*)(lpcsp))
 
-/* UINT Cls_OnNCHitTest(HWND hwnd, int x, int y); */
+/* UINT Cls_OnNCHitTest(HWND hwnd, int x, int y) */
 #define HANDLE_WM_NCHITTEST(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam))
 #define FORWARD_WM_NCHITTEST(hwnd, x, y, fn) \
     (UINT)(DWORD)(fn)((hwnd), WM_NCHITTEST, 0, MAKELPARAM((int)(x), (int)(y)))
 
-/* HICON Cls_OnQueryDragIcon(HWND hwnd); */
+/* HICON Cls_OnQueryDragIcon(HWND hwnd) */
 #define HANDLE_WM_QUERYDRAGICON(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)(hwnd)
 #define FORWARD_WM_QUERYDRAGICON(hwnd, fn) \
     (HICON)(UINT)(DWORD)(fn)((hwnd), WM_QUERYDRAGICON, 0, 0L)
 
 #ifdef _INC_SHELLAPI
-/* void Cls_OnDropFiles(HWND hwnd, HDROP hdrop); */
+/* void Cls_OnDropFiles(HWND hwnd, HDROP hdrop) */
 #define HANDLE_WM_DROPFILES(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HDROP)(wParam)), 0L)
 #define FORWARD_WM_DROPFILES(hwnd, hdrop, fn) \
     (void)(fn)((hwnd), WM_DROPFILES, (WPARAM)(hdrop), 0L)
 #endif  /* _INC_SHELLAPI */
 
-/* void Cls_OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized); */
+/* void Cls_OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized) */
 #define HANDLE_WM_ACTIVATE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (HWND)LOWORD(lParam), (BOOL)HIWORD(lParam)), 0L)
 #define FORWARD_WM_ACTIVATE(hwnd, state, hwndActDeact, fMinimized, fn) \
     (void)(fn)((hwnd), WM_ACTIVATE, (WPARAM)(UINT)(state), MAKELPARAM((UINT)(HWND)(hwndActDeact), (UINT)(BOOL)(fMinimized)))
 
-/* void Cls_OnActivateApp(HWND hwnd, BOOL fActivate, HTASK htaskActDeact); */
+/* void Cls_OnActivateApp(HWND hwnd, BOOL fActivate, HTASK htaskActDeact) */
 #define HANDLE_WM_ACTIVATEAPP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam), (HTASK)LOWORD(lParam)), 0L)
 #define FORWARD_WM_ACTIVATEAPP(hwnd, fActivate, htaskActDeact, fn) \
     (void)(fn)((hwnd), WM_ACTIVATEAPP, (WPARAM)(BOOL)(fActivate), MAKELPARAM((htaskActDeact),0))
 
-/* BOOL Cls_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimized); */
+/* BOOL Cls_OnNCActivate(HWND hwnd, BOOL fActive, HWND hwndActDeact, BOOL fMinimized) */
 #define HANDLE_WM_NCACTIVATE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (BOOL)(wParam), (HWND)LOWORD(lParam), (BOOL)HIWORD(lParam))
 #define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \
@@ -393,278 +393,278 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_SETFOCUS(hwnd, hwndOldFocus, fn) \
     (void)(fn)((hwnd), WM_SETFOCUS, (WPARAM)(HWND)(hwndOldFocus), 0L)
 
-/* void Cls_OnKillFocus(HWND hwnd, HWND hwndNewFocus); */
+/* void Cls_OnKillFocus(HWND hwnd, HWND hwndNewFocus) */
 #define HANDLE_WM_KILLFOCUS(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_KILLFOCUS(hwnd, hwndNewFocus, fn) \
     (void)(fn)((hwnd), WM_KILLFOCUS, (WPARAM)(HWND)(hwndNewFocus), 0L)
 
-/* void Cls_OnKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags); */
+/* void Cls_OnKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) */
 #define HANDLE_WM_KEYDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), TRUE, (int)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_KEYDOWN(hwnd, vk, cRepeat, flags, fn) \
     (void)(fn)((hwnd), WM_KEYDOWN, (WPARAM)(UINT)(vk), MAKELPARAM((UINT)(cRepeat), (UINT)(flags)))
 
-/* void Cls_OnKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags); */
+/* void Cls_OnKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) */
 #define HANDLE_WM_KEYUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), FALSE, (int)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_KEYUP(hwnd, vk, cRepeat, flags, fn) \
     (void)(fn)((hwnd), WM_KEYUP, (WPARAM)(UINT)(vk), MAKELPARAM((UINT)(cRepeat), (UINT)(flags)))
 
-/* void Cls_OnChar(HWND hwnd, UINT ch, int cRepeat); */
+/* void Cls_OnChar(HWND hwnd, UINT ch, int cRepeat) */
 #define HANDLE_WM_CHAR(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_CHAR(hwnd, ch, cRepeat, fn) \
     (void)(fn)((hwnd), WM_CHAR, (WPARAM)(UINT)(ch), MAKELPARAM((UINT)(cRepeat),0))
 
-/* void Cls_OnDeadChar(HWND hwnd, UINT ch, int cRepeat); */
+/* void Cls_OnDeadChar(HWND hwnd, UINT ch, int cRepeat) */
 #define HANDLE_WM_DEADCHAR(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_DEADCHAR(hwnd, ch, cRepeat, fn) \
     (void)(fn)((hwnd), WM_DEADCHAR, (WPARAM)(UINT)(ch), MAKELPARAM((UINT)(cRepeat),0))
 
-/* void Cls_OnSysKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags); */
+/* void Cls_OnSysKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) */
 #define HANDLE_WM_SYSKEYDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), TRUE, (int)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_SYSKEYDOWN(hwnd, vk, cRepeat, flags, fn) \
     (void)(fn)((hwnd), WM_SYSKEYDOWN, (WPARAM)(UINT)(vk), MAKELPARAM((UINT)(cRepeat), (UINT)(flags)))
 
-/* void Cls_OnSysKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags); */
+/* void Cls_OnSysKey(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) */
 #define HANDLE_WM_SYSKEYUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), FALSE, (int)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_SYSKEYUP(hwnd, vk, cRepeat, flags, fn) \
     (void)(fn)((hwnd), WM_SYSKEYUP, (WPARAM)(UINT)(vk), MAKELPARAM((UINT)(cRepeat), (UINT)(flags)))
 
-/* void Cls_OnSysChar(HWND hwnd, UINT ch, int cRepeat); */
+/* void Cls_OnSysChar(HWND hwnd, UINT ch, int cRepeat) */
 #define HANDLE_WM_SYSCHAR(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_SYSCHAR(hwnd, ch, cRepeat, fn) \
     (void)(fn)((hwnd), WM_SYSCHAR, (WPARAM)(UINT)(ch), MAKELPARAM((UINT)(cRepeat), 0))
 
-/* void Cls_OnSysDeadChar(HWND hwnd, UINT ch, int cRepeat); */
+/* void Cls_OnSysDeadChar(HWND hwnd, UINT ch, int cRepeat) */
 #define HANDLE_WM_SYSDEADCHAR(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_SYSDEADCHAR(hwnd, ch, cRepeat, fn) \
     (void)(fn)((hwnd), WM_SYSDEADCHAR, (WPARAM)(UINT)(ch), MAKELPARAM((UINT)(cRepeat), 0))
 
-/* void Cls_OnMouseMove(HWND hwnd, int x, int y, UINT keyFlags); */
+/* void Cls_OnMouseMove(HWND hwnd, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_MOUSEMOVE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_MOUSEMOVE(hwnd, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), WM_MOUSEMOVE, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_LBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_LBUTTONDOWN(hwnd, fDoubleClick, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_LBUTTONDBLCLK : WM_LBUTTONDOWN, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_LBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnLButtonUp(HWND hwnd, int x, int y, UINT keyFlags); */
+/* void Cls_OnLButtonUp(HWND hwnd, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_LBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_LBUTTONUP(hwnd, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), WM_LBUTTONUP, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_RBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_RBUTTONDOWN(hwnd, fDoubleClick, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_RBUTTONDBLCLK : WM_RBUTTONDOWN, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_RBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnRButtonUp(HWND hwnd, int x, int y, UINT flags); */
+/* void Cls_OnRButtonUp(HWND hwnd, int x, int y, UINT flags) */
 #define HANDLE_WM_RBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_RBUTTONUP(hwnd, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), WM_RBUTTONUP, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_MBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_MBUTTONDOWN(hwnd, fDoubleClick, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_MBUTTONDBLCLK : WM_MBUTTONDOWN, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags); */
+/* void Cls_OnMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) */
 #define HANDLE_WM_MBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnMButtonUp(HWND hwnd, int x, int y, UINT flags); */
+/* void Cls_OnMButtonUp(HWND hwnd, int x, int y, UINT flags) */
 #define HANDLE_WM_MBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_MBUTTONUP(hwnd, x, y, keyFlags, fn) \
     (void)(fn)((hwnd), WM_MBUTTONUP, (WPARAM)(UINT)(keyFlags), MAKELPARAM((x), (y)))
 
-/* void Cls_OnNCMouseMove(HWND hwnd, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCMouseMove(HWND hwnd, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCMOUSEMOVE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCMOUSEMOVE(hwnd, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), WM_NCMOUSEMOVE, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)))
 
-/* void Cls_OnNCLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCLBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCLBUTTONDOWN(hwnd, fDoubleClick, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_NCLBUTTONDBLCLK : WM_NCLBUTTONDOWN, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)))
 
-/* void Cls_OnNCLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCLBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnNCLButtonUp(HWND hwnd, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCLButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCLBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCLBUTTONUP(hwnd, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), WM_NCLBUTTONUP, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)) )
 
-/* void Cls_OnNCRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCRBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCRBUTTONDOWN(hwnd, fDoubleClick, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_NCRBUTTONDBLCLK : WM_NCRBUTTONDOWN, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)) )
 
-/* void Cls_OnNCRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCRButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCRBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnNCRButtonUp(HWND hwnd, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCRButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCRBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCRBUTTONUP(hwnd, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), WM_NCRBUTTONUP, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)) )
 
-/* void Cls_OnNCMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCMBUTTONDOWN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), FALSE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCMBUTTONDOWN(hwnd, fDoubleClick, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), (fDoubleClick) ? WM_NCMBUTTONDBLCLK : WM_NCMBUTTONDOWN, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)) )
 
-/* void Cls_OnNCMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCMButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCMBUTTONDBLCLK(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), TRUE, (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 
-/* void Cls_OnNCMButtonUp(HWND hwnd, int x, int y, UINT codeHitTest); */
+/* void Cls_OnNCMButtonUp(HWND hwnd, int x, int y, UINT codeHitTest) */
 #define HANDLE_WM_NCMBUTTONUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)LOWORD(lParam), (int)HIWORD(lParam), (UINT)(wParam)), 0L)
 #define FORWARD_WM_NCMBUTTONUP(hwnd, x, y, codeHitTest, fn) \
     (void)(fn)((hwnd), WM_NCMBUTTONUP, (WPARAM)(UINT)(codeHitTest), MAKELPARAM((x), (y)) )
 
-/* int Cls_OnMouseActivate(HWND hwnd, HWND hwndTopLevel, UINT codeHitTest, UINT msg); */
+/* int Cls_OnMouseActivate(HWND hwnd, HWND hwndTopLevel, UINT codeHitTest, UINT msg) */
 #define HANDLE_WM_MOUSEACTIVATE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(int)(fn)((hwnd), (HWND)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(lParam))
 #define FORWARD_WM_MOUSEACTIVATE(hwnd, hwndTopLevel, codeHitTest, msg, fn) \
     (int)(DWORD)(fn)((hwnd), WM_MOUSEACTIVATE, (WPARAM)(HWND)(hwndTopLevel), MAKELPARAM((codeHitTest), (msg)))
 
-/* void Cls_OnCancelMode(HWND hwnd); */
+/* void Cls_OnCancelMode(HWND hwnd) */
 #define HANDLE_WM_CANCELMODE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_CANCELMODE(hwnd, fn) \
     (void)(fn)((hwnd), WM_CANCELMODE, 0, 0L)
 
-/* void Cls_OnTimer(HWND hwnd, UINT id); */
+/* void Cls_OnTimer(HWND hwnd, UINT id) */
 #define HANDLE_WM_TIMER(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam)), 0L)
 #define FORWARD_WM_TIMER(hwnd, id, fn) \
     (void)(fn)((hwnd), WM_TIMER, (WPARAM)(UINT)(id), 0L)
 
-/* void Cls_OnInitMenu(HWND hwnd, HMENU hMenu); */
+/* void Cls_OnInitMenu(HWND hwnd, HMENU hMenu) */
 #define HANDLE_WM_INITMENU(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HMENU)(wParam)), 0L)
 #define FORWARD_WM_INITMENU(hwnd, hMenu, fn) \
     (void)(fn)((hwnd), WM_INITMENU, (WPARAM)(HMENU)(hMenu), 0L)
 
-/* void Cls_OnInitMenuPopup(HWND hwnd, HMENU hMenu, int item, BOOL fSystemMenu); */
+/* void Cls_OnInitMenuPopup(HWND hwnd, HMENU hMenu, int item, BOOL fSystemMenu) */
 #define HANDLE_WM_INITMENUPOPUP(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HMENU)(wParam), (int)LOWORD(lParam), (BOOL)HIWORD(lParam)), 0L)
 #define FORWARD_WM_INITMENUPOPUP(hwnd, hMenu, item, fSystemMenu, fn) \
     (void)(fn)((hwnd), WM_INITMENUPOPUP, (WPARAM)(HMENU)(hMenu), MAKELPARAM((item),(fSystemMenu)))
 
-/* void Cls_OnMenuSelect(HWND hwnd, HMENU hmenu, int item, HMENU hmenuPopup, UINT flags); */
+/* void Cls_OnMenuSelect(HWND hwnd, HMENU hmenu, int item, HMENU hmenuPopup, UINT flags) */
 #define HANDLE_WM_MENUSELECT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HMENU)HIWORD(lParam), (LOWORD(lParam) & MF_POPUP) ? 0 : (int)(wParam), \
-                            (LOWORD(lParam) & MF_POPUP) ? (HMENU)(wParam) : 0, LOWORD(lParam)), 0L)
+        (LOWORD(lParam) & MF_POPUP) ? (HMENU)(wParam) : 0, LOWORD(lParam)), 0L)
 #define FORWARD_WM_MENUSELECT(hwnd, hmenu, item, hmenuPopup, flags, fn) \
     (void)(fn)((hwnd), WM_MENUSELECT, ((flags) & MF_POPUP) ? (WPARAM)(HMENU)(hmenuPopup) : (WPARAM)(int)(item), MAKELPARAM((flags), (hmenu)))
 
-/* DWORD Cls_OnMenuChar(HWND hwnd, UINT ch, UINT flags, HMENU hmenu); */
+/* DWORD Cls_OnMenuChar(HWND hwnd, UINT ch, UINT flags, HMENU hmenu) */
 #define HANDLE_WM_MENUCHAR(hwnd, wParam, lParam, fn) \
-    (LRESULT)(DWORD)(fn)((hwnd), (UINT)(wParam), LOWORD(lParam), (HMENU)HIWORD(lParam));
+    (LRESULT)(DWORD)(fn)((hwnd), (UINT)(wParam), LOWORD(lParam), (HMENU)HIWORD(lParam))
 #define FORWARD_WM_MENUCHAR(hwnd, ch, flags, hmenu, fn) \
     (DWORD)(fn)((hwnd), WM_MENUCHAR, (WPARAM)(UINT)(ch), MAKELPARAM((flags), (UINT)(hmenu)))
 
-/* void Cls_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify); */
+/* void Cls_OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) */
 #define HANDLE_WM_COMMAND(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam), (HWND)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_COMMAND(hwnd, id, hwndCtl, codeNotify, fn) \
     (void)(fn)((hwnd), WM_COMMAND, (WPARAM)(int)(id), MAKELPARAM((UINT)(hwndCtl), (codeNotify)))
 
-/* void Cls_OnHScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos); */
+/* void Cls_OnHScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos) */
 #define HANDLE_WM_HSCROLL(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)HIWORD(lParam), (UINT)(wParam), (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_HSCROLL(hwnd, hwndCtl, code, pos, fn) \
     (void)(fn)((hwnd), WM_HSCROLL, (WPARAM)(UINT)(code), MAKELPARAM((pos), (UINT)(hwndCtl)))
 
-/* void Cls_OnVScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos); */
+/* void Cls_OnVScroll(HWND hwnd, HWND hwndCtl, UINT code, int pos) */
 #define HANDLE_WM_VSCROLL(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)HIWORD(lParam), (UINT)(wParam),  (int)LOWORD(lParam)), 0L)
 #define FORWARD_WM_VSCROLL(hwnd, hwndCtl, code, pos, fn) \
     (void)(fn)((hwnd), WM_VSCROLL, (WPARAM)(UINT)(code), MAKELPARAM((pos), (UINT)(hwndCtl)))
 
-/* void Cls_OnCut(HWND hwnd); */
+/* void Cls_OnCut(HWND hwnd) */
 #define HANDLE_WM_CUT(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_CUT(hwnd, fn) \
     (void)(fn)((hwnd), WM_CUT, 0, 0L)
 
-/* void Cls_OnCopy(HWND hwnd); */
+/* void Cls_OnCopy(HWND hwnd) */
 #define HANDLE_WM_COPY(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_COPY(hwnd, fn) \
     (void)(fn)((hwnd), WM_COPY, 0, 0L)
 
-/* void Cls_OnPaste(HWND hwnd); */
+/* void Cls_OnPaste(HWND hwnd) */
 #define HANDLE_WM_PASTE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_PASTE(hwnd, fn) \
     (void)(fn)((hwnd), WM_PASTE, 0, 0L)
 
-/* void Cls_OnClear(HWND hwnd); */
+/* void Cls_OnClear(HWND hwnd) */
 #define HANDLE_WM_CLEAR(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_CLEAR(hwnd, fn) \
     (void)(fn)((hwnd), WM_CLEAR, 0, 0L)
 
-/* void Cls_OnUndo(HWND hwnd); */
+/* void Cls_OnUndo(HWND hwnd) */
 #define HANDLE_WM_UNDO(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_UNDO(hwnd, fn) \
     (void)(fn)((hwnd), WM_UNDO, 0, 0L)
 
-/* HANDLE Cls_OnRenderFormat(HWND hwnd, UINT fmt); */
+/* HANDLE Cls_OnRenderFormat(HWND hwnd, UINT fmt) */
 #define HANDLE_WM_RENDERFORMAT(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd), (UINT)(wParam))
 #define FORWARD_WM_RENDERFORMAT(hwnd, fmt, fn) \
     (HANDLE)(UINT)(DWORD)(fn)((hwnd), WM_RENDERFORMAT, (WPARAM)(UINT)(fmt), 0L)
 
-/* void Cls_OnRenderAllFormats(HWND hwnd); */
+/* void Cls_OnRenderAllFormats(HWND hwnd) */
 #define HANDLE_WM_RENDERALLFORMATS(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_RENDERALLFORMATS(hwnd, fn) \
     (void)(fn)((hwnd), WM_RENDERALLFORMATS, 0, 0L)
 
-/* void Cls_OnDestroyClipboard(HWND hwnd); */
+/* void Cls_OnDestroyClipboard(HWND hwnd) */
 #define HANDLE_WM_DESTROYCLIPBOARD(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_DESTROYCLIPBOARD(hwnd, fn) \
     (void)(fn)((hwnd), WM_DESTROYCLIPBOARD, 0, 0L)
 
-/* void Cls_OnDrawClipboard(HWND hwnd); */
+/* void Cls_OnDrawClipboard(HWND hwnd) */
 #define HANDLE_WM_DRAWCLIPBOARD(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_DRAWCLIPBOARD(hwnd, fn) \
@@ -676,124 +676,124 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_PAINTCLIPBOARD(hwnd, hwndCBViewer, lpPaintStruct, fn) \
     (void)(fn)((hwnd), WM_PAINTCLIPBOARD, (WPARAM)(HWND)(hwndCBViewer), (LPARAM)(lpPaintStruct))
 
-/* void Cls_OnSizeClipboard(HWND hwnd, HWND hwndCBViewer, const RECT FAR* lprc); */
+/* void Cls_OnSizeClipboard(HWND hwnd, HWND hwndCBViewer, const RECT FAR* lprc) */
 #define HANDLE_WM_SIZECLIPBOARD(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam), (const RECT FAR*)GlobalLock((HGLOBAL)LOWORD(lParam))), GlobalUnlock((HGLOBAL)LOWORD(lParam)), 0L)
 #define FORWARD_WM_SIZECLIPBOARD(hwnd, hwndCBViewer, lprc, fn) \
     (void)(fn)((hwnd), WM_SIZECLIPBOARD, (WPARAM)(HWND)(hwndCBViewer), (LPARAM)(lprc))
 
-/* void Cls_OnVScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos); */
+/* void Cls_OnVScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos) */
 #define HANDLE_WM_VSCROLLCLIPBOARD(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam), LOWORD(lParam), (int)HIWORD(lParam)), 0L)
 #define FORWARD_WM_VSCROLLCLIPBOARD(hwnd, hwndCBViewer, code, pos, fn) \
     (void)(fn)((hwnd), WM_VSCROLLCLIPBOARD, (WPARAM)(HWND)(hwndCBViewer), MAKELPARAM((code), (pos)))
 
-/* void Cls_OnHScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos); */
+/* void Cls_OnHScrollClipboard(HWND hwnd, HWND hwndCBViewer, UINT code, int pos) */
 #define HANDLE_WM_HSCROLLCLIPBOARD(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam), LOWORD(lParam), (int)HIWORD(lParam)), 0L)
 #define FORWARD_WM_HSCROLLCLIPBOARD(hwnd, hwndCBViewer, code, pos, fn) \
     (void)(fn)((hwnd), WM_HSCROLLCLIPBOARD, (WPARAM)(HWND)(hwndCBViewer), MAKELPARAM((code), (pos)))
 
-/* void Cls_OnAskCBFormatName(HWND hwnd, int cchMax, LPSTR rgchName); */
+/* void Cls_OnAskCBFormatName(HWND hwnd, int cchMax, LPSTR rgchName) */
 #define HANDLE_WM_ASKCBFORMATNAME(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam), (LPSTR)(lParam)), 0L)
 #define FORWARD_WM_ASKCBFORMATNAME(hwnd, cchMax, rgchName, fn) \
     (void)(fn)((hwnd), WM_ASKCBFORMATNAME, (WPARAM)(int)(cchMax), (LPARAM)(rgchName))
 
-/* void Cls_OnChangeCBChain(HWND hwnd, HWND hwndRemove, HWND hwndNext); */
+/* void Cls_OnChangeCBChain(HWND hwnd, HWND hwndRemove, HWND hwndNext) */
 #define HANDLE_WM_CHANGECBCHAIN(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam), (HWND)LOWORD(lParam)), 0L)
 #define FORWARD_WM_CHANGECBCHAIN(hwnd, hwndRemove, hwndNext, fn) \
     (void)(fn)((hwnd), WM_CHANGECBCHAIN, (WPARAM)(HWND)(hwndRemove), MAKELPARAM((UINT)(hwndNext), 0))
 
-/* BOOL Cls_OnSetCursor(HWND hwnd, HWND hwndCursor, UINT codeHitTest, UINT msg); */
+/* BOOL Cls_OnSetCursor(HWND hwnd, HWND hwndCursor, UINT codeHitTest, UINT msg) */
 #define HANDLE_WM_SETCURSOR(hwnd, wParam, lParam, fn) \
-    (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (HWND)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(lParam));
+    (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (HWND)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(lParam))
 #define FORWARD_WM_SETCURSOR(hwnd, hwndCursor, codeHitTest, msg, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_SETCURSOR, (WPARAM)(HWND)(hwndCursor), MAKELPARAM((codeHitTest), (msg)))
 
-/* void Cls_OnSysCommand(HWND hwnd, UINT cmd, int x, int y); */
+/* void Cls_OnSysCommand(HWND hwnd, UINT cmd, int x, int y) */
 #define HANDLE_WM_SYSCOMMAND(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (int)LOWORD(lParam), (int)HIWORD(lParam)), 0L)
 #define FORWARD_WM_SYSCOMMAND(hwnd, cmd, x, y, fn) \
     (void)(fn)((hwnd), WM_SYSCOMMAND, (WPARAM)(UINT)(cmd), MAKELPARAM((x), (y)))
 
-/* HWND Cls_MDICreate(HWND hwnd, const MDICREATESTRUCT FAR* lpmcs); */
+/* HWND Cls_MDICreate(HWND hwnd, const MDICREATESTRUCT FAR* lpmcs) */
 #define HANDLE_WM_MDICREATE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)((hwnd), (MDICREATESTRUCT FAR*)(lParam))
 #define FORWARD_WM_MDICREATE(hwnd, lpmcs, fn) \
     (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDICREATE, 0, (LPARAM)(lpmcs))
 
-/* void Cls_MDIDestroy(HWND hwnd, HWND hwndDestroy); */
+/* void Cls_MDIDestroy(HWND hwnd, HWND hwndDestroy) */
 #define HANDLE_WM_MDIDESTROY(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_MDIDESTROY(hwnd, hwndDestroy, fn) \
     (void)(fn)((hwnd), WM_MDIDESTROY, (WPARAM)(hwndDestroy), 0L)
 
 /* NOTE: Usable only by MDI client windows */
-/* void Cls_MDIActivate(HWND hwnd, BOOL fActive, HWND hwndActivate, HWND hwndDeactivate); */
+/* void Cls_MDIActivate(HWND hwnd, BOOL fActive, HWND hwndActivate, HWND hwndDeactivate) */
 #define HANDLE_WM_MDIACTIVATE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (BOOL)(wParam), (HWND)LOWORD(lParam), (HWND)HIWORD(lParam)), 0L)
 #define FORWARD_WM_MDIACTIVATE(hwnd, fActive, hwndActivate, hwndDeactivate, fn) \
     (void)(fn)(hwnd, WM_MDIACTIVATE, (WPARAM)(fActive), MAKELPARAM((hwndActivate), (hwndDeactivate)))
 
-/* void Cls_MDIRestore(HWND hwnd, HWND hwndRestore); */
+/* void Cls_MDIRestore(HWND hwnd, HWND hwndRestore) */
 #define HANDLE_WM_MDIRESTORE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_MDIRESTORE(hwnd, hwndRestore, fn) \
     (void)(fn)((hwnd), WM_MDIRESTORE, (WPARAM)(hwndRestore), 0L)
 
-/* HWND Cls_MDINext(HWND hwnd, HWND hwndCur, BOOL fPrev); */
+/* HWND Cls_MDINext(HWND hwnd, HWND hwndCur, BOOL fPrev) */
 #define HANDLE_WM_MDINEXT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam), (BOOL)LOWORD(lParam)), 0L)
 #define FORWARD_WM_MDINEXT(hwnd, hwndCur, fPrev, fn) \
     (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), MAKELPARAM((fPrev), 0))
 
-/* void Cls_MDIMaximize(HWND hwnd, HWND hwndMaximize); */
+/* void Cls_MDIMaximize(HWND hwnd, HWND hwndMaximize) */
 #define HANDLE_WM_MDIMAXIMIZE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HWND)(wParam)), 0L)
 #define FORWARD_WM_MDIMAXIMIZE(hwnd, hwndMaximize, fn) \
     (void)(fn)((hwnd), WM_MDIMAXIMIZE, (WPARAM)(hwndMaximize), 0L)
 
-/* BOOL Cls_MDITile(HWND hwnd, UINT cmd); */
+/* BOOL Cls_MDITile(HWND hwnd, UINT cmd) */
 #define HANDLE_WM_MDITILE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(fn)((hwnd), (UINT)(wParam))
 #define FORWARD_WM_MDITILE(hwnd, cmd, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_MDITILE, (WPARAM)(cmd), 0L)
 
-/* BOOL Cls_MDICascade(HWND hwnd, UINT cmd); */
+/* BOOL Cls_MDICascade(HWND hwnd, UINT cmd) */
 #define HANDLE_WM_MDICASCADE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(fn)((hwnd), (UINT)(wParam))
 #define FORWARD_WM_MDICASCADE(hwnd, cmd, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_MDICASCADE, (WPARAM)(cmd), 0L)
 
-/* void Cls_MDIIconArrange(HWND hwnd); */
+/* void Cls_MDIIconArrange(HWND hwnd) */
 #define HANDLE_WM_MDIICONARRANGE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_MDIICONARRANGE(hwnd, fn) \
     (void)(fn)((hwnd), WM_MDIICONARRANGE, 0, 0L)
 
-/* HWND Cls_MDIGetActive(HWND hwnd); */
+/* HWND Cls_MDIGetActive(HWND hwnd) */
 #define HANDLE_WM_MDIGETACTIVE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)(hwnd)
 #define FORWARD_WM_MDIGETACTIVE(hwnd, fn) \
     (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDIGETACTIVE, 0, 0L)
 
-/* HMENU Cls_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow); */
+/* HMENU Cls_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow) */
 #define HANDLE_WM_MDISETMENU(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)((hwnd), (BOOL)(wParam), (HMENU)LOWORD(lParam), (HMENU)HIWORD(lParam))
 #define FORWARD_WM_MDISETMENU(hwnd, fRefresh, hmenuFrame, hmenuWindow, fn) \
     (HMENU)(UINT)(DWORD)(fn)((hwnd), WM_MDISETMENU, (WPARAM)(fRefresh), MAKELPARAM((hmenuFrame), (hmenuWindow)))
 
-/* void Cls_OnChildActivate(HWND hwnd); */
+/* void Cls_OnChildActivate(HWND hwnd) */
 #define HANDLE_WM_CHILDACTIVATE(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_CHILDACTIVATE(hwnd, fn) \
     (void)(fn)((hwnd), WM_CHILDACTIVATE, 0, 0L)
 
-/* BOOL Cls_OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam); */
+/* BOOL Cls_OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) */
 #define HANDLE_WM_INITDIALOG(hwnd, wParam, lParam, fn) \
-    (LRESULT)(DWORD)(UINT)(BOOL)(fn)((hwnd), (HWND)(wParam), lParam);
+    (LRESULT)(DWORD)(UINT)(BOOL)(fn)((hwnd), (HWND)(wParam), lParam)
 #define FORWARD_WM_INITDIALOG(hwnd, hwndFocus, lParam, fn) \
     (BOOL)(DWORD)(fn)((hwnd), WM_INITDIALOG, (WPARAM)(HWND)(hwndFocus), (lParam))
 
@@ -803,49 +803,49 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_NEXTDLGCTL(hwnd, hwndSetFocus, fNext, fn) \
     (HWND)(UINT)(DWORD)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), MAKELPARAM((fNext), 0))
 
-/* void Cls_OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild); */
+/* void Cls_OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild) */
 #define HANDLE_WM_PARENTNOTIFY(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (HWND)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L)
 #define FORWARD_WM_PARENTNOTIFY(hwnd, msg, hwndChild, idChild, fn) \
     (void)(fn)((hwnd), WM_PARENTNOTIFY, (WPARAM)(UINT)(msg), MAKELPARAM((UINT)(HWND)(hwndChild), (UINT)(idChild)))
 
-/* void Cls_OnEnterIdle(HWND hwnd, UINT source, HWND hwndSource); */
+/* void Cls_OnEnterIdle(HWND hwnd, UINT source, HWND hwndSource) */
 #define HANDLE_WM_ENTERIDLE(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (UINT)(wParam), (HWND)LOWORD(lParam)), 0L)
 #define FORWARD_WM_ENTERIDLE(hwnd, source, hwndSource, fn) \
     (void)(fn)((hwnd), WM_ENTERIDLE, (WPARAM)(UINT)(source), MAKELPARAM((UINT)(HWND)(hwndSource), 0))
 
-/* UINT Cls_OnGetDlgCode(HWND hwnd, MSG FAR* lpmsg); */
+/* UINT Cls_OnGetDlgCode(HWND hwnd, MSG FAR* lpmsg) */
 #define HANDLE_WM_GETDLGCODE(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(fn)(hwnd, (MSG FAR*)(lParam))
 #define FORWARD_WM_GETDLGCODE(hwnd, lpmsg, fn) \
     (UINT)(DWORD)(fn)((hwnd), WM_GETDLGCODE, (SELECTOROF(lpmsg) ? lpmsg->wParam : 0), (LPARAM)(lpmsg))
 
-/* HBRUSH Cls_OnCtlColor(HWND hwnd, HDC hdc, HWND hwndChild, int type); */
+/* HBRUSH Cls_OnCtlColor(HWND hwnd, HDC hdc, HWND hwndChild, int type) */
 #define HANDLE_WM_CTLCOLOR(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)LOWORD(lParam), (int)(HIWORD(lParam)))
 #define FORWARD_WM_CTLCOLOR(hwnd, hdc, hwndChild, type, fn) \
     (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLOR, (WPARAM)(HDC)(hdc), MAKELPARAM((UINT)(HWND)(hwndChild), (UINT)(int)(type)))
 
-/* void Cls_OnSetFont(HWND hwndCtl, HFONT hfont, BOOL fRedraw); */
+/* void Cls_OnSetFont(HWND hwndCtl, HFONT hfont, BOOL fRedraw) */
 #define HANDLE_WM_SETFONT(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (HFONT)(wParam), (BOOL)LOWORD(lParam)), 0L)
 #define FORWARD_WM_SETFONT(hwnd, hfont, fRedraw, fn) \
     (void)(fn)((hwnd), WM_SETFONT, (WPARAM)(HFONT)(hfont), MAKELPARAM((UINT)(BOOL)(fRedraw), 0))
 
-/* HFONT Cls_OnGetFont(HWND hwnd); */
+/* HFONT Cls_OnGetFont(HWND hwnd) */
 #define HANDLE_WM_GETFONT(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd)
 #define FORWARD_WM_GETFONT(hwnd, fn) \
     (HFONT)(UINT)(DWORD)(fn)((hwnd), WM_GETFONT, 0, 0L)
 
-/* void Cls_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT FAR* lpDrawItem); */
+/* void Cls_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT FAR* lpDrawItem) */
 #define HANDLE_WM_DRAWITEM(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (const DRAWITEMSTRUCT FAR*)(lParam)), 0L)
 #define FORWARD_WM_DRAWITEM(hwnd, lpDrawItem, fn) \
     (void)(fn)((hwnd), WM_DRAWITEM, 0, (LPARAM)(const DRAWITEMSTRUCT FAR*)(lpDrawItem))
 
-/* void Cls_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT FAR* lpMeasureItem); */
+/* void Cls_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT FAR* lpMeasureItem) */
 #define HANDLE_WM_MEASUREITEM(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (MEASUREITEMSTRUCT FAR*)(lParam)), 0L)
 #define FORWARD_WM_MEASUREITEM(hwnd, lpMeasureItem, fn) \
@@ -857,31 +857,31 @@ extern "C" {            /* Assume C decl
 #define FORWARD_WM_DELETEITEM(hwnd, lpDeleteItem, fn) \
     (void)(fn)((hwnd), WM_DELETEITEM, 0, (LPARAM)(const DELETEITEMSTRUCT FAR*)(lpDeleteItem))
 
-/* int Cls_OnCompareItem(HWND hwnd, const COMPAREITEMSTRUCT FAR* lpCompareItem); */
+/* int Cls_OnCompareItem(HWND hwnd, const COMPAREITEMSTRUCT FAR* lpCompareItem) */
 #define HANDLE_WM_COMPAREITEM(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(int)(fn)((hwnd), (const COMPAREITEMSTRUCT FAR*)(lParam))
 #define FORWARD_WM_COMPAREITEM(hwnd, lpCompareItem, fn) \
     (int)(DWORD)(fn)((hwnd), WM_COMPAREITEM, 0, (LPARAM)(const COMPAREITEMSTRUCT FAR*)(lpCompareItem))
 
-/* int Cls_OnVkeyToItem(HWND hwnd, UINT vk, HWND hwndListbox, int iCaret); */
+/* int Cls_OnVkeyToItem(HWND hwnd, UINT vk, HWND hwndListbox, int iCaret) */
 #define HANDLE_WM_VKEYTOITEM(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(int)(fn)((hwnd), (UINT)(wParam), (HWND)LOWORD(lParam), (int)HIWORD(lParam))
 #define FORWARD_WM_VKEYTOITEM(hwnd, vk, hwndListBox, iCaret, fn) \
     (int)(DWORD)(fn)((hwnd), WM_VKEYTOITEM, (WPARAM)(UINT)(vk), MAKELPARAM((UINT)(hwndListBox), (UINT)(iCaret)))
 
-/* int Cls_OnCharToItem(HWND hwnd, UINT ch, HWND hwndListbox, int iCaret); */
+/* int Cls_OnCharToItem(HWND hwnd, UINT ch, HWND hwndListbox, int iCaret) */
 #define HANDLE_WM_CHARTOITEM(hwnd, wParam, lParam, fn) \
     (LRESULT)(DWORD)(int)(fn)((hwnd), (UINT)(wParam), (HWND)LOWORD(lParam), (int)HIWORD(lParam))
 #define FORWARD_WM_CHARTOITEM(hwnd, ch, hwndListBox, iCaret, fn) \
     (int)(DWORD)(fn)((hwnd), WM_CHARTOITEM, (WPARAM)(UINT)(ch), MAKELPARAM((UINT)(hwndListBox), (UINT)(iCaret)))
 
-/* void Cls_OnQueueSync(HWND hwnd); */
+/* void Cls_OnQueueSync(HWND hwnd) */
 #define HANDLE_WM_QUEUESYNC(hwnd, wParam, lParam, fn) \
     ((fn)(hwnd), 0L)
 #define FORWARD_WM_QUEUESYNC(hwnd, fn) \
     (void)(fn)((hwnd), WM_QUEUESYNC, 0, 0L)
 
-/* void Cls_OnCommNotify(HWND hwnd, int cid, UINT flags); */
+/* void Cls_OnCommNotify(HWND hwnd, int cid, UINT flags) */
 #define HANDLE_WM_COMMNOTIFY(hwnd, wParam, lParam, fn) \
     ((fn)((hwnd), (int)(wParam), LOWORD(lParam)), 0L)
 #define FORWARD_WM_COMMNOTIFY(hwnd, cid, flags, fn) \
@@ -1207,6 +1207,6 @@ extern "C" {            /* Assume C decl
 
 #ifdef __cplusplus
 }                       /* End of extern "C" { */
-#endif	/* __cplusplus */
+#endif  /* __cplusplus */
 
 #endif  /* !_INC_WINDOWSX */