https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2367206744dc728b054560e81a1461f035edf699
commit 2367206744dc728b054560e81a1461f035edf699 Author: Amine Khaldi <[email protected]> AuthorDate: Mon Dec 25 14:36:16 2017 +0100 [USER32] Fix RealUserDrawCaption() return type. Rename {HFONT,UISTATE}_GWL_OFFSET and pfPaint. #179 --- win32ss/user/user32/controls/button.c | 20 ++++++++++---------- win32ss/user/user32/windows/nonclient.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index c6f01c8f2c..2538a9847b 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -69,10 +69,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); /* GetWindowLong offsets for window extra information */ #define STATE_GWL_OFFSET 0 -#define HFONT_GWL_OFFSET (sizeof(LONG)) -#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET+sizeof(HFONT)) -#define UISTATE_GWL_OFFSET (HIMAGE_GWL_OFFSET+sizeof(HFONT)) -#define NB_EXTRA_BYTES (UISTATE_GWL_OFFSET+sizeof(LONG)) +#define BUTTON_HFONT_GWL_OFFSET (sizeof(LONG)) +#define HIMAGE_GWL_OFFSET (BUTTON_HFONT_GWL_OFFSET+sizeof(HFONT)) +#define BUTTON_UISTATE_GWL_OFFSET (HIMAGE_GWL_OFFSET+sizeof(HFONT)) +#define NB_EXTRA_BYTES (BUTTON_UISTATE_GWL_OFFSET+sizeof(LONG)) /* undocumented flags */ #define BUTTON_NSTATES 0x0F @@ -117,9 +117,9 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED /* BS_OWNERDRAW */ }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, UINT action ); +typedef void (*pfButtonPaint)( HWND hwnd, HDC hdc, UINT action ); -static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = +static const pfButtonPaint btnPaintFunc[MAX_BTN_TYPE] = { PB_Paint, /* BS_PUSHBUTTON */ PB_Paint, /* BS_DEFPUSHBUTTON */ @@ -169,24 +169,24 @@ static inline void set_button_state( HWND hwnd, LONG state ) static __inline void set_ui_state( HWND hwnd, LONG flags ) { - SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags ); + SetWindowLongPtrW( hwnd, BUTTON_UISTATE_GWL_OFFSET, flags ); } static __inline LONG get_ui_state( HWND hwnd ) { - return GetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET ); + return GetWindowLongPtrW( hwnd, BUTTON_UISTATE_GWL_OFFSET ); } #endif /* __REACTOS__ */ static inline HFONT get_button_font( HWND hwnd ) { - return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (HFONT)GetWindowLongPtrW( hwnd, BUTTON_HFONT_GWL_OFFSET ); } static inline void set_button_font( HWND hwnd, HFONT font ) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG_PTR)font ); + SetWindowLongPtrW( hwnd, BUTTON_HFONT_GWL_OFFSET, (LONG_PTR)font ); } static inline UINT get_button_type( LONG window_style ) diff --git a/win32ss/user/user32/windows/nonclient.c b/win32ss/user/user32/windows/nonclient.c index ba2440aacc..370f72fbe1 100644 --- a/win32ss/user/user32/windows/nonclient.c +++ b/win32ss/user/user32/windows/nonclient.c @@ -76,7 +76,7 @@ UserGetWindowBorders(DWORD Style, DWORD ExStyle, SIZE *Size, BOOL WithClient) RealUserDrawCaption: This function is passed through RegisterUserApiHook to uxtheme to call it when the classic caption is needed to be drawn. */ -LRESULT WINAPI +BOOL WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags) { ERR("Real DC flags %08x\n",uFlags);
