From f2011619fce62469f0160217ed5fb3cc1a8f8b8e Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 26 Oct 2003 18:08:51 +0000 Subject: [PATCH] - Small bugfixes. svn path=/trunk/; revision=6439 --- reactos/include/defines.h | 1 + reactos/include/wine/debugtools.h | 1 + reactos/include/wine/unicode.h | 1 + reactos/lib/user32/user32.rc | 1 + reactos/lib/user32/windows/nonclient.c | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/reactos/include/defines.h b/reactos/include/defines.h index c74faff5c7b..915ec30bc93 100644 --- a/reactos/include/defines.h +++ b/reactos/include/defines.h @@ -2644,6 +2644,7 @@ extern "C" { #define SPI_GETSTICKYKEYS (58) #define SPI_GETTOGGLEKEYS (52) #define SPI_GETWINDOWSEXTENSION (92) +#define SPI_GETWHEELSCROLLLINES (104) #define SPI_GETWORKAREA (48) #define SPI_ICONHORIZONTALSPACING (13) #define SPI_ICONVERTICALSPACING (24) diff --git a/reactos/include/wine/debugtools.h b/reactos/include/wine/debugtools.h index 87e71b17760..b5383f63800 100644 --- a/reactos/include/wine/debugtools.h +++ b/reactos/include/wine/debugtools.h @@ -99,6 +99,7 @@ inline static const char *debugres_w( const WCHAR *s ) { return wine_dbgstr_wn( #define DEFAULT_DEBUG_CHANNEL(ch) \ char __wine_dbch_##ch[1]; static char * const __wine_dbch___default = __wine_dbch_##ch +#define WINE_DECLARE_DEBUG_CHANNEL(ch) DECLARE_DEBUG_CHANNEL(ch) #define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch) #define DPRINTF wine_dbg_printf diff --git a/reactos/include/wine/unicode.h b/reactos/include/wine/unicode.h index 095195f02a3..b2c7f6b980c 100644 --- a/reactos/include/wine/unicode.h +++ b/reactos/include/wine/unicode.h @@ -8,6 +8,7 @@ #define strtolW(s,e,b) wcstol((const wchar_t *)s,(wchar_t **)e,b) #define strchrW(s,c) wcschr((const wchar_t *)s,(wchar_t)c) #define strncmpW(s1,s2,n) wcsncmp((const wchar_t *)s1,(const wchar_t *)s2,n) +#define strncpyW(s1,s2,n) wcsncpy((wchar_t *)s1,(const wchar_t *)s2,n) #define tolowerW(n) towlower((wint_t)n) #define atoiW(s) _wtoi((const wchar_t *)s) #define atolW(s) _wtol((const wchar_t *)s) diff --git a/reactos/lib/user32/user32.rc b/reactos/lib/user32/user32.rc index 531f3b5e6ff..53dffb4475a 100644 --- a/reactos/lib/user32/user32.rc +++ b/reactos/lib/user32/user32.rc @@ -78,6 +78,7 @@ END // OBM_CLOSE BITMAP "resources/obm_close.bmp" +OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp" DF_HATCH BITMAP "resources/df_hatch.bmp" ///////////////////////////////////////////////////////////////////////////// diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c index 3d7ea460043..6f150ed540a 100644 --- a/reactos/lib/user32/windows/nonclient.c +++ b/reactos/lib/user32/windows/nonclient.c @@ -349,7 +349,7 @@ DefWndNCPaint(HWND hWnd, HRGN hRgn) } else if (ExStyle & WS_EX_STATICEDGE) { - DrawEdge(hDC, &CurrentRect, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST); + DrawEdge(hDC, &CurrentRect, BDR_SUNKENINNER, BF_RECT | BF_ADJUST); } /* Firstly the "thick" frame */