--- mstools/h/windowsx.h 2018/08/09 18:20:29 1.1.1.1 +++ mstools/h/windowsx.h 2018/08/09 18:23:02 1.1.1.3 @@ -4,7 +4,7 @@ * * * Version Win32 / Windows NT * * * -* Copyright (c) 1992, Microsoft Corp. All rights reserved. * +* Copyright (c) 1992-1993, Microsoft Corp. All rights reserved.* * * \*****************************************************************************/ @@ -15,52 +15,6 @@ extern "C" { /* Assume C declarations for C++ */ #endif /* __cplusplus */ -/*********************************************************************/ -/* The following section is temporary. It will be moved to winuser.h */ -/* after the beta release. */ -/* */ -/* */ - -#ifndef WINVER -#define WINVER 0x0314 // version 3.2 -#endif - -#define MAKEWPARAM(l, h) (WPARAM)MAKELONG(l, h) -#define MAKELPARAM(l, h) (LPARAM)MAKELONG(l, h) -#define MAKELRESULT(l, h) (LRESULT)MAKELONG(l, h) -typedef PMINMAXINFO LPMINMAXINFO; - -/* - * Dialog window class - */ -#define WC_DIALOG (MAKEINTATOM(0x8002)) - -/* - * Get/SetWindowWord/Long offsets for use with WC_DIALOG windows - */ -#define DWL_MSGRESULT 0 -#define DWL_DLGPROC 4 -#define DWL_USER 8 - -/* - * DlgDirList, DlgDirListComboBox flags values - */ -#define DDL_READWRITE 0x0000 -#define DDL_READONLY 0x0001 -#define DDL_HIDDEN 0x0002 -#define DDL_SYSTEM 0x0004 -#define DDL_DIRECTORY 0x0010 -#define DDL_ARCHIVE 0x0020 - -#define DDL_POSTMSGS 0x2000 -#define DDL_DRIVES 0x4000 -#define DDL_EXCLUSIVE 0x8000 - -/* */ -/* */ -/*********************************************************************/ - - /****** KERNEL Macro APIs ****************************************************/ #define GetInstanceModule(hInstance) (HMODULE)(hInstance) @@ -111,7 +65,7 @@ typedef PMINMAXINFO LPMINMAXINFO; /****** USER Macro APIs ******************************************************/ -#define GetWindowInstance(hwnd) ((HINSTANCE)GetWindowLong(hwnd, GWL_HINSTANCE)) +#define GetWindowInstance(hwnd) ((HMODULE)GetWindowLong(hwnd, GWL_HINSTANCE)) #define GetWindowStyle(hwnd) ((DWORD)GetWindowLong(hwnd, GWL_STYLE)) #define GetWindowExStyle(hwnd) ((DWORD)GetWindowLong(hwnd, GWL_EXSTYLE)) @@ -176,92 +130,92 @@ typedef PMINMAXINFO LPMINMAXINFO; #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, LPCTSTR lpszSectionName); */ +/* void Cls_OnWinIniChange(HWND hwnd, LPCTSTR lpszSectionName) */ #define HANDLE_WM_WININICHANGE(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (LPCTSTR)(lParam)), 0L) #define FORWARD_WM_WININICHANGE(hwnd, lpszSectionName, fn) \ - (void)(fn)((hwnd), WM_WININICHANGE, 0, (LPARAM)(LPCTSTR)(lpszSectionName)) + (void)(fn)((hwnd), WM_WININICHANGE, 0L, (LPARAM)(LPCTSTR)(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) + (void)(fn)((hwnd), WM_SYSCOLORCHANGE, 0L, 0L) -/* BOOL Cls_OnQueryNewPalette(HWND hwnd); */ +/* BOOL Cls_OnQueryNewPalette(HWND hwnd) */ #define HANDLE_WM_QUERYNEWPALETTE(hwnd, wParam, lParam, fn) \ - MAKELRESULT((BOOL)(fn)(hwnd), 0) + MAKELRESULT((BOOL)(fn)(hwnd), 0L) #define FORWARD_WM_QUERYNEWPALETTE(hwnd, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_QUERYNEWPALETTE, 0, 0L) + (BOOL)(DWORD)(fn)((hwnd), WM_QUERYNEWPALETTE, 0L, 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)(fn)((hwnd), WM_FONTCHANGE, 0L, 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) + ((fn)((hwnd), (UINT)(wParam), (int)(short)LOWORD(lParam)), 0L) #define FORWARD_WM_SPOOLERSTATUS(hwnd, status, cJobInQueue, fn) \ - (void)(fn)((hwnd), WM_SPOOLERSTATUS, (WPARAM)(status), MAKELPARAM((UINT)(cJobInQueue), 0)) + (void)(fn)((hwnd), WM_SPOOLERSTATUS, (WPARAM)(status), MAKELPARAM((cJobInQueue), 0)) -/* void Cls_OnDevModeChange(HWND hwnd, LPCTSTR lpszDeviceName); */ +/* void Cls_OnDevModeChange(HWND hwnd, LPCTSTR lpszDeviceName) */ #define HANDLE_WM_DEVMODECHANGE(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (LPCTSTR)(lParam)), 0L) #define FORWARD_WM_DEVMODECHANGE(hwnd, lpszDeviceName, fn) \ - (void)(fn)((hwnd), WM_DEVMODECHANGE, 0,(LPARAM)(LPCTSTR)(lpszDeviceName)) + (void)(fn)((hwnd), WM_DEVMODECHANGE, 0L, (LPARAM)(LPCTSTR)(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)(fn)((hwnd), WM_TIMECHANGE, 0L, 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)(int)(code), 0L) -/* BOOL Cls_OnQueryEndSession(HWND hwnd); */ +/* BOOL Cls_OnQueryEndSession(HWND hwnd) */ #define HANDLE_WM_QUERYENDSESSION(hwnd, wParam, lParam, fn) \ MAKELRESULT((BOOL)(fn)(hwnd), 0L) #define FORWARD_WM_QUERYENDSESSION(hwnd, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_QUERYENDSESSION, 0, 0L) + (BOOL)(DWORD)(fn)((hwnd), WM_QUERYENDSESSION, 0L, 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) /* This message is in Windows 3.1 only */ -/* void Cls_OnSystemError(HWND hwnd, int errCode); */ +/* void Cls_OnSystemError(HWND hwnd, int errCode) */ #define HANDLE_WM_SYSTEMERROR(hwnd, wParam, lParam, fn) #define FORWARD_WM_SYSTEMERROR(hwnd, errCode, fn) @@ -269,49 +223,49 @@ typedef PMINMAXINFO LPMINMAXINFO; #define HANDLE_WM_CREATE(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (LPCREATESTRUCT)(lParam)) ? 0L : (LRESULT)-1L) #define FORWARD_WM_CREATE(hwnd, lpCreateStruct, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_CREATE, 0, (LPARAM)(LPCREATESTRUCT)(lpCreateStruct)) + (BOOL)(DWORD)(fn)((hwnd), WM_CREATE, 0L, (LPARAM)(LPCREATESTRUCT)(lpCreateStruct)) /* BOOL Cls_OnNCCreate(HWND hwnd, LPCREATESTRUCT lpCreateStruct) */ #define HANDLE_WM_NCCREATE(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (LPCREATESTRUCT)(lParam)) #define FORWARD_WM_NCCREATE(hwnd, lpCreateStruct, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_NCCREATE, 0, (LPARAM)(LPCREATESTRUCT)(lpCreateStruct)) + (BOOL)(DWORD)(fn)((hwnd), WM_NCCREATE, 0L, (LPARAM)(LPCREATESTRUCT)(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)(fn)((hwnd), WM_DESTROY, 0L, 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)(fn)((hwnd), WM_NCDESTROY, 0L, 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), (UINT)(lParam)), 0L) #define FORWARD_WM_SHOWWINDOW(hwnd, fShow, status, fn) \ - (void)(fn)((hwnd), WM_SHOWWINDOW, (WPARAM)(BOOL)(fShow), (WPARAM)(UINT)(status)) + (void)(fn)((hwnd), WM_SHOWWINDOW, (WPARAM)(BOOL)(fShow), (LPARAM)(UINT)(status)) -/* 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)(BOOL)(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, LPCTSTR lpszText); */ +/* void Cls_OnSetText(HWND hwnd, LPCTSTR lpszText) */ #define HANDLE_WM_SETTEXT(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (LPCTSTR)(lParam)), 0L) #define FORWARD_WM_SETTEXT(hwnd, lpszText, fn) \ - (void)(fn)((hwnd), WM_SETTEXT, 0, (LPARAM)(LPCTSTR)(lpszText)) + (void)(fn)((hwnd), WM_SETTEXT, 0L, (LPARAM)(LPCTSTR)(lpszText)) /* INT Cls_OnGetText(HWND hwnd, int cchTextMax, LPTSTR lpszText) */ #define HANDLE_WM_GETTEXT(hwnd, wParam, lParam, fn) \ @@ -319,73 +273,73 @@ typedef PMINMAXINFO LPMINMAXINFO; #define FORWARD_WM_GETTEXT(hwnd, cchTextMax, lpszText, fn) \ (int)(DWORD)(fn)((hwnd), WM_GETTEXT, (WPARAM)(int)(cchTextMax), (LPARAM)(LPTSTR)(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) + (int)(DWORD)(fn)((hwnd), WM_GETTEXTLENGTH, 0L, 0L) -/* BOOL Cls_OnWindowPosChanging(HWND hwnd, LPWINDOWPOS lpwpos); */ +/* BOOL Cls_OnWindowPosChanging(HWND hwnd, LPWINDOWPOS lpwpos) */ #define HANDLE_WM_WINDOWPOSCHANGING(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(BOOL)(fn)((hwnd), (LPWINDOWPOS)(lParam)) #define FORWARD_WM_WINDOWPOSCHANGING(hwnd, lpwpos, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_WINDOWPOSCHANGING, 0, (LPARAM)(LPWINDOWPOS)(lpwpos)) + (BOOL)(DWORD)(fn)((hwnd), WM_WINDOWPOSCHANGING, 0L, (LPARAM)(LPWINDOWPOS)(lpwpos)) -/* void Cls_OnWindowPosChanged(HWND hwnd, const LPWINDOWPOS lpwpos); */ +/* void Cls_OnWindowPosChanged(HWND hwnd, const LPWINDOWPOS lpwpos) */ #define HANDLE_WM_WINDOWPOSCHANGED(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (const LPWINDOWPOS)(lParam)), 0L) #define FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, fn) \ - (void)(fn)((hwnd), WM_WINDOWPOSCHANGED, 0, (LPARAM)(const LPWINDOWPOS)(lpwpos)) + (void)(fn)((hwnd), WM_WINDOWPOSCHANGED, 0L, (LPARAM)(const LPWINDOWPOS)(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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam)), 0L) #define FORWARD_WM_MOVE(hwnd, x, y, fn) \ - (void)(fn)((hwnd), WM_MOVE, 0, MAKELPARAM((int)(x), (int)(y))) + (void)(fn)((hwnd), WM_MOVE, 0L, MAKELPARAM((x), (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) + ((fn)((hwnd), (UINT)(wParam), (int)(short)LOWORD(lParam), (int)(short)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)(fn)((hwnd), WM_SIZE, (WPARAM)(UINT)(state), MAKELPARAM((cx), (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) + (void)(fn)((hwnd), WM_CLOSE, 0L, 0L) -/* BOOL Cls_OnQueryOpen(HWND hwnd); */ +/* BOOL Cls_OnQueryOpen(HWND hwnd) */ #define HANDLE_WM_QUERYOPEN(hwnd, wParam, lParam, fn) \ - MAKELRESULT((BOOL)(fn)(hwnd), 0) + MAKELRESULT((BOOL)(fn)(hwnd)) #define FORWARD_WM_QUERYOPEN(hwnd, fn) \ - (BOOL)(DWORD)(fn)((hwnd), WM_QUERYOPEN, 0, 0L) + (BOOL)(DWORD)(fn)((hwnd), WM_QUERYOPEN, 0L, 0L) -/* void Cls_OnGetMinMaxInfo(HWND hwnd, LPMINMAXINFO lpMinMaxInfo); */ +/* void Cls_OnGetMinMaxInfo(HWND hwnd, LPMINMAXINFO lpMinMaxInfo) */ #define HANDLE_WM_GETMINMAXINFO(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (LPMINMAXINFO)(lParam)), 0L) #define FORWARD_WM_GETMINMAXINFO(hwnd, lpMinMaxInfo, fn) \ - (void)(fn)((hwnd), WM_GETMINMAXINFO, 0, (LPARAM)(LPMINMAXINFO)(lpMinMaxInfo)) + (void)(fn)((hwnd), WM_GETMINMAXINFO, 0L, (LPARAM)(LPMINMAXINFO)(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) + (void)(fn)((hwnd), WM_PAINT, 0L, 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) \ @@ -395,41 +349,41 @@ typedef PMINMAXINFO LPMINMAXINFO; #define HANDLE_WM_NCCALCSIZE(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(UINT)(fn)((hwnd), (BOOL)(0), (NCCALCSIZE_PARAMS *)(lParam)) #define FORWARD_WM_NCCALCSIZE(hwnd, fCalcValidRects, lpcsp, fn) \ - (UINT)(DWORD)(fn)((hwnd), WM_NCCALCSIZE, (WPARAM)(0), (LPARAM)(NCCALCSIZE_PARAMS *)(lpcsp)) + (UINT)(DWORD)(fn)((hwnd), WM_NCCALCSIZE, 0L, (LPARAM)(NCCALCSIZE_PARAMS *)(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)) + (LRESULT)(DWORD)(UINT)(fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)HIWORD(lParam)) #define FORWARD_WM_NCHITTEST(hwnd, x, y, fn) \ - (UINT)(DWORD)(fn)((hwnd), WM_NCHITTEST, 0, MAKELPARAM((int)(x), (int)(y))) + (UINT)(DWORD)(fn)((hwnd), WM_NCHITTEST, 0L, MAKELPARAM((x), (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) + (HICON)(UINT)(DWORD)(fn)((hwnd), WM_QUERYDRAGICON, 0L, 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)(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)LOWORD(wParam), (HWND)(lParam), (BOOL)HIWORD(wParam))) + ((fn)((hwnd), (UINT)LOWORD(wParam), (HWND)(lParam), (BOOL)HIWORD(wParam)), 0L) #define FORWARD_WM_ACTIVATE(hwnd, state, hwndActDeact, fMinimized, fn) \ - (void)(fn)((hwnd), WM_ACTIVATE, MAKEWPARAM((WORD)(state), (WORD)(fMinimized)), (LPARAM)(HWND)(hwndActDeact)) + (void)(fn)((hwnd), WM_ACTIVATE, MAKEWPARAM((state), (fMinimized)), (LPARAM)(HWND)(hwndActDeact)) -/* void Cls_OnActivateApp(HWND hwnd, BOOL fActivate, DWORD dwThreadId); */ +/* void Cls_OnActivateApp(HWND hwnd, BOOL fActivate, DWORD dwThreadId) */ #define HANDLE_WM_ACTIVATEAPP(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (BOOL)(wParam), (DWORD)(lParam))) + ((fn)((hwnd), (BOOL)(wParam), (DWORD)(lParam)), 0L) #define FORWARD_WM_ACTIVATEAPP(hwnd, fActivate, dwThreadId, fn) \ (void)(fn)((hwnd), WM_ACTIVATEAPP, (WPARAM)(BOOL)(fActivate), (LPARAM)(dwThreadId)) -/* 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), 0L, 0L) #define FORWARD_WM_NCACTIVATE(hwnd, fActive, hwndActDeact, fMinimized, fn) \ @@ -441,284 +395,284 @@ typedef PMINMAXINFO LPMINMAXINFO; #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))) + ((fn)((hwnd), (UINT)(wParam), TRUE, (int)(short)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L) #define FORWARD_WM_KEYDOWN(hwnd, vk, cRepeat, flags, fn) \ - (void)(fn)((hwnd), WM_KEYDOWN, (WPARAM)(UINT)(vk), MAKELPARAM((WORD)(cRepeat), (WORD)(flags))) + (void)(fn)((hwnd), WM_KEYDOWN, (WPARAM)(UINT)(vk), MAKELPARAM((cRepeat), (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) + ((fn)((hwnd), (UINT)(wParam), FALSE, (int)(short)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)(fn)((hwnd), WM_KEYUP, (WPARAM)(UINT)(vk), MAKELPARAM((cRepeat), (flags))) -/* void Cls_OnChar(HWND hwnd, TCHAR ch, int cRepeat); */ +/* void Cls_OnChar(HWND hwnd, TCHAR ch, int cRepeat) */ #define HANDLE_WM_CHAR(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (TCHAR)(wParam), (int)LOWORD(lParam)), 0L) + ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) #define FORWARD_WM_CHAR(hwnd, ch, cRepeat, fn) \ - (void)(fn)((hwnd), WM_CHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((UINT)(cRepeat),0)) + (void)(fn)((hwnd), WM_CHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((cRepeat),0)) -/* void Cls_OnDeadChar(HWND hwnd, TCHAR ch, int cRepeat); */ +/* void Cls_OnDeadChar(HWND hwnd, TCHAR ch, int cRepeat) */ #define HANDLE_WM_DEADCHAR(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (TCHAR)(wParam), (int)LOWORD(lParam)), 0L) + ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) #define FORWARD_WM_DEADCHAR(hwnd, ch, cRepeat, fn) \ - (void)(fn)((hwnd), WM_DEADCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((UINT)(cRepeat),0)) + (void)(fn)((hwnd), WM_DEADCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((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))) + ((fn)((hwnd), (UINT)(wParam), TRUE, (int)(short)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)(fn)((hwnd), WM_SYSKEYDOWN, (WPARAM)(UINT)(vk), MAKELPARAM((cRepeat), (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))) + ((fn)((hwnd), (UINT)(wParam), FALSE, (int)(short)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)(fn)((hwnd), WM_SYSKEYUP, (WPARAM)(UINT)(vk), MAKELPARAM((cRepeat), (flags))) -/* void Cls_OnSysChar(HWND hwnd, TCHAR ch, int cRepeat); */ +/* void Cls_OnSysChar(HWND hwnd, TCHAR ch, int cRepeat) */ #define HANDLE_WM_SYSCHAR(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (TCHAR)(wParam), (int)LOWORD(lParam)), 0L) + ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) #define FORWARD_WM_SYSCHAR(hwnd, ch, cRepeat, fn) \ - (void)(fn)((hwnd), WM_SYSCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((UINT)(cRepeat), 0)) + (void)(fn)((hwnd), WM_SYSCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((cRepeat), 0)) -/* void Cls_OnSysDeadChar(HWND hwnd, TCHAR ch, int cRepeat); */ +/* void Cls_OnSysDeadChar(HWND hwnd, TCHAR ch, int cRepeat) */ #define HANDLE_WM_SYSDEADCHAR(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (TCHAR)(wParam), (int)LOWORD(lParam)), 0L) + ((fn)((hwnd), (TCHAR)(wParam), (int)(short)LOWORD(lParam)), 0L) #define FORWARD_WM_SYSDEADCHAR(hwnd, ch, cRepeat, fn) \ - (void)(fn)((hwnd), WM_SYSDEADCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((UINT)(cRepeat), 0)) + (void)(fn)((hwnd), WM_SYSDEADCHAR, (WPARAM)(TCHAR)(ch), MAKELPARAM((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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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))) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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)(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) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), FALSE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), TRUE, (int)(short)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (int)(short)LOWORD(lParam), (int)(short)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)(fn)((hwnd), WM_CANCELMODE, 0L, 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, UINT item, BOOL fSystemMenu); */ +/* void Cls_OnInitMenuPopup(HWND hwnd, HMENU hMenu, UINT item, BOOL fSystemMenu) */ #define HANDLE_WM_INITMENUPOPUP(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HMENU)(wParam), (UINT)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), (HIWORD(wParam) & MF_POPUP) ? 0 : (HMENU)(lParam), \ - (HIWORD(wParam) & MF_POPUP) ? 0 : (UINT)(LOWORD(wParam)), \ - (HIWORD(wParam) & MF_POPUP) ? (HMENU)(lParam) : 0, \ - HIWORD(wParam))) + ((fn)((hwnd), (HMENU)(lParam), \ + (HIWORD(wParam) & MF_POPUP) ? 0L : (int)(LOWORD(wParam)), \ + (HIWORD(wParam) & MF_POPUP) ? GetSubMenu((HMENU)lParam, LOWORD(wParam)) : 0L, \ + (UINT)(((short)HIWORD(wParam) == -1) ? 0xFFFFFFFF : HIWORD(wParam))), 0L) #define FORWARD_WM_MENUSELECT(hwnd, hmenu, item, hmenuPopup, flags, fn) \ (void)(fn)((hwnd), WM_MENUSELECT, MAKEWPARAM((item), (flags)), (LPARAM)(HMENU)((hmenu) ? (hmenu) : (hmenuPopup))) -/* 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)(LOWORD(wParam)), HIWORD(wParam), (HMENU)(lParam)); + (LRESULT)(DWORD)(fn)((hwnd), (UINT)(LOWORD(wParam)), (UINT)HIWORD(wParam), (HMENU)(lParam)) #define FORWARD_WM_MENUCHAR(hwnd, ch, flags, hmenu, fn) \ (DWORD)(fn)((hwnd), WM_MENUCHAR, MAKEWPARAM(flags, (WORD)(ch)), (LPARAM)(HMENU)(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)(LOWORD(wParam)), (HWND)(lParam), (UINT)HIWORD(wParam)), 0L) #define FORWARD_WM_COMMAND(hwnd, id, hwndCtl, codeNotify, fn) \ (void)(fn)((hwnd), WM_COMMAND, MAKEWPARAM((UINT)(id),(UINT)(codeNotify)), (LPARAM)(HWND)(hwndCtl)) -/* 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)(lParam), (UINT)(LOWORD(wParam)), (int)HIWORD(wParam)), 0L) + ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) #define FORWARD_WM_HSCROLL(hwnd, hwndCtl, code, pos, fn) \ (void)(fn)((hwnd), WM_HSCROLL, MAKEWPARAM((UINT)(pos),(UINT)(code)), (LPARAM)(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)(lParam), (UINT)(LOWORD(wParam)), (int)HIWORD(wParam)), 0L) + ((fn)((hwnd), (HWND)(lParam), (UINT)(LOWORD(wParam)), (int)(short)HIWORD(wParam)), 0L) #define FORWARD_WM_VSCROLL(hwnd, hwndCtl, code, pos, fn) \ (void)(fn)((hwnd), WM_VSCROLL, MAKEWPARAM((UINT)(int)(pos),(UINT)(int)(code)), (LPARAM)(HWND)(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)(fn)((hwnd), WM_CUT, 0L, 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)(fn)((hwnd), WM_COPY, 0L, 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)(fn)((hwnd), WM_PASTE, 0L, 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)(fn)((hwnd), WM_CLEAR, 0L, 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) + (void)(fn)((hwnd), WM_UNDO, 0L, 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)(fn)((hwnd), WM_RENDERALLFORMATS, 0L, 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)(fn)((hwnd), WM_DESTROYCLIPBOARD, 0L, 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) \ - (void)(fn)((hwnd), WM_DRAWCLIPBOARD, 0, 0L) + (void)(fn)((hwnd), WM_DRAWCLIPBOARD, 0L, 0L) /* void Cls_OnPaintClipboard(HWND hwnd, HWND hwndCBViewer, const LPPAINTSTRUCT lpPaintStruct) */ #define HANDLE_WM_PAINTCLIPBOARD(hwnd, wParam, lParam, fn) \ @@ -726,124 +680,124 @@ typedef PMINMAXINFO LPMINMAXINFO; #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 LPRECT lprc); */ +/* void Cls_OnSizeClipboard(HWND hwnd, HWND hwndCBViewer, const LPRECT lprc) */ #define HANDLE_WM_SIZECLIPBOARD(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (HWND)(wParam), (const LPRECT)GlobalLock((HGLOBAL)(lParam))), GlobalUnlock((HGLOBAL)(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) + ((fn)((hwnd), (HWND)(wParam), (UINT)LOWORD(lParam), (int)(short)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) + ((fn)((hwnd), (HWND)(wParam), (UINT)LOWORD(lParam), (int)(short)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, LPTSTR rgchName); */ +/* void Cls_OnAskCBFormatName(HWND hwnd, int cchMax, LPTSTR rgchName) */ #define HANDLE_WM_ASKCBFORMATNAME(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (int)(wParam), (LPTSTR)(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) + ((fn)((hwnd), (HWND)(wParam), (HWND)(lParam)), 0L) #define FORWARD_WM_CHANGECBCHAIN(hwnd, hwndRemove, hwndNext, fn) \ - (void)(fn)((hwnd), WM_CHANGECBCHAIN, (WPARAM)(HWND)(hwndRemove), MAKELPARAM((UINT)(hwndNext), 0)) + (void)(fn)((hwnd), WM_CHANGECBCHAIN, (WPARAM)(HWND)(hwndRemove), (LPARAM)(HWND)(hwndNext)) -/* 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) + ((fn)((hwnd), (UINT)(wParam), (int)(short)LOWORD(lParam), (int)(short)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 LPMDICREATESTRUCT lpmcs); */ +/* HWND Cls_MDICreate(HWND hwnd, const LPMDICREATESTRUCT lpmcs) */ #define HANDLE_WM_MDICREATE(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(UINT)(fn)((hwnd), (LPMDICREATESTRUCT)(lParam)) #define FORWARD_WM_MDICREATE(hwnd, lpmcs, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDICREATE, 0, (LPARAM)(lpmcs)) + (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDICREATE, 0L, (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) + ((fn)((hwnd), (BOOL)(lParam == (LPARAM)hwnd), (HWND)(lParam), (HWND)(wParam)), 0L) #define FORWARD_WM_MDIACTIVATE(hwnd, fActive, hwndActivate, hwndDeactivate, fn) \ - (void)(fn)(hwnd, WM_MDIACTIVATE, (WPARAM)(fActive), MAKELPARAM((hwndActivate), (hwndDeactivate))) + (void)(fn)(hwnd, WM_MDIACTIVATE, (WPARAM)(hwndDeactivate), (LPARAM)(hwndActivate)) -/* 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)lParam), 0L) + (fn)((hwnd), (HWND)(wParam), (BOOL)lParam) #define FORWARD_WM_MDINEXT(hwnd, hwndCur, fPrev, fn) \ (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), (LPARAM)(fPrev)) -/* 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) + (void)(fn)((hwnd), WM_MDIICONARRANGE, 0L, 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) + (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDIGETACTIVE, 0L, 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)(wParam), (HMENU)(lParam)) #define FORWARD_WM_MDISETMENU(hwnd, fRefresh, hmenuFrame, hmenuWindow, fn) \ (HMENU)(UINT)(DWORD)(fn)((hwnd), WM_MDISETMENU, (WPARAM)((fRefresh) ? (hmenuFrame) : 0), (LPARAM)(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) + (void)(fn)((hwnd), WM_CHILDACTIVATE, 0L, 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)) @@ -853,25 +807,25 @@ typedef PMINMAXINFO LPMINMAXINFO; #define FORWARD_WM_NEXTDLGCTL(hwnd, hwndSetFocus, fNext, fn) \ (HWND)(UINT)(DWORD)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), (LPARAM)(fNext)) -/* 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)LOWORD(wParam), (HWND)(lParam), (UINT)HIWORD(wParam)), 0L) #define FORWARD_WM_PARENTNOTIFY(hwnd, msg, hwndChild, idChild, fn) \ - (void)(fn)((hwnd), WM_PARENTNOTIFY, MAKEWPARAM((WORD)msg, (WORD)idChild), (LPARAM)(hwndChild)) + (void)(fn)((hwnd), WM_PARENTNOTIFY, MAKEWPARAM(msg, idChild), (LPARAM)(hwndChild)) -/* 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)(lParam)), 0L) #define FORWARD_WM_ENTERIDLE(hwnd, source, hwndSource, fn) \ (void)(fn)((hwnd), WM_ENTERIDLE, (WPARAM)(UINT)(source), (LPARAM)(HWND)(hwndSource)) -/* UINT Cls_OnGetDlgCode(HWND hwnd, LPMSG lpmsg); */ +/* UINT Cls_OnGetDlgCode(HWND hwnd, LPMSG lpmsg) */ #define HANDLE_WM_GETDLGCODE(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(UINT)(fn)(hwnd, (LPMSG)(lParam)) #define FORWARD_WM_GETDLGCODE(hwnd, lpmsg, fn) \ (UINT)(DWORD)(fn)((hwnd), WM_GETDLGCODE, (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_CTLCOLORMSGBOX(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_MSGBOX) #define FORWARD_WM_CTLCOLORMSGBOX(hwnd, hdc, hwndChild, fn) \ @@ -907,63 +861,63 @@ typedef PMINMAXINFO LPMINMAXINFO; #define FORWARD_WM_CTLCOLORSTATIC(hwnd, hdc, hwndChild, fn) \ (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORSTATIC, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) -/* 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)(lParam)), 0L) #define FORWARD_WM_SETFONT(hwnd, hfont, fRedraw, fn) \ (void)(fn)((hwnd), WM_SETFONT, (WPARAM)(HFONT)(hfont), (LPARAM)(BOOL)(fRedraw)) -/* 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) + (HFONT)(UINT)(DWORD)(fn)((hwnd), WM_GETFONT, 0L, 0L) -/* void Cls_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT * lpDrawItem); */ +/* void Cls_OnDrawItem(HWND hwnd, const DRAWITEMSTRUCT * lpDrawItem) */ #define HANDLE_WM_DRAWITEM(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (const DRAWITEMSTRUCT *)(lParam)), 0L) #define FORWARD_WM_DRAWITEM(hwnd, lpDrawItem, fn) \ - (void)(fn)((hwnd), WM_DRAWITEM, ((const DRAWITEMSTRUCT *)lpDrawItem)->CtlID, (LPARAM)(const DRAWITEMSTRUCT *)(lpDrawItem)) + (void)(fn)((hwnd), WM_DRAWITEM, (WPARAM)(((const DRAWITEMSTRUCT *)lpDrawItem)->CtlID), (LPARAM)(const DRAWITEMSTRUCT *)(lpDrawItem)) -/* void Cls_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT * lpMeasureItem); */ +/* void Cls_OnMeasureItem(HWND hwnd, MEASUREITEMSTRUCT * lpMeasureItem) */ #define HANDLE_WM_MEASUREITEM(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (MEASUREITEMSTRUCT *)(lParam)), 0L) #define FORWARD_WM_MEASUREITEM(hwnd, lpMeasureItem, fn) \ - (void)(fn)((hwnd), WM_MEASUREITEM, ((MEASUREITEMSTRUCT *)lpMeasureItem)->CtlID, (LPARAM)(MEASUREITEMSTRUCT *)(lpMeasureItem)) + (void)(fn)((hwnd), WM_MEASUREITEM, (WPARAM)(((MEASUREITEMSTRUCT *)lpMeasureItem)->CtlID), (LPARAM)(MEASUREITEMSTRUCT *)(lpMeasureItem)) /* void Cls_OnDeleteItem(HWND hwnd, const DELETEITEMSTRUCT * lpDeleteItem) */ #define HANDLE_WM_DELETEITEM(hwnd, wParam, lParam, fn) \ ((fn)((hwnd), (const DELETEITEMSTRUCT *)(lParam)), 0L) #define FORWARD_WM_DELETEITEM(hwnd, lpDeleteItem, fn) \ - (void)(fn)((hwnd), WM_DELETEITEM, ((const DELETEITEMSTRUCT *)(lpDeleteItem))->CtlID, (LPARAM)(const DELETEITEMSTRUCT *)(lpDeleteItem)) + (void)(fn)((hwnd), WM_DELETEITEM, (WPARAM)(((const DELETEITEMSTRUCT *)(lpDeleteItem))->CtlID), (LPARAM)(const DELETEITEMSTRUCT *)(lpDeleteItem)) -/* int Cls_OnCompareItem(HWND hwnd, const COMPAREITEMSTRUCT * lpCompareItem); */ +/* int Cls_OnCompareItem(HWND hwnd, const COMPAREITEMSTRUCT * lpCompareItem) */ #define HANDLE_WM_COMPAREITEM(hwnd, wParam, lParam, fn) \ (LRESULT)(DWORD)(int)(fn)((hwnd), (const COMPAREITEMSTRUCT *)(lParam)) #define FORWARD_WM_COMPAREITEM(hwnd, lpCompareItem, fn) \ - (int)(DWORD)(fn)((hwnd), WM_COMPAREITEM, ((const COMPAREITEMSTRUCT *)(lpCompareItem))->CtlID, (LPARAM)(const COMPAREITEMSTRUCT *)(lpCompareItem)) + (int)(DWORD)(fn)((hwnd), WM_COMPAREITEM, (WPARAM)(((const COMPAREITEMSTRUCT *)(lpCompareItem))->CtlID), (LPARAM)(const COMPAREITEMSTRUCT *)(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)LOWORD(wParam), (HWND)(lParam), (int)HIWORD(wParam)) + (LRESULT)(DWORD)(int)(fn)((hwnd), (UINT)LOWORD(wParam), (HWND)(lParam), (int)(short)HIWORD(wParam)) #define FORWARD_WM_VKEYTOITEM(hwnd, vk, hwndListBox, iCaret, fn) \ - (int)(DWORD)(fn)((hwnd), WM_VKEYTOITEM, MAKEWPARAM((WORD)(vk), (WORD)(iCaret)), (LPARAM)(hwndListBox)) + (int)(DWORD)(fn)((hwnd), WM_VKEYTOITEM, MAKEWPARAM((vk), (iCaret)), (LPARAM)(hwndListBox)) -/* 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)LOWORD(wParam), (HWND)(lParam), (int)HIWORD(wParam)) + (LRESULT)(DWORD)(int)(fn)((hwnd), (UINT)LOWORD(wParam), (HWND)(lParam), (int)(short)HIWORD(wParam)) #define FORWARD_WM_CHARTOITEM(hwnd, ch, hwndListBox, iCaret, fn) \ (int)(DWORD)(fn)((hwnd), WM_CHARTOITEM, MAKEWPARAM((UINT)(iCaret), (UINT)(ch)), (LPARAM)(hwndListBox)) -/* 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)(fn)((hwnd), WM_QUEUESYNC, 0L, 0L) #if (WINVER >= 0x030a) -/* 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) + ((fn)((hwnd), (int)(wParam), (UINT)LOWORD(lParam)), 0L) #define FORWARD_WM_COMMNOTIFY(hwnd, cid, flags, fn) \ (void)(fn)((hwnd), WM_COMMNOTIFY, (WPARAM)(cid), MAKELPARAM((flags), 0)) #endif @@ -976,7 +930,7 @@ typedef PMINMAXINFO LPMINMAXINFO; #define Static_SetText(hwndCtl, lpsz) SetWindowText((hwndCtl), (lpsz)) #define Static_SetIcon(hwndCtl, hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl), STM_SETICON, (WPARAM)(HICON)(hIcon), 0L)) -#define Static_GetIcon(hwndCtl, hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl), STM_GETICON, 0, 0L)) +#define Static_GetIcon(hwndCtl, hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl), STM_GETICON, 0L, 0L)) /****** Button control message APIs ******************************************/ @@ -986,10 +940,10 @@ typedef PMINMAXINFO LPMINMAXINFO; #define Button_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl) #define Button_SetText(hwndCtl, lpsz) SetWindowText((hwndCtl), (lpsz)) -#define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), BM_GETCHECK, 0, 0L)) +#define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), BM_GETCHECK, 0L, 0L)) #define Button_SetCheck(hwndCtl, check) ((void)SendMessage((hwndCtl), BM_SETCHECK, (WPARAM)(int)(check), 0L)) -#define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), BM_GETSTATE, 0, 0L)) +#define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), BM_GETSTATE, 0L, 0L)) #define Button_SetState(hwndCtl, state) ((UINT)(DWORD)SendMessage((hwndCtl), BM_SETSTATE, (WPARAM)(int)(state), 0L)) #define Button_SetStyle(hwndCtl, style, fRedraw) ((void)SendMessage((hwndCtl), BM_SETSTYLE, (WPARAM)LOWORD(style), MAKELPARAM(((fRedraw) ? TRUE : FALSE), 0))) @@ -1004,29 +958,31 @@ typedef PMINMAXINFO LPMINMAXINFO; #define Edit_LimitText(hwndCtl, cchMax) ((void)SendMessage((hwndCtl), EM_LIMITTEXT, (WPARAM)(cchMax), 0L)) -#define Edit_GetLineCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), EM_GETLINECOUNT, 0, 0L)) +#define Edit_GetLineCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), EM_GETLINECOUNT, 0L, 0L)) #define Edit_GetLine(hwndCtl, line, lpch, cchMax) ((*((int *)(lpch)) = (cchMax)), ((int)(DWORD)SendMessage((hwndCtl), EM_GETLINE, (WPARAM)(int)(line), (LPARAM)(LPTSTR)(lpch)))) -#define Edit_GetRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_GETRECT, 0, (LPARAM)(RECT *)(lprc))) -#define Edit_SetRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_SETRECT, 0, (LPARAM)(const RECT *)(lprc))) -#define Edit_SetRectNoPaint(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_SETRECTNP, 0, (LPARAM)(const RECT *)(lprc))) - -#define Edit_GetSel(hwndCtl) ((DWORD)SendMessage((hwndCtl), EM_GETSEL, 0, 0L)) -#define Edit_SetSel(hwndCtl, ichStart, ichEnd) ((void)SendMessage((hwndCtl), EM_SETSEL, 0, MAKELPARAM((ichStart), (ichEnd)))) -#define Edit_ReplaceSel(hwndCtl, lpszReplace) ((void)SendMessage((hwndCtl), EM_REPLACESEL, 0, (LPARAM)(LPCTSTR)(lpszReplace))) +#define Edit_GetRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_GETRECT, 0L, (LPARAM)(RECT *)(lprc))) +#define Edit_SetRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_SETRECT, 0L, (LPARAM)(const RECT *)(lprc))) +#define Edit_SetRectNoPaint(hwndCtl, lprc) ((void)SendMessage((hwndCtl), EM_SETRECTNP, 0L, (LPARAM)(const RECT *)(lprc))) + +#define Edit_GetSel(hwndCtl) ((DWORD)SendMessage((hwndCtl), EM_GETSEL, 0L, 0L)) +#define Edit_SetSel(hwndCtl, ichStart, ichEnd) ((void)SendMessage((hwndCtl), EM_SETSEL, (ichStart), (ichEnd))) +#define Edit_ReplaceSel(hwndCtl, lpszReplace) ((void)SendMessage((hwndCtl), EM_REPLACESEL, 0L, (LPARAM)(LPCTSTR)(lpszReplace))) -#define Edit_GetModify(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_GETMODIFY, 0, 0L)) +#define Edit_GetModify(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_GETMODIFY, 0L, 0L)) #define Edit_SetModify(hwndCtl, fModified) ((void)SendMessage((hwndCtl), EM_SETMODIFY, (WPARAM)(UINT)(fModified), 0L)) +#define Edit_ScrollCaret(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_SCROLLCARET, 0, 0L)) + #define Edit_LineFromChar(hwndCtl, ich) ((int)(DWORD)SendMessage((hwndCtl), EM_LINEFROMCHAR, (WPARAM)(int)(ich), 0L)) #define Edit_LineIndex(hwndCtl, line) ((int)(DWORD)SendMessage((hwndCtl), EM_LINEINDEX, (WPARAM)(int)(line), 0L)) #define Edit_LineLength(hwndCtl, line) ((int)(DWORD)SendMessage((hwndCtl), EM_LINELENGTH, (WPARAM)(int)(line), 0L)) -#define Edit_Scroll(hwndCtl, dv, dh) ((void)SendMessage((hwndCtl), EM_LINESCROLL, 0, MAKELPARAM((dv), (dh)))) +#define Edit_Scroll(hwndCtl, dv, dh) ((void)SendMessage((hwndCtl), EM_LINESCROLL, (WPARAM)(dh), (LPARAM)(dv))) -#define Edit_CanUndo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_CANUNDO, 0, 0L)) -#define Edit_Undo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_UNDO, 0, 0L)) -#define Edit_EmptyUndoBuffer(hwndCtl) ((void)SendMessage((hwndCtl), EM_EMPTYUNDOBUFFER, 0, 0L)) +#define Edit_CanUndo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_CANUNDO, 0L, 0L)) +#define Edit_Undo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_UNDO, 0L, 0L)) +#define Edit_EmptyUndoBuffer(hwndCtl) ((void)SendMessage((hwndCtl), EM_EMPTYUNDOBUFFER, 0L, 0L)) #define Edit_SetPasswordChar(hwndCtl, ch) ((void)SendMessage((hwndCtl), EM_SETPASSWORDCHAR, (WPARAM)(UINT)(ch), 0L)) @@ -1034,18 +990,18 @@ typedef PMINMAXINFO LPMINMAXINFO; #define Edit_FmtLines(hwndCtl, fAddEOL) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_FMTLINES, (WPARAM)(BOOL)(fAddEOL), 0L)) -#define Edit_GetHandle(hwndCtl) ((HLOCAL)(UINT)(DWORD)SendMessage((hwndCtl), EM_GETHANDLE, 0, 0L)) +#define Edit_GetHandle(hwndCtl) ((HLOCAL)(UINT)(DWORD)SendMessage((hwndCtl), EM_GETHANDLE, 0L, 0L)) #define Edit_SetHandle(hwndCtl, h) ((void)SendMessage((hwndCtl), EM_SETHANDLE, (WPARAM)(UINT)(HLOCAL)(h), 0L)) #if (WINVER >= 0x030a) -#define Edit_GetFirstVisibleLine(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), EM_GETFIRSTVISIBLELINE, 0, 0L)) +#define Edit_GetFirstVisibleLine(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), EM_GETFIRSTVISIBLELINE, 0L, 0L)) #define Edit_SetReadOnly(hwndCtl, fReadOnly) ((BOOL)(DWORD)SendMessage((hwndCtl), EM_SETREADONLY, (WPARAM)(BOOL)(fReadOnly), 0L)) -#define Edit_GetPasswordChar(hwndCtl) ((char)(DWORD)SendMessage((hwndCtl), EM_GETPASSWORDCHAR, 0, 0L)) +#define Edit_GetPasswordChar(hwndCtl) ((char)(DWORD)SendMessage((hwndCtl), EM_GETPASSWORDCHAR, 0L, 0L)) -#define Edit_SetWordBreakProc(hwndCtl, lpfnWordBreak) ((void)SendMessage((hwndCtl), EM_SETWORDBREAKPROC, 0, (LPARAM)(EDITWORDBREAKPROC)(lpfnWordBreak))) -#define Edit_GetWordBreakProc(hwndCtl) ((EDITWORDBREAKPROC)SendMessage((hwndCtl), EM_GETWORDBREAKPROC, 0, 0L)) +#define Edit_SetWordBreakProc(hwndCtl, lpfnWordBreak) ((void)SendMessage((hwndCtl), EM_SETWORDBREAKPROC, 0L, (LPARAM)(EDITWORDBREAKPROC)(lpfnWordBreak))) +#define Edit_GetWordBreakProc(hwndCtl) ((EDITWORDBREAKPROC)SendMessage((hwndCtl), EM_GETWORDBREAKPROC, 0L, 0L)) #endif /* WINVER >= 0x030a */ /****** ScrollBar control message APIs ***************************************/ @@ -1065,13 +1021,13 @@ typedef PMINMAXINFO LPMINMAXINFO; #define ListBox_Enable(hwndCtl, fEnable) EnableWindow((hwndCtl), (fEnable)) -#define ListBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCOUNT, 0, 0L)) -#define ListBox_ResetContent(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), LB_RESETCONTENT, 0, 0L)) +#define ListBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCOUNT, 0L, 0L)) +#define ListBox_ResetContent(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), LB_RESETCONTENT, 0L, 0L)) -#define ListBox_AddString(hwndCtl, lpsz) ((int)(DWORD)SendMessage((hwndCtl), LB_ADDSTRING, 0, (LPARAM)(LPCTSTR)(lpsz))) +#define ListBox_AddString(hwndCtl, lpsz) ((int)(DWORD)SendMessage((hwndCtl), LB_ADDSTRING, 0L, (LPARAM)(LPCTSTR)(lpsz))) #define ListBox_InsertString(hwndCtl, index, lpsz) ((int)(DWORD)SendMessage((hwndCtl), LB_INSERTSTRING, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpsz))) -#define ListBox_AddItemData(hwndCtl, data) ((int)(DWORD)SendMessage((hwndCtl), LB_ADDSTRING, 0, (LPARAM)(data))) +#define ListBox_AddItemData(hwndCtl, data) ((int)(DWORD)SendMessage((hwndCtl), LB_ADDSTRING, 0L, (LPARAM)(data))) #define ListBox_InsertItemData(hwndCtl, index, data) ((int)(DWORD)SendMessage((hwndCtl), LB_INSERTSTRING, (WPARAM)(int)(index), (LPARAM)(data))) #define ListBox_DeleteString(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), LB_DELETESTRING, (WPARAM)(int)(index), 0L)) @@ -1086,24 +1042,24 @@ typedef PMINMAXINFO LPMINMAXINFO; #define ListBox_FindString(hwndCtl, indexStart, lpszFind) ((int)(DWORD)SendMessage((hwndCtl), LB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind))) #define ListBox_FindItemData(hwndCtl, indexStart, data) ((int)(DWORD)SendMessage((hwndCtl), LB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(data))) -#define ListBox_SetSel(hwndCtl, fSelect, index) ((int)(DWORD)SendMessage((hwndCtl), LB_SETSEL, (WPARAM)(BOOL)(fSelect), MAKELPARAM((index), 0))) +#define ListBox_SetSel(hwndCtl, fSelect, index) ((int)(DWORD)SendMessage((hwndCtl), LB_SETSEL, (WPARAM)(BOOL)(fSelect), (LPARAM)(index))) #define ListBox_SelItemRange(hwndCtl, fSelect, first, last) ((int)(DWORD)SendMessage((hwndCtl), LB_SELITEMRANGE, (WPARAM)(BOOL)(fSelect), MAKELPARAM((first), (last)))) -#define ListBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCURSEL, 0, 0L)) +#define ListBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCURSEL, 0L, 0L)) #define ListBox_SetCurSel(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), LB_SETCURSEL, (WPARAM)(int)(index), 0L)) #define ListBox_SelectString(hwndCtl, indexStart, lpszFind) ((int)(DWORD)SendMessage((hwndCtl), LB_SELECTSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind))) #define ListBox_SelectItemData(hwndCtl, indexStart, data) ((int)(DWORD)SendMessage((hwndCtl), LB_SELECTSTRING, (WPARAM)(int)(indexStart), (LPARAM)(data))) #define ListBox_GetSel(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), LB_GETSEL, (WPARAM)(int)(index), 0L)) -#define ListBox_GetSelCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0, 0L)) -#define ListBox_GetTopIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETTOPINDEX, 0, 0L)) +#define ListBox_GetSelCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0L, 0L)) +#define ListBox_GetTopIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETTOPINDEX, 0L, 0L)) #define ListBox_GetSelItems(hwndCtl, cItems, lpItems) ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELITEMS, (WPARAM)(int)(cItems), (LPARAM)(int *)(lpItems))) #define ListBox_SetTopIndex(hwndCtl, indexTop) ((int)(DWORD)SendMessage((hwndCtl), LB_SETTOPINDEX, (WPARAM)(int)(indexTop), 0L)) #define ListBox_SetColumnWidth(hwndCtl, cxColumn) ((void)SendMessage((hwndCtl), LB_SETCOLUMNWIDTH, (WPARAM)(int)(cxColumn), 0L)) -#define ListBox_GetHorizontalExtent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0, 0L)) +#define ListBox_GetHorizontalExtent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0L, 0L)) #define ListBox_SetHorizontalExtent(hwndCtl, cxExtent) ((void)SendMessage((hwndCtl), LB_SETHORIZONTALEXTENT, (WPARAM)(int)(cxExtent), 0L)) #define ListBox_SetTabStops(hwndCtl, cTabs, lpTabs) ((BOOL)(DWORD)SendMessage((hwndCtl), LB_SETTABSTOPS, (WPARAM)(int)(cTabs), (LPARAM)(int *)(lpTabs))) @@ -1111,8 +1067,7 @@ typedef PMINMAXINFO LPMINMAXINFO; #define ListBox_GetItemRect(hwndCtl, index, lprc) ((int)(DWORD)SendMessage((hwndCtl), LB_GETITEMRECT, (WPARAM)(int)(index), (LPARAM)(RECT *)(lprc))) #define ListBox_SetCaretIndex(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), LB_SETCARETINDEX, (WPARAM)(int)(index), 0L)) -#define ListBox_GetCaretIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCARETINDEX, 0, 0L)) - +#define ListBox_GetCaretIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), LB_GETCARETINDEX, 0L, 0L)) #define ListBox_FindStringExact(hwndCtl, indexStart, lpszFind) ((int)(DWORD)SendMessage((hwndCtl), LB_FINDSTRINGEXACT, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind))) @@ -1132,16 +1087,16 @@ typedef PMINMAXINFO LPMINMAXINFO; #define ComboBox_LimitText(hwndCtl, cchLimit) ((int)(DWORD)SendMessage((hwndCtl), CB_LIMITTEXT, (WPARAM)(int)(cchLimit), 0L)) -#define ComboBox_GetEditSel(hwndCtl) ((DWORD)SendMessage((hwndCtl), CB_GETEDITSEL, 0, 0L)) -#define ComboBox_SetEditSel(hwndCtl, ichStart, ichEnd) ((int)(DWORD)SendMessage((hwndCtl), CB_SETEDITSEL, 0, MAKELPARAM((ichStart), (ichEnd)))) +#define ComboBox_GetEditSel(hwndCtl) ((DWORD)SendMessage((hwndCtl), CB_GETEDITSEL, 0L, 0L)) +#define ComboBox_SetEditSel(hwndCtl, ichStart, ichEnd) ((int)(DWORD)SendMessage((hwndCtl), CB_SETEDITSEL, 0L, MAKELPARAM((ichStart), (ichEnd)))) -#define ComboBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETCOUNT, 0, 0L)) -#define ComboBox_ResetContent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_RESETCONTENT, 0, 0L)) +#define ComboBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETCOUNT, 0L, 0L)) +#define ComboBox_ResetContent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_RESETCONTENT, 0L, 0L)) -#define ComboBox_AddString(hwndCtl, lpsz) ((int)(DWORD)SendMessage((hwndCtl), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)(lpsz))) +#define ComboBox_AddString(hwndCtl, lpsz) ((int)(DWORD)SendMessage((hwndCtl), CB_ADDSTRING, 0L, (LPARAM)(LPCTSTR)(lpsz))) #define ComboBox_InsertString(hwndCtl, index, lpsz) ((int)(DWORD)SendMessage((hwndCtl), CB_INSERTSTRING, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpsz))) -#define ComboBox_AddItemData(hwndCtl, data) ((int)(DWORD)SendMessage((hwndCtl), CB_ADDSTRING, 0, (LPARAM)(data))) +#define ComboBox_AddItemData(hwndCtl, data) ((int)(DWORD)SendMessage((hwndCtl), CB_ADDSTRING, 0L, (LPARAM)(data))) #define ComboBox_InsertItemData(hwndCtl, index, data) ((int)(DWORD)SendMessage((hwndCtl), CB_INSERTSTRING, (WPARAM)(int)(index), (LPARAM)(data))) #define ComboBox_DeleteString(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), CB_DELETESTRING, (WPARAM)(int)(index), 0L)) @@ -1155,7 +1110,7 @@ typedef PMINMAXINFO LPMINMAXINFO; #define ComboBox_FindString(hwndCtl, indexStart, lpszFind) ((int)(DWORD)SendMessage((hwndCtl), CB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind))) #define ComboBox_FindItemData(hwndCtl, indexStart, data) ((int)(DWORD)SendMessage((hwndCtl), CB_FINDSTRING, (WPARAM)(int)(indexStart), (LPARAM)(data))) -#define ComboBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETCURSEL, 0, 0L)) +#define ComboBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETCURSEL, 0L, 0L)) #define ComboBox_SetCurSel(hwndCtl, index) ((int)(DWORD)SendMessage((hwndCtl), CB_SETCURSEL, (WPARAM)(int)(index), 0L)) #define ComboBox_SelectString(hwndCtl, indexStart, lpszSelect) ((int)(DWORD)SendMessage((hwndCtl), CB_SELECTSTRING, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszSelect))) @@ -1168,13 +1123,13 @@ typedef PMINMAXINFO LPMINMAXINFO; #if (WINVER >= 0x030a) #define ComboBox_FindStringExact(hwndCtl, indexStart, lpszFind) ((int)(DWORD)SendMessage((hwndCtl), CB_FINDSTRINGEXACT, (WPARAM)(int)(indexStart), (LPARAM)(LPCTSTR)(lpszFind))) -#define ComboBox_GetDroppedState(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), CB_GETDROPPEDSTATE, 0, 0L)) -#define ComboBox_GetDroppedControlRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)(RECT *)(lprc))) +#define ComboBox_GetDroppedState(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl), CB_GETDROPPEDSTATE, 0L, 0L)) +#define ComboBox_GetDroppedControlRect(hwndCtl, lprc) ((void)SendMessage((hwndCtl), CB_GETDROPPEDCONTROLRECT, 0L, (LPARAM)(RECT *)(lprc))) -#define ComboBox_GetItemHeight(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETITEMHEIGHT, 0, 0L)) +#define ComboBox_GetItemHeight(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl), CB_GETITEMHEIGHT, 0L, 0L)) #define ComboBox_SetItemHeight(hwndCtl, cyItem) ((int)(DWORD)SendMessage((hwndCtl), CB_SETITEMHEIGHT, (WPARAM)(int)(index), 0L)) -#define ComboBox_GetExtendedUI(hwndCtl) ((UINT)(DWORD)SendMessage((hwndCtl), CB_GETEXTENDEDUI, 0, 0L)) +#define ComboBox_GetExtendedUI(hwndCtl) ((UINT)(DWORD)SendMessage((hwndCtl), CB_GETEXTENDEDUI, 0L, 0L)) #define ComboBox_SetExtendedUI(hwndCtl, flags) ((int)(DWORD)SendMessage((hwndCtl), CB_SETEXTENDEDUI, (WPARAM)(UINT)(flags), 0L)) #endif /* WINVER >= 0x030a */ @@ -1214,38 +1169,38 @@ typedef PMINMAXINFO LPMINMAXINFO; #define GET_WM_MENUSELECT_CMD(wp, lp) LOWORD(wp) -#define GET_WM_MENUSELECT_FLAGS(wp, lp) HIWORD(wp) +#define GET_WM_MENUSELECT_FLAGS(wp, lp) (UINT)(int)(short)HIWORD(wp) #define GET_WM_MENUSELECT_HMENU(wp, lp) (HMENU)(lp) #define GET_WM_MENUSELECT_MPS(cmd, f, hmenu) \ (WPARAM)MAKELONG(cmd, f), (LONG)(hmenu) -// Note: the following are for interpreting MDIclient to MDI child messages. +/* Note: the following are for interpreting MDIclient to MDI child messages. */ #define GET_WM_MDIACTIVATE_FACTIVATE(hwnd, wp, lp) (lp == (LONG)hwnd) #define GET_WM_MDIACTIVATE_HWNDDEACT(wp, lp) (HWND)(wp) #define GET_WM_MDIACTIVATE_HWNDACTIVATE(wp, lp) (HWND)(lp) -// Note: the following is for sending to the MDI client window. +/* Note: the following is for sending to the MDI client window. */ #define GET_WM_MDIACTIVATE_MPS(f, hwndD, hwndA)\ (WPARAM)(hwndA), 0 #define GET_WM_MDISETMENU_MPS(hmenuF, hmenuW) (WPARAM)hmenuF, (LONG)hmenuW -#define GET_WM_MENUCHAR_CHAR(wp, lp) (CHAR)HIWORD(wp) +#define GET_WM_MENUCHAR_CHAR(wp, lp) (CHAR)LOWORD(wp) #define GET_WM_MENUCHAR_HMENU(wp, lp) (HMENU)(lp) -#define GET_WM_MENUCHAR_FMENU(wp, lp) (BOOL)LOWORD(wp) +#define GET_WM_MENUCHAR_FMENU(wp, lp) (BOOL)HIWORD(wp) #define GET_WM_MENUCHAR_MPS(ch, hmenu, f) \ - (WPARAM)MAKELONG(f, ch), (LONG)(hmenu) + (WPARAM)MAKELONG(ch, f), (LONG)(hmenu) -#define GET_WM_PARENTNOTIFY_MSG(wp, lp) HIWORD(wp) -#define GET_WM_PARENTNOTIFY_ID(wp, lp) LOWORD(wp) +#define GET_WM_PARENTNOTIFY_MSG(wp, lp) LOWORD(wp) +#define GET_WM_PARENTNOTIFY_ID(wp, lp) HIWORD(wp) #define GET_WM_PARENTNOTIFY_HWNDCHILD(wp, lp) (HWND)(lp) -#define GET_WM_PARENTNOTIFY_X(wp, lp) (INT)LOWORD(lp) -#define GET_WM_PARENTNOTIFY_Y(wp, lp) (INT)HIWORD(lp) +#define GET_WM_PARENTNOTIFY_X(wp, lp) (int)(short)LOWORD(lp) +#define GET_WM_PARENTNOTIFY_Y(wp, lp) (int)(short)HIWORD(lp) #define GET_WM_PARENTNOTIFY_MPS(msg, id, hwnd) \ (WPARAM)MAKELONG(id, msg), (LONG)(hwnd) #define GET_WM_PARENTNOTIFY2_MPS(msg, x, y) \ (WPARAM)MAKELONG(0, msg), MAKELONG(x, y) -#define GET_WM_VKEYTOITEM_CODE(wp, lp) (INT)LOWORD(wp) +#define GET_WM_VKEYTOITEM_CODE(wp, lp) (int)(short)LOWORD(wp) #define GET_WM_VKEYTOITEM_ITEM(wp, lp) HIWORD(wp) #define GET_WM_VKEYTOITEM_HWND(wp, lp) (HWND)(lp) #define GET_WM_VKEYTOITEM_MPS(code, item, hwnd) \ @@ -1265,37 +1220,59 @@ typedef PMINMAXINFO LPMINMAXINFO; #define GET_WM_HSCROLL_POS(wp, lp) HIWORD(wp) #define GET_WM_HSCROLL_HWND(wp, lp) (HWND)(lp) #define GET_WM_HSCROLL_MPS(code, pos, hwnd) \ - (WPARAM)MAKELONG(pos, code), (LONG)(hwnd) + (WPARAM)MAKELONG(code, pos), (LONG)(hwnd) #define GET_WM_VSCROLL_CODE(wp, lp) LOWORD(wp) #define GET_WM_VSCROLL_POS(wp, lp) HIWORD(wp) #define GET_WM_VSCROLL_HWND(wp, lp) (HWND)(lp) #define GET_WM_VSCROLL_MPS(code, pos, hwnd) \ - (WPARAM)MAKELONG(pos, code), (LONG)(hwnd) + (WPARAM)MAKELONG(code, pos), (LONG)(hwnd) /****** C runtime porting macros ****************************************/ -#define _fmemcpy(x,y,z) memcpy(x,y,z) -#define _fmemcmp(x,y,z) memcmp(x,y,z) -#define _fmemset(x,y,z) memset(x,y,z) -#define _fmemicmp(x,y,z) memicmp(x,y,z) -#define _fmemmove(x,y,z) memmove(x,y,z) -#define _fstrcpy(x,y) strcpy(x,y) -#define _fstrcmp(x,y) strcmp(x,y) -#define _fstrcat(x,y) strcat(x,y) -#define _fstrlen(x) strlen(x) -#define _fstricmp(x,y) stricmp(x,y) -#define _fstrstr(x,y) strstr(x,y) -#define _fstrncpy(x,y,z) strncpy(x,y,z) -#define _fstrncmp(x,y,z) strncmp(x,y,z) -#define _fstrupr(x) strupr(x) -#define _fstrlwr(x) strlwr(x) -#define _fstrchr(x,y) strchr(x,y) -#define _fstrrchr(x,y) strrchr(x,y) -#define _fstrnicmp(x,y,z) strnicmp(x,y,z) -#define _fstrpbrk(x,y) strpbrk(x,y) -#define _nfree(x) free(x) -#define _nmalloc(x) malloc(x) +#define _ncalloc calloc +#define _nexpand expand +#define _ffree free +#define _fmalloc malloc +#define _fmemccpy _memccpy +#define _fmemchr memchr +#define _fmemcmp memcmp +#define _fmemcpy memcpy +#define _fmemicmp _memicmp +#define _fmemmove memmove +#define _fmemset memset +#define _fmsize _msize +#define _frealloc realloc +#define _fstrcat strcat +#define _fstrchr strchr +#define _fstrcmp strcmp +#define _fstrcpy strcpy +#define _fstrcspn strcspn +#define _fstrdup _strdup +#define _fstricmp _stricmp +#define _fstrlen strlen +#define _fstrlwr _strlwr +#define _fstrncat strncat +#define _fstrncmp strncmp +#define _fstrncpy strncpy +#define _fstrnicmp _strnicmp +#define _fstrnset _strnset +#define _fstrpbrk strpbrk +#define _fstrrchr strrchr +#define _fstrrev _strrev +#define _fstrset _strset +#define _fstrspn strspn +#define _fstrstr strstr +#define _fstrtok strtok +#define _fstrupr _strupr +#define _nfree free +#define _nmalloc malloc +#define _nmsize msize +#define _nrealloc realloc +#define _nstrdup _strdup +#define hmemcpy memcpy + +#define DECLARE_HANDLE32 DECLARE_HANDLE #ifdef __cplusplus } /* End of extern "C" { */