Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Ilya Shpigor: User32: Skip STM_SETIMAGE message if the static control style does not match.

Browse source 
- Enable EnhMeta functions.

svn path=/trunk/; revision=43158
This commit is contained in:
James Tabor 2009-09-26 05:36:10 +00:00
parent 8d1578aa14
commit af4d2d6928
1 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

65
reactos/dll/win32/user32/controls/static.c
View file

@ -53,7 +53,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintRectfn( 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_PaintIconfn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintBitmapfn( 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_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style );
static void STATIC_PaintEtchedfn( 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 StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
//static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); //static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
@ -85,7 +85,7 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] =
STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */ STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */
STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */
STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintBitmapfn, /* SS_BITMAP */
NULL, /* STATIC_PaintEnhMetafn, SS_ENHMETAFILE */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */
STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */
STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */
STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */
@ -255,15 +255,15 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style )
* *
* Set the enhanced metafile for an SS_ENHMETAFILE control. * Set the enhanced metafile for an SS_ENHMETAFILE control.
*/ */
//static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style )
//{ {
// if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0;
// if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) {
// WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n");
// return 0; return 0;
// } }
// return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile );
//} }
/*********************************************************************** /***********************************************************************
* STATIC_GetImage * STATIC_GetImage
@ -617,13 +617,16 @@ LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
case STM_SETIMAGE: case STM_SETIMAGE:
switch(wParam) { switch(wParam) {
case IMAGE_BITMAP: case IMAGE_BITMAP:
if (style != SS_BITMAP) return 0;
lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style );
break; break;
// case IMAGE_ENHMETAFILE: case IMAGE_ENHMETAFILE:
// lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); if (style != SS_ENHMETAFILE) return 0;
// break; lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style );
break;
case IMAGE_ICON: case IMAGE_ICON:
case IMAGE_CURSOR: case IMAGE_CURSOR:
if (style != SS_ICON) return 0;
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
break; break;
default: default:
@ -929,23 +932,23 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
} }
//static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style )
//{ {
// HENHMETAFILE hEnhMetaFile; HENHMETAFILE hEnhMetaFile;
// RECT rc; RECT rc;
// HBRUSH hbrush; HBRUSH hbrush;
//
// GetClientRect(hwnd, &rc); GetClientRect(hwnd, &rc);
// hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
// FillRect(hdc, &rc, hbrush); FillRect(hdc, &rc, hbrush);
// if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )))
// { {
// /* The control's current font is not selected into the /* The control's current font is not selected into the
// device context! */ device context! */
// if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE) if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE)
// PlayEnhMetaFile(hdc, hEnhMetaFile, &rc); PlayEnhMetaFile(hdc, hEnhMetaFile, &rc);
// } }
//} }
static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style )