Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-07 19:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

C89 compatibility

Browse source 
svn path=/trunk/; revision=5666
This commit is contained in:
Royce Mitchell III 2003-08-19 03:05:42 +00:00
parent b3b09803f9
commit 5b43864d3d
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/lib/user32/windows/draw.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: draw.c,v 1.23 2003/08/18 00:14:50 silverblade Exp $ /* $Id: draw.c,v 1.24 2003/08/19 03:05:42 royce Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -1805,20 +1805,13 @@ WINBOOL INTERNAL_DrawState(
UINT fuFlags, UINT fuFlags,
BOOL unicode) BOOL unicode)
{ {
// AG: Experimental, unfinished, and most likely buggy! I haven't been UINT type;
// able to test this - my intention was to implement some things needed UINT state;
// by the button control. INT len;
if ((! lpOutputFunc) && (fuFlags & DST_COMPLEX))
return FALSE;
UINT type = fuFlags & 0xf; // DST_xxx
UINT state = fuFlags & 0x7ff0; // DSS_xxx
INT len = wData; // Data length
RECT rect; RECT rect;
UINT dtflags = DT_NOCLIP; // Flags for DrawText UINT dtflags = DT_NOCLIP; // Flags for DrawText
BOOL retval = FALSE; // Return value BOOL retval = FALSE; // Return value
COLORREF ForeColor, // Foreground color COLORREF ForeColor, // Foreground color
BackColor; // Background color BackColor; // Background color
@ -1829,8 +1822,19 @@ WINBOOL INTERNAL_DrawState(
HBRUSH OldBrush = NULL, // Old brush (for MemDC) HBRUSH OldBrush = NULL, // Old brush (for MemDC)
TempBrush = NULL; // Temporary brush (for MemDC) TempBrush = NULL; // Temporary brush (for MemDC)
// AG: Experimental, unfinished, and most likely buggy! I haven't been
// able to test this - my intention was to implement some things needed
// by the button control.
if ((! lpOutputFunc) && (fuFlags & DST_COMPLEX))
return FALSE;
type = fuFlags & 0xf; // DST_xxx
state = fuFlags & 0x7ff0; // DSS_xxx
len = wData; // Data length
DbgPrint("Entered DrawState, fuFlags %d, type %d, state %d\n", fuFlags, type, state); DbgPrint("Entered DrawState, fuFlags %d, type %d, state %d\n", fuFlags, type, state);
if ((type == DST_TEXT || type == DST_PREFIXTEXT) && ! len) if ((type == DST_TEXT || type == DST_PREFIXTEXT) && ! len)
{ {
// The string is NULL-terminated // The string is NULL-terminated
@ -1852,14 +1856,15 @@ WINBOOL INTERNAL_DrawState(
case DST_TEXT : case DST_TEXT :
case DST_PREFIXTEXT : case DST_PREFIXTEXT :
{ {
DbgPrint("DST_TEXT / DST_PREFIXTEXT\n");
BOOL success; BOOL success;
DbgPrint("DST_TEXT / DST_PREFIXTEXT\n");
if (unicode) if (unicode)
success = GetTextExtentPoint32W(hdc, (LPWSTR) lData, len, &s); success = GetTextExtentPoint32W(hdc, (LPWSTR) lData, len, &s);
else else
success = GetTextExtentPoint32A(hdc, (LPSTR) lData, len, &s); success = GetTextExtentPoint32A(hdc, (LPSTR) lData, len, &s);
if (!success) return FALSE; if (!success) return FALSE;
break; break;
} }
@ -1911,7 +1916,7 @@ WINBOOL INTERNAL_DrawState(
// Set the rectangle to that of the memory DC // Set the rectangle to that of the memory DC
SetRect(&rect, 0, 0, cx, cy); SetRect(&rect, 0, 0, cx, cy);
// Set colors // Set colors
ForeColor = SetTextColor(hdc, RGB(0, 0, 0)); ForeColor = SetTextColor(hdc, RGB(0, 0, 0));
BackColor = SetBkColor(hdc, RGB(255, 255, 255)); BackColor = SetBkColor(hdc, RGB(255, 255, 255));
@ -1923,25 +1928,29 @@ WINBOOL INTERNAL_DrawState(
if (! MemBMP) goto cleanup; if (! MemBMP) goto cleanup;
OldBMP = (HBITMAP) SelectObject(MemDC, MemBMP); OldBMP = (HBITMAP) SelectObject(MemDC, MemBMP);
if (! OldBMP) goto cleanup; if (! OldBMP) goto cleanup;
DbgPrint("Created and inited MemDC\n"); DbgPrint("Created and inited MemDC\n");
// Set up the default colors and font // Set up the default colors and font
if (! FillRect(MemDC, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; if (! FillRect(MemDC, &rect, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup;
SetBkColor(MemDC, RGB(255, 255, 255)); SetBkColor(MemDC, RGB(255, 255, 255));
SetTextColor(MemDC, RGB(0, 0, 0)); SetTextColor(MemDC, RGB(0, 0, 0));
Font = (HFONT)SelectObject(MemDC, GetCurrentObject(hdc, OBJ_FONT)); Font = (HFONT)SelectObject(MemDC, GetCurrentObject(hdc, OBJ_FONT));
DbgPrint("Selected font and set colors\n"); DbgPrint("Selected font and set colors\n");
// Enable this line to use the current DC image to begin with (wrong?) // Enable this line to use the current DC image to begin with (wrong?)
// if (! BitBlt(MemDC, 0, 0, cx, cy, hdc, x, y, SRCCOPY)) goto cleanup; // if (! BitBlt(MemDC, 0, 0, cx, cy, hdc, x, y, SRCCOPY)) goto cleanup;
// DST_COMPLEX may draw text as well, so make sure font is selected // DST_COMPLEX may draw text as well, so make sure font is selected
if (! Font && (type <= DST_PREFIXTEXT)) goto cleanup; // THIS FAILS if (! Font && (type <= DST_PREFIXTEXT)) // THIS FAILS
BOOL TempResult = INTERNAL_DrawStateDraw(MemDC, type, lpOutputFunc, lData, wData, &rect, dtflags, unicode); goto cleanup;
if (Font) SelectObject(MemDC, Font);
if (! TempResult) goto cleanup; {
BOOL TempResult = INTERNAL_DrawStateDraw(MemDC, type, lpOutputFunc, lData, wData, &rect, dtflags, unicode);
if (Font) SelectObject(MemDC, Font);
if (! TempResult) goto cleanup;
}
DbgPrint("Done drawing\n"); DbgPrint("Done drawing\n");