[ros-diffs] [fireball] 22513: Sync with Wine. Based on James Tabor's patch, with little modifications.
fireball at svn.reactos.org
fireball at svn.reactos.org
Fri Jun 23 00:00:27 CEST 2006
Author: fireball
Date: Fri Jun 23 02:00:24 2006
New Revision: 22513
URL: http://svn.reactos.ru/svn/reactos?rev=22513&view=rev
Log:
Sync with Wine. Based on James Tabor's patch, with little modifications.
Modified:
trunk/reactos/dll/win32/user32/controls/static.c
Modified: trunk/reactos/dll/win32/user32/controls/static.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/static.c?rev=22513&r1=22512&r2=22513&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/static.c (original)
+++ trunk/reactos/dll/win32/user32/controls/static.c Fri Jun 23 02:00:24 2006
@@ -16,19 +16,42 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * NOTES
+ *
+ * This code was audited for completeness against the documented features
+ * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun.
+ *
+ * Unless otherwise noted, we believe this code to be complete, as per
+ * the specification mentioned above.
+ * If you discover missing features, or bugs, please note them below.
+ *
+ * Notes:
+ * - Windows XP introduced new behavior: The background of centered
+ * icons and bitmaps is painted differently. This is only done if
+ * a manifest is present.
+ * Because it has not yet been decided how to implement the two
+ * different modes in Wine, only the Windows XP mode is implemented.
+ * - Controls with SS_SIMPLE but without SS_NOPREFIX:
+ * The text should not be changed. Windows doesn't clear the
+ * client rectangle, so the new text must be larger than the old one.
+ * - The SS_RIGHTJUST style is currently not implemented by Windows
+ * (or it does something different than documented).
+ *
+ * TODO:
+ * - Animated cursors
*/
#include <user32.h>
-#ifndef __REACTOS__
WINE_DEFAULT_DEBUG_CHANNEL(static);
-#endif
static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style );
+//static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style );
static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
@@ -59,8 +82,8 @@
STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */
STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */
STATIC_PaintBitmapfn, /* SS_BITMAP */
- NULL, /* SS_ENHMETAFILE */
- STATIC_PaintEtchedfn, /* SS_ETCHEDHORIZ */
+ NULL, /* STATIC_PaintEnhMetafn, SS_ENHMETAFILE */
+ STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */
STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */
STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */
};
@@ -94,24 +117,23 @@
/***********************************************************************
* STATIC_SetIcon
*
- * Set the icon for an SS_ICON control.
+ * Set the icon for an SS_ICON control. Modified for ReactOS
*/
static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style )
{
-#ifdef __REACTOS__
HICON prevIcon;
+ ICONINFO info;
if ((style & SS_TYPEMASK) != SS_ICON) return 0;
- prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon );
- if (hicon && !(style & SS_CENTERIMAGE))
- {
- ICONINFO info;
+ if (hicon && (!GetIconInfo(hicon, &info))) {
+ WARN("hicon != 0, but info == 0\n");
+ return 0;
+ }
+ prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon );
+ if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL))
+ {
BITMAP bm;
- if (!GetIconInfo(hicon, &info))
- {
- return 0;
- }
if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm))
{
return 0;
@@ -120,30 +142,12 @@
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
}
return prevIcon;
-#else
- HICON prevIcon;
- CURSORICONINFO *info = hicon?(CURSORICONINFO *) GlobalLock16(HICON_16(hicon)):NULL;
-
- if ((style & SS_TYPEMASK) != SS_ICON) return 0;
- if (hicon && !info) {
- ERR("huh? hicon!=0, but info=0???\n");
- return 0;
- }
- prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon );
- if (hicon && !(style & SS_CENTERIMAGE))
- {
- SetWindowPos( hwnd, 0, 0, 0, info->nWidth, info->nHeight,
- SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
- GlobalUnlock16(HICON_16(hicon));
- }
- return prevIcon;
-#endif
}
/***********************************************************************
* STATIC_SetBitmap
*
- * Set the bitmap for an SS_BITMAP control.
+ * Set the bitmap for an SS_BITMAP control. Modified for ReactOS
*/
static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style )
{
@@ -151,15 +155,11 @@
if ((style & SS_TYPEMASK) != SS_BITMAP) return 0;
if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) {
-#ifdef __REACTOS__
- OutputDebugStringA("huh? hBitmap!=0, but not bitmap\n");
-#else
- ERR("huh? hBitmap!=0, but not bitmap\n");
-#endif
- return 0;
- }
- hOldBitmap = (HBITMAP)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hBitmap );
- if (hBitmap && !(style & SS_CENTERIMAGE))
+ ERR("huh? hBitmap!=0, but not bitmap\n");
+ return 0;
+ }
+ hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap );
+ if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL))
{
BITMAP bm;
GetObjectW(hBitmap, sizeof(bm), &bm);
@@ -170,16 +170,68 @@
}
/***********************************************************************
+ * STATIC_SetEnhMetaFile
+ *
+ * Set the enhanced metafile for an SS_ENHMETAFILE control.
+ */
+//static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style )
+//{
+// if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0;
+// if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) {
+// WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n");
+// return 0;
+// }
+// return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile );
+//}
+
+/***********************************************************************
+ * STATIC_GetImage
+ *
+ * Gets the bitmap for an SS_BITMAP control, the icon/cursor for an
+ * SS_ICON control or the enhanced metafile for an SS_ENHMETAFILE control.
+ */
+static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style )
+{
+ switch(style & SS_TYPEMASK)
+ {
+ case SS_ICON:
+ if ((wParam != IMAGE_ICON) &&
+ (wParam != IMAGE_CURSOR)) return NULL;
+ break;
+ case SS_BITMAP:
+ if (wParam != IMAGE_BITMAP) return NULL;
+ break;
+ case SS_ENHMETAFILE:
+ if (wParam != IMAGE_ENHMETAFILE) return NULL;
+ break;
+ default:
+ return NULL;
+ }
+ return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET );
+}
+
+/***********************************************************************
* STATIC_LoadIconA
*
* Load the icon for an SS_ICON control.
*/
-static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name )
-{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
- HICON hicon = LoadIconA( hInstance, name );
- if (!hicon) hicon = LoadIconA( 0, name );
+static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name, DWORD style )
+{
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
+ if ((style & SS_REALSIZEIMAGE) != 0)
+ {
+ return LoadImageA(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED);
+ }
+ else
+ {
+ HICON hicon = LoadIconA( hInstance, name );
+ if (!hicon) hicon = LoadCursorA( hInstance, name );
+ if (!hicon) hicon = LoadIconA( 0, name );
+ /* Windows doesn't try to load a standard cursor,
+ probably because most IDs for standard cursors conflict
+ with the IDs for standard icons anyway */
return hicon;
+ }
}
/***********************************************************************
@@ -187,12 +239,23 @@
*
* Load the icon for an SS_ICON control.
*/
-static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name )
-{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
- HICON hicon = LoadIconW( hInstance, name );
- if (!hicon) hicon = LoadIconW( 0, name );
- return hicon;
+static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name, DWORD style )
+{
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
+ if ((style & SS_REALSIZEIMAGE) != 0)
+ {
+ return LoadImageW(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED);
+ }
+ else
+ {
+ HICON hicon = LoadIconW( hInstance, name );
+ if (!hicon) hicon = LoadCursorW( hInstance, name );
+ if (!hicon) hicon = LoadIconW( 0, name );
+ /* Windows doesn't try to load a standard cursor,
+ probably because most IDs for standard cursors conflict
+ with the IDs for standard icons anyway */
+ return hicon;
+ }
}
/***********************************************************************
@@ -202,11 +265,9 @@
*/
static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
- HBITMAP hbitmap = LoadBitmapA( hInstance, name );
- if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */
- hbitmap = LoadBitmapA( 0, name );
- return hbitmap;
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
+ /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */
+ return LoadBitmapA( hInstance, name );
}
/***********************************************************************
@@ -216,11 +277,9 @@
*/
static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name )
{
- HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
- HBITMAP hbitmap = LoadBitmapW( hInstance, name );
- if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */
- hbitmap = LoadBitmapW( 0, name );
- return hbitmap;
+ HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
+ /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */
+ return LoadBitmapW( hInstance, name );
}
/***********************************************************************
@@ -243,7 +302,21 @@
}
}
-static VOID STATIC_InitColours()
+static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc)
+{
+ HBRUSH hBrush = (HBRUSH) SendMessageW( GetParent(hwnd),
+ WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd );
+ if (!hBrush) /* did the app forget to call DefWindowProc ? */
+ {
+ /* FIXME: DefWindowProc should return different colors if a
+ manifest is present */
+ hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC,
+ (WPARAM)hdc, (LPARAM)hwnd);
+ }
+ return hBrush;
+}
+
+static VOID STATIC_InitColours(void)
{
color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW);
color_3dshadow = GetSysColor(COLOR_3DSHADOW);
@@ -251,13 +324,34 @@
}
/***********************************************************************
+ * hasTextStyle
+ *
+ * Tests if the control displays text.
+ */
+static BOOL hasTextStyle( DWORD style )
+{
+ switch(style & SS_TYPEMASK)
+ {
+ case SS_SIMPLE:
+ case SS_LEFT:
+ case SS_LEFTNOWORDWRAP:
+ case SS_CENTER:
+ case SS_RIGHT:
+ case SS_OWNERDRAW:
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+/***********************************************************************
* StaticWndProc_common
*/
static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
LPARAM lParam, BOOL unicode )
{
LRESULT lResult = 0;
- LONG full_style = GetWindowLongA( hwnd, GWL_STYLE );
+ LONG full_style = GetWindowLongW( hwnd, GWL_STYLE );
LONG style = full_style & SS_TYPEMASK;
switch (uMsg)
@@ -265,11 +359,7 @@
case WM_CREATE:
if (style < 0L || style > SS_TYPEMASK)
{
-#ifdef __REACTOS__
- OutputDebugStringA("Unknown style\n");
-#else
ERR("Unknown style 0x%02lx\n", style );
-#endif
return -1;
}
STATIC_InitColours();
@@ -290,6 +380,7 @@
else return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) :
DefWindowProcA(hwnd, uMsg, wParam, lParam);
+ case WM_PRINTCLIENT:
case WM_PAINT:
{
PAINTSTRUCT ps;
@@ -301,86 +392,97 @@
break;
case WM_ENABLE:
- InvalidateRect(hwnd, NULL, TRUE);
+ STATIC_TryPaintFcn( hwnd, full_style );
+ if (full_style & SS_NOTIFY) {
+ if (wParam) {
+ SendMessageW( GetParent(hwnd), WM_COMMAND,
+ MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_ENABLE ), (LPARAM)hwnd);
+ }
+ else {
+ SendMessageW( GetParent(hwnd), WM_COMMAND,
+ MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DISABLE ), (LPARAM)hwnd);
+ }
+ }
break;
case WM_SYSCOLORCHANGE:
STATIC_InitColours();
- InvalidateRect(hwnd, NULL, TRUE);
+ STATIC_TryPaintFcn( hwnd, full_style );
break;
case WM_NCCREATE:
- if (full_style & SS_SUNKEN)
- SetWindowLongA( hwnd, GWL_EXSTYLE,
- GetWindowLongA( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE );
-
- if(unicode)
- lParam = (LPARAM)(((LPCREATESTRUCTW)lParam)->lpszName);
- else
- lParam = (LPARAM)(((LPCREATESTRUCTA)lParam)->lpszName);
- /* fall through */
+ {
+ LPCSTR textA;
+ LPCWSTR textW;
+
+ if (full_style & SS_SUNKEN)
+ SetWindowLongW( hwnd, GWL_EXSTYLE,
+ GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE );
+
+ if(unicode)
+ {
+ textA = NULL;
+ textW = ((LPCREATESTRUCTW)lParam)->lpszName;
+ }
+ else
+ {
+ textA = ((LPCREATESTRUCTA)lParam)->lpszName;
+ textW = NULL;
+ }
+
+ switch (style) {
+ case SS_ICON:
+ {
+ HICON hIcon;
+ if(unicode)
+ hIcon = STATIC_LoadIconW(hwnd, textW, full_style);
+ else
+ hIcon = STATIC_LoadIconA(hwnd, textA, full_style);
+ STATIC_SetIcon(hwnd, hIcon, full_style);
+ }
+ break;
+ case SS_BITMAP:
+ {
+ HBITMAP hBitmap;
+ if(unicode)
+ hBitmap = STATIC_LoadBitmapW(hwnd, textW);
+ else
+ hBitmap = STATIC_LoadBitmapA(hwnd, textA);
+ STATIC_SetBitmap(hwnd, hBitmap, full_style);
+ }
+ break;
+ }
+ /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load
+ the enhanced metafile that was specified as the window text. */
+ }
+ return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) :
+ DefWindowProcA(hwnd, uMsg, wParam, lParam);
+
case WM_SETTEXT:
- switch (style) {
- case SS_ICON:
- {
- HICON hIcon;
- if(unicode)
- hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam);
- else
- hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam);
- /* FIXME : should we also return the previous hIcon here ??? */
- STATIC_SetIcon(hwnd, hIcon, full_style);
- break;
- }
- case SS_BITMAP:
- {
- HBITMAP hBitmap;
- if(unicode)
- hBitmap = STATIC_LoadBitmapW(hwnd, (LPCWSTR)lParam);
- else
- hBitmap = STATIC_LoadBitmapA(hwnd, (LPCSTR)lParam);
- STATIC_SetBitmap(hwnd, hBitmap, full_style);
- break;
- }
- case SS_LEFT:
- case SS_CENTER:
- case SS_RIGHT:
- case SS_SIMPLE:
- case SS_LEFTNOWORDWRAP:
+ if (hasTextStyle( full_style ))
{
if (HIWORD(lParam))
{
- if(unicode)
- lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam );
- else
- lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam );
+ if(unicode)
+ lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam );
+ else
+ lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam );
+ STATIC_TryPaintFcn( hwnd, full_style );
}
- if (uMsg == WM_SETTEXT)
- STATIC_TryPaintFcn( hwnd, full_style );
- break;
}
- default:
- if (HIWORD(lParam))
- {
- if(unicode)
- lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam );
- else
- lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam );
- }
- if(uMsg == WM_SETTEXT)
- InvalidateRect(hwnd, NULL, TRUE);
- }
- return 1; /* success. FIXME: check text length */
+ break;
case WM_SETFONT:
- if ((style == SS_ICON) || (style == SS_BITMAP)) return 0;
- SetWindowLongA( hwnd, HFONT_GWL_OFFSET, wParam );
+ if (hasTextStyle( full_style ))
+ {
+ SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam );
if (LOWORD(lParam))
- InvalidateRect( hwnd, NULL, TRUE );
+ STATIC_TryPaintFcn( hwnd, full_style );
+ }
break;
case WM_GETFONT:
- return GetWindowLongA( hwnd, HFONT_GWL_OFFSET );
+ return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET );
case WM_NCHITTEST:
if (full_style & SS_NOTIFY)
@@ -395,38 +497,41 @@
case WM_NCLBUTTONDOWN:
if (full_style & SS_NOTIFY)
SendMessageW( GetParent(hwnd), WM_COMMAND,
- MAKEWPARAM( GetWindowLongW(hwnd,GWL_ID), STN_CLICKED ), (LPARAM)hwnd);
+ MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_CLICKED ), (LPARAM)hwnd);
return 0;
case WM_LBUTTONDBLCLK:
case WM_NCLBUTTONDBLCLK:
if (full_style & SS_NOTIFY)
SendMessageW( GetParent(hwnd), WM_COMMAND,
- MAKEWPARAM( GetWindowLongW(hwnd,GWL_ID), STN_DBLCLK ), (LPARAM)hwnd);
+ MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DBLCLK ), (LPARAM)hwnd);
return 0;
case STM_GETIMAGE:
+ return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style );
#ifndef __REACTOS__
case STM_GETICON16:
#endif
case STM_GETICON:
- return GetWindowLongA( hwnd, HICON_GWL_OFFSET );
+ return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style );
case STM_SETIMAGE:
switch(wParam) {
case IMAGE_BITMAP:
lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style );
break;
+// case IMAGE_ENHMETAFILE:
+// lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style );
+// break;
case IMAGE_ICON:
+ case IMAGE_CURSOR:
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
break;
default:
-#ifndef __REACTOS__
FIXME("STM_SETIMAGE: Unhandled type %x\n", wParam);
-#endif
break;
}
- InvalidateRect( hwnd, NULL, TRUE );
+ STATIC_TryPaintFcn( hwnd, full_style );
break;
#ifndef __REACTOS__
@@ -434,7 +539,7 @@
#endif
case STM_SETICON:
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style );
- InvalidateRect( hwnd, NULL, TRUE );
+ STATIC_TryPaintFcn( hwnd, full_style );
break;
default:
@@ -465,27 +570,31 @@
static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style )
{
DRAWITEMSTRUCT dis;
- LONG id = GetWindowLongA( hwnd, GWL_ID );
+ HFONT font, oldFont = NULL;
+ UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID );
dis.CtlType = ODT_STATIC;
dis.CtlID = id;
dis.itemID = 0;
dis.itemAction = ODA_DRAWENTIRE;
- dis.itemState = 0;
+ dis.itemState = IsWindowEnabled(hwnd) ? 0 : ODS_DISABLED;
dis.hwndItem = hwnd;
dis.hDC = hdc;
dis.itemData = 0;
GetClientRect( hwnd, &dis.rcItem );
+ font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET );
+ if (font) oldFont = SelectObject( hdc, font );
SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd );
SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis );
+ if (font) SelectObject( hdc, oldFont );
}
static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )
{
RECT rc;
HBRUSH hBrush;
- HFONT hFont;
+ HFONT hFont, hOldFont = NULL;
WORD wFormat;
INT len;
WCHAR *text;
@@ -507,11 +616,11 @@
break;
case SS_SIMPLE:
- wFormat = DT_LEFT | DT_SINGLELINE | DT_VCENTER;
+ wFormat = DT_LEFT | DT_SINGLELINE;
break;
case SS_LEFTNOWORDWRAP:
- wFormat = DT_LEFT | DT_EXPANDTABS | DT_VCENTER;
+ wFormat = DT_LEFT | DT_EXPANDTABS;
break;
default:
@@ -519,28 +628,56 @@
}
if (style & SS_NOPREFIX)
- wFormat |= DT_NOPREFIX;
- if (style & SS_CENTERIMAGE)
- wFormat |= DT_VCENTER;
-
- if ((hFont = (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont );
-
- if ((style & SS_NOPREFIX) || ((style & SS_TYPEMASK) != SS_SIMPLE))
- {
- hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
- (WPARAM)hdc, (LPARAM)hwnd );
- if (!hBrush) /* did the app forget to call defwindowproc ? */
- hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC,
- (WPARAM)hdc, (LPARAM)hwnd);
+ wFormat |= DT_NOPREFIX;
+
+ if ((style & SS_TYPEMASK) != SS_SIMPLE)
+ {
+ if (style & SS_CENTERIMAGE)
+ wFormat |= DT_SINGLELINE | DT_VCENTER;
+ if (style & SS_EDITCONTROL)
+ wFormat |= DT_EDITCONTROL;
+ if (style & SS_ENDELLIPSIS)
+ wFormat |= DT_SINGLELINE | DT_END_ELLIPSIS;
+ if (style & SS_PATHELLIPSIS)
+ wFormat |= DT_SINGLELINE | DT_PATH_ELLIPSIS;
+ if (style & SS_WORDELLIPSIS)
+ wFormat |= DT_SINGLELINE | DT_WORD_ELLIPSIS;
+ }
+
+ if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET )))
+ hOldFont = (HFONT)SelectObject( hdc, hFont );
+
+ /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned
+ brush is not used */
+ hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
+
+ if ((style & SS_TYPEMASK) != SS_SIMPLE)
+ {
FillRect( hdc, &rc, hBrush );
- }
if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
+ }
if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return;
if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return;
SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text );
+
+ if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX))
+ {
+ /* Windows uses the faster ExtTextOut() to draw the text and
+ to paint the whole client rectangle with the text background
+ color. Reference: "Static Controls" by Kyle Marsh, 1992 */
+ ExtTextOutW( hdc, rc.left, rc.top, ETO_CLIPPED | ETO_OPAQUE,
+ &rc, text, len, NULL );
+ }
+ else
+ {
DrawTextW( hdc, text, -1, &rc, wFormat );
+ }
+
HeapFree( GetProcessHeap(), 0, text );
+
+ if (hFont)
+ SelectObject( hdc, hOldFont );
}
static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style )
@@ -582,82 +719,114 @@
DeleteObject( hBrush );
}
-
+/* Modified for ReactOS */
static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style )
{
- RECT rc;
+ RECT rc, iconRect;
HBRUSH hbrush;
HICON hIcon;
- INT x, y;
+ ICONINFO info;
GetClientRect( hwnd, &rc );
- hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
- (WPARAM)hdc, (LPARAM)hwnd );
- FillRect( hdc, &rc, hbrush );
+ hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET );
- if (style & SS_CENTERIMAGE)
- {
-#ifndef __REACTOS__
- CURSORICONINFO *info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL;
- x = (rc.right - rc.left)/2 - (info ? info->nWidth/2 : 0);
- y = (rc.bottom - rc.top)/2 - (info ? info->nHeight/2 : 0);
-#else
- ICONINFO info;
+ if (!hIcon || (!GetIconInfo(hIcon, &info)))
+ {
+ FillRect(hdc, &rc, hbrush);
+ }
+ else
+ {
BITMAP bm;
-
- if (!GetIconInfo(hIcon, &info))
- return;
- if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm))
- return;
- x = (rc.right - rc.left)/2 - bm.bmWidth/2;
- y = (rc.bottom - rc.top)/2 - bm.bmHeight/2;
-#endif
- }
- else
- {
- x = rc.left;
- y = rc.top;
- }
- if (hIcon)
- DrawIcon( hdc, x, y, hIcon );
+ if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) return;
+ if (style & SS_CENTERIMAGE)
+ {
+ iconRect.left = (rc.right - rc.left) / 2 - bm.bmWidth / 2;
+ iconRect.top = (rc.bottom - rc.top) / 2 - bm.bmHeight / 2;
+ iconRect.right = iconRect.left + bm.bmWidth;
+ iconRect.bottom = iconRect.top + bm.bmHeight;
+ FillRect( hdc, &iconRect, hbrush ); /* Wine source has &rc */
+ }
+ else
+ {
+ FillRect( hdc, &rc, hbrush );
+ DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left,
+ rc.bottom - rc.top, 0, NULL, DI_NORMAL );
+ }
+ }
}
static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
{
HDC hMemDC;
HBITMAP hBitmap, oldbitmap;
+ HBRUSH hbrush;
/* message is still sent, even if the returned brush is not used */
- SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
- (WPARAM)hdc, (LPARAM)hwnd );
-
- if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET )))
+ hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
+
+ if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))
+ && (GetObjectType(hBitmap) == OBJ_BITMAP)
+ && (hMemDC = CreateCompatibleDC( hdc )))
{
BITMAP bm;
- INT x, y;
-
- if(GetObjectType(hBitmap) != OBJ_BITMAP) return;
- if (!(hMemDC = CreateCompatibleDC( hdc ))) return;
- GetObjectW(hBitmap, sizeof(bm), &bm);
- oldbitmap = SelectObject(hMemDC, hBitmap);
+ RECT rcClient;
+ LOGBRUSH brush;
+
+ GetObjectW(hBitmap, sizeof(bm), &bm);
+ oldbitmap = SelectObject(hMemDC, hBitmap);
+
+ /* Set the background color for monochrome bitmaps
+ to the color of the background brush */
+ if (GetObjectW( hbrush, sizeof(brush), &brush ))
+ {
+ if (brush.lbStyle == BS_SOLID)
+ SetBkColor(hdc, brush.lbColor);
+ }
+ GetClientRect(hwnd, &rcClient);
if (style & SS_CENTERIMAGE)
{
- RECT rcClient;
- GetClientRect(hwnd, &rcClient);
+ INT x, y;
x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2;
y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2;
+ FillRect( hdc, &rcClient, hbrush );
+ BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0,
+ SRCCOPY);
}
else
{
- x = 0;
- y = 0;
- }
- BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0,
- SRCCOPY);
- SelectObject(hMemDC, oldbitmap);
- DeleteDC(hMemDC);
- }
-}
+ StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left,
+ rcClient.bottom - rcClient.top, hMemDC,
+ 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
+ }
+ SelectObject(hMemDC, oldbitmap);
+ DeleteDC(hMemDC);
+ }
+ else
+ {
+ RECT rcClient;
+ GetClientRect( hwnd, &rcClient );
+ FillRect( hdc, &rcClient, hbrush );
+ }
+}
+
+
+//static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style )
+//{
+// HENHMETAFILE hEnhMetaFile;
+// RECT rc;
+// HBRUSH hbrush;
+//
+// GetClientRect(hwnd, &rc);
+// hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
+// FillRect(hdc, &rc, hbrush);
+// if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )))
+// {
+// /* The control's current font is not selected into the
+// device context! */
+// if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE)
+// PlayEnhMetaFile(hdc, hEnhMetaFile, &rc);
+// }
+//}
static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style )
More information about the Ros-diffs
mailing list