ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more fixes for compiling the user dll with -DSTRICT.

This commit is contained in:
Michael Stefaniuc 2002-10-30 23:45:38 +00:00 committed by Alexandre Julliard
parent eb2a39e460
commit ec5612ee1d
14 changed files with 150 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
controls/combo.c
View File

@ -582,7 +582,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
lphc->droppedRect.right - lphc->droppedRect.left, lphc->droppedRect.right - lphc->droppedRect.left,
lphc->droppedRect.bottom - lphc->droppedRect.top, lphc->droppedRect.bottom - lphc->droppedRect.top,
hwnd, (HMENU)ID_CB_LISTBOX, hwnd, (HMENU)ID_CB_LISTBOX,
GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc ); (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
else else
lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle, lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle,
lphc->droppedRect.left, lphc->droppedRect.left,
@ -590,7 +590,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
lphc->droppedRect.right - lphc->droppedRect.left, lphc->droppedRect.right - lphc->droppedRect.left,
lphc->droppedRect.bottom - lphc->droppedRect.top, lphc->droppedRect.bottom - lphc->droppedRect.top,
hwnd, (HMENU)ID_CB_LISTBOX, hwnd, (HMENU)ID_CB_LISTBOX,
GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc ); (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
if( lphc->hWndLBox ) if( lphc->hWndLBox )
{ {
@ -623,14 +623,14 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
lphc->textRect.right - lphc->textRect.left, lphc->textRect.right - lphc->textRect.left,
lphc->textRect.bottom - lphc->textRect.top, lphc->textRect.bottom - lphc->textRect.top,
hwnd, (HMENU)ID_CB_EDIT, hwnd, (HMENU)ID_CB_EDIT,
GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL ); (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
else else
lphc->hWndEdit = CreateWindowExA(0, "Edit", NULL, lbeStyle, lphc->hWndEdit = CreateWindowExA(0, "Edit", NULL, lbeStyle,
lphc->textRect.left, lphc->textRect.top, lphc->textRect.left, lphc->textRect.top,
lphc->textRect.right - lphc->textRect.left, lphc->textRect.right - lphc->textRect.left,
lphc->textRect.bottom - lphc->textRect.top, lphc->textRect.bottom - lphc->textRect.top,
hwnd, (HMENU)ID_CB_EDIT, hwnd, (HMENU)ID_CB_EDIT,
GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL ); (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
if( !lphc->hWndEdit ) if( !lphc->hWndEdit )
bEdit = FALSE; bEdit = FALSE;
@ -927,7 +927,8 @@ static HBRUSH COMBO_PrepareColors(
*/ */
if (CB_DISABLED(lphc)) if (CB_DISABLED(lphc))
{ {
hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, hDC, (LPARAM)lphc->self ); hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC,
(WPARAM)hDC, (LPARAM)lphc->self );
/* /*
* We have to change the text color since WM_CTLCOLORSTATIC will * We have to change the text color since WM_CTLCOLORSTATIC will
@ -940,11 +941,13 @@ static HBRUSH COMBO_PrepareColors(
{ {
if (lphc->wState & CBF_EDIT) if (lphc->wState & CBF_EDIT)
{ {
hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLOREDIT, hDC, (LPARAM)lphc->self ); hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT,
(WPARAM)hDC, (LPARAM)lphc->self );
} }
else else
{ {
hBkgBrush = SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX, hDC, (LPARAM)lphc->self ); hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORLISTBOX,
(WPARAM)hDC, (LPARAM)lphc->self );
} }
} }
@ -1946,14 +1949,14 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
case WM_PRINTCLIENT: case WM_PRINTCLIENT:
if (lParam & PRF_ERASEBKGND) if (lParam & PRF_ERASEBKGND)
COMBO_EraseBackground(hwnd, lphc, wParam); COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
/* Fallthrough */ /* Fallthrough */
case WM_PAINT: case WM_PAINT:
/* wParam may contain a valid HDC! */ /* wParam may contain a valid HDC! */
return COMBO_Paint(lphc, wParam); return COMBO_Paint(lphc, (HDC)wParam);
case WM_ERASEBKGND: case WM_ERASEBKGND:
return COMBO_EraseBackground(hwnd, lphc, wParam); return COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
case WM_GETDLGCODE: case WM_GETDLGCODE:
{ {
LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
@ -1980,7 +1983,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
!(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc );
return TRUE; return TRUE;
case WM_SETFONT: case WM_SETFONT:
COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam ); COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );
return TRUE; return TRUE;
case WM_GETFONT: case WM_GETFONT:
return (LRESULT)lphc->hFont; return (LRESULT)lphc->hFont;

5
controls/desktop.c
View File

@ -51,7 +51,7 @@ const struct builtin_class_descr DESKTOP_builtin_class =
DesktopWndProc, /* procW */ DesktopWndProc, /* procW */
0, /* extra */ 0, /* extra */
IDC_ARROWA, /* cursor */ IDC_ARROWA, /* cursor */
COLOR_BACKGROUND+1 /* brush */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */
}; };
@ -151,7 +151,7 @@ BOOL WINAPI PaintDesktop(HDC hdc)
(!fTileWallPaper && ((bitmapSize.cx < rect.right) || (bitmapSize.cy < rect.bottom)))) (!fTileWallPaper && ((bitmapSize.cx < rect.right) || (bitmapSize.cy < rect.bottom))))
{ {
HBRUSH brush = hbrushPattern; HBRUSH brush = hbrushPattern;
if (!brush) brush = GetClassLongA( hwnd, GCL_HBRBACKGROUND ); if (!brush) brush = (HBRUSH)GetClassLongA( hwnd, GCL_HBRBACKGROUND );
/* Set colors in case pattern is a monochrome bitmap */ /* Set colors in case pattern is a monochrome bitmap */
SetBkColor( hdc, RGB(0,0,0) ); SetBkColor( hdc, RGB(0,0,0) );
SetTextColor( hdc, GetSysColor(COLOR_BACKGROUND) ); SetTextColor( hdc, GetSysColor(COLOR_BACKGROUND) );
@ -267,4 +267,3 @@ BOOL DESKTOP_SetPattern( LPCSTR pattern )
else hbrushPattern = 0; else hbrushPattern = 0;
return TRUE; return TRUE;
} }

12
controls/edit.c
View File

@ -1506,7 +1506,7 @@ static LPWSTR EDIT_GetPasswordPointer_SL(EDITSTATE *es)
*/ */
static void EDIT_LockBuffer(EDITSTATE *es) static void EDIT_LockBuffer(EDITSTATE *es)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
if (!es->text) { if (!es->text) {
CHAR *textA = NULL; CHAR *textA = NULL;
UINT countA = 0; UINT countA = 0;
@ -2181,7 +2181,7 @@ static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc)
*/ */
static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
/* Edit window might be already destroyed */ /* Edit window might be already destroyed */
if(!IsWindow(es->hwndSelf)) if(!IsWindow(es->hwndSelf))
@ -2491,7 +2491,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es)
*/ */
static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
CHAR *textA; CHAR *textA;
UINT countA, alloc_size; UINT countA, alloc_size;
@ -3121,7 +3121,7 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
*/ */
static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
if (!(es->style & ES_MULTILINE)) if (!(es->style & ES_MULTILINE))
return; return;
@ -3201,7 +3201,7 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc)
*/ */
static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
INT countW, countA; INT countW, countA;
HLOCAL hloc32W_new; HLOCAL hloc32W_new;
WCHAR *textW; WCHAR *textW;
@ -3748,7 +3748,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name)
*/ */
static LRESULT EDIT_WM_Destroy(EDITSTATE *es) static LRESULT EDIT_WM_Destroy(EDITSTATE *es)
{ {
HINSTANCE hInstance = GetWindowLongW( es->hwndSelf, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongW( es->hwndSelf, GWL_HINSTANCE );
LINEDEF *pc, *pp; LINEDEF *pc, *pp;
if (es->hloc32W) { if (es->hloc32W) {

30
controls/static.c
View File

@ -125,7 +125,7 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style )
ERR("huh? hBitmap!=0, but not bitmap\n"); ERR("huh? hBitmap!=0, but not bitmap\n");
return 0; return 0;
} }
hOldBitmap = SetWindowLongA( hwnd, HICON_GWL_OFFSET, hBitmap ); hOldBitmap = (HBITMAP)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hBitmap );
if (hBitmap) if (hBitmap)
{ {
BITMAP bm; BITMAP bm;
@ -143,7 +143,7 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style )
*/ */
static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name ) static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name )
{ {
HINSTANCE hInstance = GetWindowLongA( hwnd, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
HICON hicon = LoadIconA( hInstance, name ); HICON hicon = LoadIconA( hInstance, name );
if (!hicon) hicon = LoadIconA( 0, name ); if (!hicon) hicon = LoadIconA( 0, name );
return hicon; return hicon;
@ -156,7 +156,7 @@ static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name )
*/ */
static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name ) static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name )
{ {
HINSTANCE hInstance = GetWindowLongA( hwnd, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
HICON hicon = LoadIconW( hInstance, name ); HICON hicon = LoadIconW( hInstance, name );
if (!hicon) hicon = LoadIconW( 0, name ); if (!hicon) hicon = LoadIconW( 0, name );
return hicon; return hicon;
@ -169,7 +169,7 @@ static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name )
*/ */
static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name ) static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name )
{ {
HINSTANCE hInstance = GetWindowLongA( hwnd, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
HBITMAP hbitmap = LoadBitmapA( hInstance, name ); HBITMAP hbitmap = LoadBitmapA( hInstance, name );
if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */
hbitmap = LoadBitmapA( 0, name ); hbitmap = LoadBitmapA( 0, name );
@ -183,7 +183,7 @@ static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name )
*/ */
static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name ) static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name )
{ {
HINSTANCE hInstance = GetWindowLongA( hwnd, GWL_HINSTANCE ); HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE );
HBITMAP hbitmap = LoadBitmapW( hInstance, name ); HBITMAP hbitmap = LoadBitmapW( hInstance, name );
if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */
hbitmap = LoadBitmapW( 0, name ); hbitmap = LoadBitmapW( 0, name );
@ -360,7 +360,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
case STM_SETIMAGE: case STM_SETIMAGE:
switch(wParam) { switch(wParam) {
case IMAGE_BITMAP: case IMAGE_BITMAP:
lResult = STATIC_SetBitmap( hwnd, (HBITMAP)lParam, style ); lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, style );
break; break;
case IMAGE_ICON: case IMAGE_ICON:
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, style ); lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, style );
@ -418,7 +418,7 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style )
dis.itemData = 0; dis.itemData = 0;
GetClientRect( hwnd, &dis.rcItem ); GetClientRect( hwnd, &dis.rcItem );
SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd );
SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis );
} }
@ -462,15 +462,15 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style )
if (style & SS_NOPREFIX) if (style & SS_NOPREFIX)
wFormat |= DT_NOPREFIX; wFormat |= DT_NOPREFIX;
if ((hFont = GetWindowLongA( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont ); if ((hFont = (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont );
if ((style & SS_NOPREFIX) || ((style & SS_TYPEMASK) != SS_SIMPLE)) if ((style & SS_NOPREFIX) || ((style & SS_TYPEMASK) != SS_SIMPLE))
{ {
hBrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hdc, hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
(LPARAM)hwnd ); (WPARAM)hdc, (LPARAM)hwnd );
if (!hBrush) /* did the app forget to call defwindowproc ? */ if (!hBrush) /* did the app forget to call defwindowproc ? */
hBrush = DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC, hdc, hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC,
(LPARAM)hwnd); (WPARAM)hdc, (LPARAM)hwnd);
FillRect( hdc, &rc, hBrush ); FillRect( hdc, &rc, hBrush );
} }
if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
@ -529,7 +529,8 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style )
HICON hIcon; HICON hIcon;
GetClientRect( hwnd, &rc ); GetClientRect( hwnd, &rc );
hbrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hdc, (LPARAM)hwnd ); hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
(WPARAM)hdc, (LPARAM)hwnd );
FillRect( hdc, &rc, hbrush ); FillRect( hdc, &rc, hbrush );
if ((hIcon = (HICON)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) if ((hIcon = (HICON)GetWindowLongA( hwnd, HICON_GWL_OFFSET )))
DrawIcon( hdc, rc.left, rc.top, hIcon ); DrawIcon( hdc, rc.left, rc.top, hIcon );
@ -543,7 +544,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
HBITMAP hBitmap, oldbitmap; HBITMAP hBitmap, oldbitmap;
GetClientRect( hwnd, &rc ); GetClientRect( hwnd, &rc );
hbrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hdc, (LPARAM)hwnd ); hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
(WPARAM)hdc, (LPARAM)hwnd );
FillRect( hdc, &rc, hbrush ); FillRect( hdc, &rc, hbrush );
if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET )))

30
controls/uitools.c
View File

@ -575,20 +575,6 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
} }
/**********************************************************************
* DrawEdge (USER.659)
*/
BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags )
{
RECT rect32;
BOOL ret;
CONV_RECT16TO32( rc, &rect32 );
ret = DrawEdge( hdc, &rect32, edge, flags );
CONV_RECT32TO16( &rect32, rc );
return ret;
}
/********************************************************************** /**********************************************************************
* DrawEdge (USER32.@) * DrawEdge (USER32.@)
*/ */
@ -1382,22 +1368,6 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
} }
/**********************************************************************
* DrawFrameControl (USER.656)
*/
BOOL16 WINAPI DrawFrameControl16( HDC16 hdc, LPRECT16 rc, UINT16 uType,
UINT16 uState )
{
RECT rect32;
BOOL ret;
CONV_RECT16TO32( rc, &rect32 );
ret = DrawFrameControl( hdc, &rect32, uType, uState );
CONV_RECT32TO16( &rect32, rc );
return ret;
}
/********************************************************************** /**********************************************************************
* DrawFrameControl (USER32.@) * DrawFrameControl (USER32.@)
*/ */

47
dlls/user/user16.c
View File

@ -92,6 +92,25 @@ HBITMAP16 WINAPI LoadBitmap16(HINSTANCE16 hInstance, LPCSTR name)
return HBITMAP_16(LoadBitmapA(HINSTANCE_32(hInstance), name)); return HBITMAP_16(LoadBitmapA(HINSTANCE_32(hInstance), name));
} }
/*************************************************************************
* ScrollDC (USER.221)
*/
BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
const RECT16 *cliprc, HRGN16 hrgnUpdate,
LPRECT16 rcUpdate )
{
RECT rect32, clipRect32, rcUpdate32;
BOOL16 ret;
if (rect) CONV_RECT16TO32( rect, &rect32 );
if (cliprc) CONV_RECT16TO32( cliprc, &clipRect32 );
ret = ScrollDC( HDC_32(hdc), dx, dy, rect ? &rect32 : NULL,
cliprc ? &clipRect32 : NULL, HRGN_32(hrgnUpdate),
&rcUpdate32 );
if (rcUpdate) CONV_RECT32TO16( &rcUpdate32, rcUpdate );
return ret;
}
/*********************************************************************** /***********************************************************************
* GetCursor (USER.247) * GetCursor (USER.247)
*/ */
@ -247,3 +266,31 @@ BOOL16 WINAPI DestroyCursor16(HCURSOR16 hCursor)
{ {
return DestroyIcon32(hCursor, 0); return DestroyIcon32(hCursor, 0);
} }
/**********************************************************************
* DrawFrameControl (USER.656)
*/
BOOL16 WINAPI DrawFrameControl16( HDC16 hdc, LPRECT16 rc, UINT16 uType, UINT16 uState )
{
RECT rect32;
BOOL ret;
CONV_RECT16TO32( rc, &rect32 );
ret = DrawFrameControl( HDC_32(hdc), &rect32, uType, uState );
CONV_RECT32TO16( &rect32, rc );
return ret;
}
/**********************************************************************
* DrawEdge (USER.659)
*/
BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags )
{
RECT rect32;
BOOL ret;
CONV_RECT16TO32( rc, &rect32 );
ret = DrawEdge( HDC_32(hdc), &rect32, edge, flags );
CONV_RECT32TO16( &rect32, rc );
return ret;
}

2
include/win.h
View File

@ -60,7 +60,7 @@ typedef struct tagWND
UINT wIDmenu; /* ID or hmenu (from CreateWindow) */ UINT wIDmenu; /* ID or hmenu (from CreateWindow) */
DWORD helpContext; /* Help context ID */ DWORD helpContext; /* Help context ID */
UINT flags; /* Misc. flags (see below) */ UINT flags; /* Misc. flags (see below) */
HMENU16 hSysMenu; /* window's copy of System Menu */ HMENU hSysMenu; /* window's copy of System Menu */
int cbWndExtra; /* class cbWndExtra at window creation */ int cbWndExtra; /* class cbWndExtra at window creation */
int irefCount; /* window's reference count*/ int irefCount; /* window's reference count*/
DWORD userdata; /* User private data */ DWORD userdata; /* User private data */

4
windows/defwnd.c
View File

@ -488,7 +488,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
{ {
RECT rect; RECT rect;
HDC hdc = (HDC)wParam; HDC hdc = (HDC)wParam;
HBRUSH hbr = GetClassLongW( hwnd, GCL_HBRBACKGROUND ); HBRUSH hbr = (HBRUSH)GetClassLongW( hwnd, GCL_HBRBACKGROUND );
if (!hbr) return 0; if (!hbr) return 0;
if (GetClassLongW( hwnd, GCL_STYLE ) & CS_PARENTDC) if (GetClassLongW( hwnd, GCL_STYLE ) & CS_PARENTDC)
@ -622,7 +622,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
UINT len; UINT len;
HICON hIcon = (HICON)GetClassLongW( hwnd, GCL_HICON ); HICON hIcon = (HICON)GetClassLongW( hwnd, GCL_HICON );
HINSTANCE instance = GetWindowLongW( hwnd, GWL_HINSTANCE ); HINSTANCE instance = (HINSTANCE)GetWindowLongW( hwnd, GWL_HINSTANCE );
if (hIcon) return (LRESULT)hIcon; if (hIcon) return (LRESULT)hIcon;
for(len=1; len<64; len++) for(len=1; len<64; len++)
if((hIcon = LoadIconW(instance, MAKEINTRESOURCEW(len)))) if((hIcon = LoadIconW(instance, MAKEINTRESOURCEW(len))))

2
windows/message.c
View File

@ -778,7 +778,7 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, CONST HANDLE *handles,
DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut )
{ {
DWORD start_time, elapsed, ret; DWORD start_time, elapsed, ret;
HANDLE idle_event = -1; HANDLE idle_event = (HANDLE)-1;
SERVER_START_REQ( wait_input_idle ) SERVER_START_REQ( wait_input_idle )
{ {

31
windows/nonclient.c
View File

@ -23,6 +23,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wownt32.h"
#include "win.h" #include "win.h"
#include "user.h" #include "user.h"
#include "dce.h" #include "dce.h"
@ -30,9 +31,9 @@
#include "cursoricon.h" #include "cursoricon.h"
#include "winpos.h" #include "winpos.h"
#include "nonclient.h" #include "nonclient.h"
#include "wine/debug.h"
#include "shellapi.h" #include "shellapi.h"
#include "bitmap.h" #include "bitmap.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(nonclient); WINE_DEFAULT_DEBUG_CHANNEL(nonclient);
WINE_DECLARE_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(shell);
@ -873,7 +874,7 @@ void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down )
/*********************************************************************** /***********************************************************************
* NC_DrawMaxButton * NC_DrawMaxButton
*/ */
static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down ) static void NC_DrawMaxButton( HWND hwnd, HDC hdc, BOOL down )
{ {
RECT rect; RECT rect;
UINT flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; UINT flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX;
@ -891,7 +892,7 @@ static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
/*********************************************************************** /***********************************************************************
* NC_DrawMinButton * NC_DrawMinButton
*/ */
static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down ) static void NC_DrawMinButton( HWND hwnd, HDC hdc, BOOL down )
{ {
RECT rect; RECT rect;
UINT flags = DFCS_CAPTIONMIN; UINT flags = DFCS_CAPTIONMIN;
@ -998,7 +999,7 @@ static void NC_DrawCloseButton95 (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed)
* Draws the maximize button for Win95 style windows. * Draws the maximize button for Win95 style windows.
* If bGrayed is true, then draw a disabled Maximize button * If bGrayed is true, then draw a disabled Maximize button
*/ */
static void NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed) static void NC_DrawMaxButton95(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed)
{ {
RECT rect; RECT rect;
UINT flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX; UINT flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX;
@ -1021,7 +1022,7 @@ static void NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed)
* Draws the minimize button for Win95 style windows. * Draws the minimize button for Win95 style windows.
* If bGrayed is true, then draw a disabled Minimize button * If bGrayed is true, then draw a disabled Minimize button
*/ */
static void NC_DrawMinButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed) static void NC_DrawMinButton95(HWND hwnd,HDC hdc,BOOL down, BOOL bGrayed)
{ {
RECT rect; RECT rect;
UINT flags = DFCS_CAPTIONMIN; UINT flags = DFCS_CAPTIONMIN;
@ -1409,10 +1410,10 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint )
TRACE("%04x %d\n", hwnd, active ); TRACE("%04x %d\n", hwnd, active );
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW | if (!(hdc = GetDCEx( hwnd, (clip > (HRGN)1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
((clip > 1) ? (DCX_INTERSECTRGN | DCX_KEEPCLIPRGN): 0) ))) return; ((clip > (HRGN)1) ? (DCX_INTERSECTRGN | DCX_KEEPCLIPRGN): 0) ))) return;
if (ExcludeVisRect16( hdc, rectClient.left-rectWindow.left, if (ExcludeVisRect16( HDC_16(hdc), rectClient.left-rectWindow.left,
rectClient.top-rectWindow.top, rectClient.top-rectWindow.top,
rectClient.right-rectWindow.left, rectClient.right-rectWindow.left,
rectClient.bottom-rectWindow.top ) rectClient.bottom-rectWindow.top )
@ -1541,11 +1542,11 @@ static void NC_DoNCPaint95(
Now, how is the "system" supposed to tell what happened? Now, how is the "system" supposed to tell what happened?
*/ */
if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW | if (!(hdc = GetDCEx( hwnd, (clip > (HRGN)1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
((clip > 1) ?(DCX_INTERSECTRGN | DCX_KEEPCLIPRGN) : 0) ))) return; ((clip > (HRGN)1) ?(DCX_INTERSECTRGN | DCX_KEEPCLIPRGN) : 0) ))) return;
if (ExcludeVisRect16( hdc, rectClient.left-rectWindow.left, if (ExcludeVisRect16( HDC_16(hdc), rectClient.left-rectWindow.left,
rectClient.top-rectWindow.top, rectClient.top-rectWindow.top,
rectClient.right-rectWindow.left, rectClient.right-rectWindow.left,
rectClient.bottom-rectWindow.top ) rectClient.bottom-rectWindow.top )
@ -1559,7 +1560,7 @@ static void NC_DoNCPaint95(
rect.right = rectWindow.right - rectWindow.left; rect.right = rectWindow.right - rectWindow.left;
rect.bottom = rectWindow.bottom - rectWindow.top; rect.bottom = rectWindow.bottom - rectWindow.top;
if( clip > 1 ) if( clip > (HRGN)1 )
GetRgnBox( clip, &rectClip ); GetRgnBox( clip, &rectClip );
else else
{ {
@ -1782,7 +1783,7 @@ static void NC_TrackMinMaxBox95( HWND hwnd, WORD wParam )
DWORD wndStyle = GetWindowLongA( hwnd, GWL_STYLE); DWORD wndStyle = GetWindowLongA( hwnd, GWL_STYLE);
HMENU hSysMenu = GetSystemMenu(hwnd, FALSE); HMENU hSysMenu = GetSystemMenu(hwnd, FALSE);
void (*paintButton)(HWND, HDC16, BOOL, BOOL); void (*paintButton)(HWND, HDC, BOOL, BOOL);
if (wParam == HTMINBUTTON) if (wParam == HTMINBUTTON)
{ {
@ -1857,7 +1858,7 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam )
MSG msg; MSG msg;
HDC hdc = GetWindowDC( hwnd ); HDC hdc = GetWindowDC( hwnd );
BOOL pressed = TRUE; BOOL pressed = TRUE;
void (*paintButton)(HWND, HDC16, BOOL); void (*paintButton)(HWND, HDC, BOOL);
SetCapture( hwnd ); SetCapture( hwnd );
@ -2218,7 +2219,7 @@ BOOL NC_DrawGrayButton(HDC hdc, int x, int y)
SelectObject (hdcMask, hMaskBmp); SelectObject (hdcMask, hMaskBmp);
/* Draw the grayed bitmap using the mask */ /* Draw the grayed bitmap using the mask */
hOldBrush = SelectObject (hdc, RGB(128, 128, 128)); hOldBrush = SelectObject (hdc, (HGDIOBJ)RGB(128, 128, 128));
BitBlt (hdc, x, y, 12, 10, BitBlt (hdc, x, y, 12, 10,
hdcMask, 0, 0, 0xB8074A); hdcMask, 0, 0, 0xB8074A);

83
windows/painting.c
View File

@ -74,7 +74,7 @@ struct draw_state_info
static BOOL CALLBACK draw_state_callback( HDC hdc, LPARAM lparam, WPARAM wparam, int cx, int cy ) static BOOL CALLBACK draw_state_callback( HDC hdc, LPARAM lparam, WPARAM wparam, int cx, int cy )
{ {
const struct draw_state_info *info = (struct draw_state_info *)lparam; const struct draw_state_info *info = (struct draw_state_info *)lparam;
return PAINTING_CallTo16_word_wlwww( info->proc, hdc, info->param, wparam, cx, cy ); return PAINTING_CallTo16_word_wlwww( info->proc, HDC_16(hdc), info->param, wparam, cx, cy );
} }
@ -212,7 +212,7 @@ static HRGN WIN_UpdateNCRgn(WND* wnd, HRGN hRgn, UINT uncFlags )
if(wnd->hwndSelf == GetDesktopWindow()) if(wnd->hwndSelf == GetDesktopWindow())
{ {
wnd->flags &= ~WIN_NEEDS_NCPAINT; wnd->flags &= ~WIN_NEEDS_NCPAINT;
if( wnd->hrgnUpdate > 1 ) if( wnd->hrgnUpdate > (HRGN)1 )
{ {
if (!hRgn) hRgn = CreateRectRgn( 0, 0, 0, 0 ); if (!hRgn) hRgn = CreateRectRgn( 0, 0, 0, 0 );
CombineRgn( hRgn, wnd->hrgnUpdate, 0, RGN_COPY ); CombineRgn( hRgn, wnd->hrgnUpdate, 0, RGN_COPY );
@ -245,7 +245,7 @@ static HRGN WIN_UpdateNCRgn(WND* wnd, HRGN hRgn, UINT uncFlags )
TRACE_(nonclient)( "\tclient box (%i,%i-%i,%i), hrgnUpdate %04x\n", TRACE_(nonclient)( "\tclient box (%i,%i-%i,%i), hrgnUpdate %04x\n",
r.left, r.top, r.right, r.bottom, wnd->hrgnUpdate ); r.left, r.top, r.right, r.bottom, wnd->hrgnUpdate );
if( wnd->hrgnUpdate > 1 ) if( wnd->hrgnUpdate > (HRGN)1 )
{ {
/* Check if update rgn overlaps with nonclient area */ /* Check if update rgn overlaps with nonclient area */
@ -282,16 +282,16 @@ static HRGN WIN_UpdateNCRgn(WND* wnd, HRGN hRgn, UINT uncFlags )
if(!hClip && wnd->hrgnUpdate ) goto copyrgn; if(!hClip && wnd->hrgnUpdate ) goto copyrgn;
} }
else else
if( wnd->hrgnUpdate == 1 )/* entire window */ if( wnd->hrgnUpdate == (HRGN)1 )/* entire window */
{ {
if( uncFlags & UNC_UPDATE ) wnd->hrgnUpdate = CreateRectRgnIndirect( &r ); if( uncFlags & UNC_UPDATE ) wnd->hrgnUpdate = CreateRectRgnIndirect( &r );
if( uncFlags & UNC_REGION ) hrgnRet = 1; if( uncFlags & UNC_REGION ) hrgnRet = (HRGN)1;
uncFlags |= UNC_ENTIRE; uncFlags |= UNC_ENTIRE;
} }
} }
else /* no WM_NCPAINT unless forced */ else /* no WM_NCPAINT unless forced */
{ {
if( wnd->hrgnUpdate > 1 ) if( wnd->hrgnUpdate > (HRGN)1 )
{ {
copyrgn: copyrgn:
if( uncFlags & UNC_REGION ) if( uncFlags & UNC_REGION )
@ -302,29 +302,29 @@ copyrgn:
} }
} }
else else
if( wnd->hrgnUpdate == 1 && (uncFlags & UNC_UPDATE) ) if( wnd->hrgnUpdate == (HRGN)1 && (uncFlags & UNC_UPDATE) )
{ {
GETCLIENTRECTW( wnd, r ); GETCLIENTRECTW( wnd, r );
wnd->hrgnUpdate = CreateRectRgnIndirect( &r ); wnd->hrgnUpdate = CreateRectRgnIndirect( &r );
if( uncFlags & UNC_REGION ) hrgnRet = 1; if( uncFlags & UNC_REGION ) hrgnRet = (HRGN)1;
} }
} }
if(!hClip && (uncFlags & UNC_ENTIRE) ) if(!hClip && (uncFlags & UNC_ENTIRE) )
{ {
/* still don't do anything if there is no nonclient area */ /* still don't do anything if there is no nonclient area */
hClip = (memcmp( &wnd->rectWindow, &wnd->rectClient, sizeof(RECT) ) != 0); hClip = (HRGN)(memcmp( &wnd->rectWindow, &wnd->rectClient, sizeof(RECT) ) != 0);
} }
if( hClip ) /* NOTE: WM_NCPAINT allows wParam to be 1 */ if( hClip ) /* NOTE: WM_NCPAINT allows wParam to be 1 */
{ {
if ( hClip == hrgnRet && hrgnRet > 1 ) { if ( hClip == hrgnRet && hrgnRet > (HRGN)1 ) {
hClip = CreateRectRgn( 0, 0, 0, 0 ); hClip = CreateRectRgn( 0, 0, 0, 0 );
CombineRgn( hClip, hrgnRet, 0, RGN_COPY ); CombineRgn( hClip, hrgnRet, 0, RGN_COPY );
} }
SendMessageA( wnd->hwndSelf, WM_NCPAINT, hClip, 0L ); SendMessageA( wnd->hwndSelf, WM_NCPAINT, (WPARAM)hClip, 0L );
if( (hClip > 1) && (hClip != hRgn) && (hClip != hrgnRet) ) if( (hClip > (HRGN)1) && (hClip != hRgn) && (hClip != hrgnRet) )
DeleteObject( hClip ); DeleteObject( hClip );
/* /*
* Since all Window locks are suspended while processing the WM_NCPAINT * Since all Window locks are suspended while processing the WM_NCPAINT
@ -354,7 +354,7 @@ static void RDW_ValidateParent(WND *wndChild)
HWND parent; HWND parent;
HRGN hrg; HRGN hrg;
if (wndChild->hrgnUpdate == 1 ) { if (wndChild->hrgnUpdate == (HRGN)1 ) {
RECT r; RECT r;
r.left = 0; r.left = 0;
r.top = 0; r.top = 0;
@ -374,7 +374,7 @@ static void RDW_ValidateParent(WND *wndChild)
{ {
POINT ptOffset; POINT ptOffset;
RECT rect, rectParent; RECT rect, rectParent;
if( wndParent->hrgnUpdate == 1 ) if( wndParent->hrgnUpdate == (HRGN)1 )
{ {
RECT r; RECT r;
@ -431,7 +431,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
if( flags & RDW_INVALIDATE ) if( flags & RDW_INVALIDATE )
{ {
if( hRgn > 1 ) if( hRgn > (HRGN)1 )
{ {
switch ((UINT)wndPtr->hrgnUpdate) switch ((UINT)wndPtr->hrgnUpdate)
{ {
@ -457,11 +457,11 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
break; break;
} }
} }
else if( hRgn == 1 ) else if( hRgn == (HRGN)1 )
{ {
if( wndPtr->hrgnUpdate > 1 ) if( wndPtr->hrgnUpdate > (HRGN)1 )
DeleteObject( wndPtr->hrgnUpdate ); DeleteObject( wndPtr->hrgnUpdate );
wndPtr->hrgnUpdate = 1; wndPtr->hrgnUpdate = (HRGN)1;
} }
else else
hRgn = wndPtr->hrgnUpdate; /* this is a trick that depends on code in PAINT_RedrawWindow() */ hRgn = wndPtr->hrgnUpdate; /* this is a trick that depends on code in PAINT_RedrawWindow() */
@ -477,9 +477,9 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
{ {
if( wndPtr->hrgnUpdate ) if( wndPtr->hrgnUpdate )
{ {
if( hRgn > 1 ) if( hRgn > (HRGN)1 )
{ {
if( wndPtr->hrgnUpdate == 1 ) if( wndPtr->hrgnUpdate == (HRGN)1 )
wndPtr->hrgnUpdate = CreateRectRgnIndirect( &r ); wndPtr->hrgnUpdate = CreateRectRgnIndirect( &r );
if( CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate, hRgn, RGN_DIFF ) if( CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate, hRgn, RGN_DIFF )
@ -491,7 +491,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
} }
else /* validate everything */ else /* validate everything */
{ {
if( wndPtr->hrgnUpdate > 1 ) DeleteObject( wndPtr->hrgnUpdate ); if( wndPtr->hrgnUpdate > (HRGN)1 ) DeleteObject( wndPtr->hrgnUpdate );
wndPtr->hrgnUpdate = 0; wndPtr->hrgnUpdate = 0;
} }
@ -517,7 +517,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
if( flags & (RDW_INVALIDATE | RDW_VALIDATE) ) if( flags & (RDW_INVALIDATE | RDW_VALIDATE) )
{ {
HWND *list; HWND *list;
if( hRgn > 1 && bChildren && (list = WIN_ListChildren( wndPtr->hwndSelf ))) if( hRgn > (HRGN)1 && bChildren && (list = WIN_ListChildren( wndPtr->hwndSelf )))
{ {
POINT ptTotal, prevOrigin = {0,0}; POINT ptTotal, prevOrigin = {0,0};
POINT ptClient; POINT ptClient;
@ -656,7 +656,7 @@ static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
if( hrgnRet ) if( hrgnRet )
{ {
if( hrgnRet > 1 ) hrgn = hrgnRet; else hrgnRet = 0; /* entire client */ if( hrgnRet > (HRGN)1 ) hrgn = hrgnRet; else hrgnRet = 0; /* entire client */
if( wndPtr->flags & WIN_NEEDS_ERASEBKGND ) if( wndPtr->flags & WIN_NEEDS_ERASEBKGND )
{ {
if( bIcon ) dcx |= DCX_WINDOW; if( bIcon ) dcx |= DCX_WINDOW;
@ -792,8 +792,8 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
{ {
if( flags & RDW_FRAME ) if( flags & RDW_FRAME )
{ {
if (wndPtr->hrgnUpdate) hRgn = 1; if (wndPtr->hrgnUpdate) hRgn = (HRGN)1;
else wndPtr->hrgnUpdate = 1; else wndPtr->hrgnUpdate = (HRGN)1;
} }
else else
{ {
@ -824,7 +824,7 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
else /* entire window or client depending on RDW_NOFRAME */ else /* entire window or client depending on RDW_NOFRAME */
{ {
if( flags & RDW_NOFRAME ) if( flags & RDW_NOFRAME )
hRgn = 1; hRgn = (HRGN)1;
else else
{ {
GETCLIENTRECTW( wndPtr, r2 ); GETCLIENTRECTW( wndPtr, r2 );
@ -839,10 +839,10 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate,
/* Erase/update windows, from now on hRgn is a scratch region */ /* Erase/update windows, from now on hRgn is a scratch region */
hRgn = RDW_Paint( wndPtr, (hRgn == 1) ? 0 : hRgn, flags, 0 ); hRgn = RDW_Paint( wndPtr, (hRgn == (HRGN)1) ? 0 : hRgn, flags, 0 );
END: END:
if( hRgn > 1 && (hRgn != hrgnUpdate) ) if( hRgn > (HRGN)1 && (hRgn != hrgnUpdate) )
DeleteObject(hRgn ); DeleteObject(hRgn );
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
return TRUE; return TRUE;
@ -905,7 +905,7 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
if (rect) if (rect)
{ {
if (wndPtr->hrgnUpdate > 1) if (wndPtr->hrgnUpdate > (HRGN)1)
{ {
HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 ); HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 );
if (GetUpdateRgn( hwnd, hrgn, erase ) == ERROR) if (GetUpdateRgn( hwnd, hrgn, erase ) == ERROR)
@ -924,7 +924,7 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
} }
} }
else else
if( wndPtr->hrgnUpdate == 1 ) if( wndPtr->hrgnUpdate == (HRGN)1 )
{ {
GetClientRect( hwnd, rect ); GetClientRect( hwnd, rect );
if (erase) RedrawWindow( hwnd, NULL, 0, RDW_FRAME | RDW_ERASENOW | RDW_NOCHILDREN ); if (erase) RedrawWindow( hwnd, NULL, 0, RDW_FRAME | RDW_ERASENOW | RDW_NOCHILDREN );
@ -932,7 +932,7 @@ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase )
else else
SetRectEmpty( rect ); SetRectEmpty( rect );
} }
retvalue = (wndPtr->hrgnUpdate >= 1); retvalue = (wndPtr->hrgnUpdate >= (HRGN)1);
END: END:
WIN_ReleaseWndPtr(wndPtr); WIN_ReleaseWndPtr(wndPtr);
return retvalue; return retvalue;
@ -955,7 +955,7 @@ INT WINAPI GetUpdateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
goto END; goto END;
} }
else else
if (wndPtr->hrgnUpdate == 1) if (wndPtr->hrgnUpdate == (HRGN)1)
{ {
SetRectRgn( hrgn, 0, 0, wndPtr->rectClient.right - wndPtr->rectClient.left, SetRectRgn( hrgn, 0, 0, wndPtr->rectClient.right - wndPtr->rectClient.left,
wndPtr->rectClient.bottom - wndPtr->rectClient.top ); wndPtr->rectClient.bottom - wndPtr->rectClient.top );
@ -991,7 +991,7 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd )
wndPtr->rectWindow.top - wndPtr->rectClient.top, wndPtr->rectWindow.top - wndPtr->rectClient.top,
wndPtr->rectWindow.right - wndPtr->rectClient.left, wndPtr->rectWindow.right - wndPtr->rectClient.left,
wndPtr->rectWindow.bottom - wndPtr->rectClient.top); wndPtr->rectWindow.bottom - wndPtr->rectClient.top);
if( wndPtr->hrgnUpdate > 1 ) if( wndPtr->hrgnUpdate > (HRGN)1 )
{ {
CombineRgn(hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY); CombineRgn(hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY);
OffsetRgn(hrgn, wndPtr->rectWindow.left - wndPtr->rectClient.left, OffsetRgn(hrgn, wndPtr->rectWindow.left - wndPtr->rectClient.left,
@ -1026,10 +1026,10 @@ INT16 WINAPI FillRect16( HDC16 hdc, const RECT16 *rect, HBRUSH16 hbrush )
* it will be done later in the PatBlt(). * it will be done later in the PatBlt().
*/ */
if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0; if (!(prevBrush = SelectObject( HDC_32(hdc), HBRUSH_32(hbrush) ))) return 0;
PatBlt( hdc, rect->left, rect->top, PatBlt( HDC_32(hdc), rect->left, rect->top,
rect->right - rect->left, rect->bottom - rect->top, PATCOPY ); rect->right - rect->left, rect->bottom - rect->top, PATCOPY );
SelectObject( hdc, prevBrush ); SelectObject( HDC_32(hdc), prevBrush );
return 1; return 1;
} }
@ -1058,7 +1058,7 @@ INT WINAPI FillRect( HDC hdc, const RECT *rect, HBRUSH hbrush )
*/ */
void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect ) void WINAPI InvertRect16( HDC16 hdc, const RECT16 *rect )
{ {
PatBlt( hdc, rect->left, rect->top, PatBlt( HDC_32(hdc), rect->left, rect->top,
rect->right - rect->left, rect->bottom - rect->top, DSTINVERT ); rect->right - rect->left, rect->bottom - rect->top, DSTINVERT );
} }
@ -1106,7 +1106,7 @@ INT16 WINAPI FrameRect16( HDC16 hdc, const RECT16 *rect16, HBRUSH16 hbrush )
{ {
RECT rect; RECT rect;
CONV_RECT16TO32( rect16, &rect ); CONV_RECT16TO32( rect16, &rect );
return FrameRect( hdc, &rect, hbrush ); return FrameRect( HDC_32(hdc), &rect, HBRUSH_32(hbrush) );
} }
@ -1117,7 +1117,7 @@ void WINAPI DrawFocusRect16( HDC16 hdc, const RECT16* rc )
{ {
RECT rect32; RECT rect32;
CONV_RECT16TO32( rc, &rect32 ); CONV_RECT16TO32( rc, &rect32 );
DrawFocusRect( hdc, &rect32 ); DrawFocusRect( HDC_32(hdc), &rect32 );
} }
@ -1425,14 +1425,15 @@ BOOL16 WINAPI DrawState16( HDC16 hdc, HBRUSH16 hbr, DRAWSTATEPROC16 func, LPARAM
if (!cx || !cy) if (!cx || !cy)
{ {
SIZE s; SIZE s;
if (!GetTextExtentPoint32A( hdc, MapSL(ldata), wdata, &s )) return FALSE; if (!GetTextExtentPoint32A( HDC_32(hdc), MapSL(ldata), wdata, &s )) return FALSE;
if (!cx) cx = s.cx; if (!cx) cx = s.cx;
if (!cy) cy = s.cy; if (!cy) cy = s.cy;
} }
} }
info.proc = func; info.proc = func;
info.param = ldata; info.param = ldata;
return DrawStateA( hdc, hbr, draw_state_callback, (LPARAM)&info, wdata, x, y, cx, cy, flags ); return DrawStateA( HDC_32(hdc), HBRUSH_32(hbr), draw_state_callback,
(LPARAM)&info, wdata, x, y, cx, cy, flags );
} }

19
windows/scroll.c
View File

@ -72,25 +72,6 @@ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
SW_INVALIDATE )); SW_INVALIDATE ));
} }
/*************************************************************************
* ScrollDC (USER.221)
*/
BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
const RECT16 *cliprc, HRGN16 hrgnUpdate,
LPRECT16 rcUpdate )
{
RECT rect32, clipRect32, rcUpdate32;
BOOL16 ret;
if (rect) CONV_RECT16TO32( rect, &rect32 );
if (cliprc) CONV_RECT16TO32( cliprc, &clipRect32 );
ret = ScrollDC( hdc, dx, dy, rect ? &rect32 : NULL,
cliprc ? &clipRect32 : NULL, hrgnUpdate, &rcUpdate32 );
if (rcUpdate) CONV_RECT32TO16( &rcUpdate32, rcUpdate );
return ret;
}
/************************************************************************* /*************************************************************************
* ScrollDC (USER32.@) * ScrollDC (USER32.@)
* *

2
windows/sysparams.c
View File

@ -1585,7 +1585,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
WINE_SPI_FIXME(SPI_SETICONS); /* 88 WINVER >= 0x400 */ WINE_SPI_FIXME(SPI_SETICONS); /* 88 WINVER >= 0x400 */
case SPI_GETDEFAULTINPUTLANG: /* 89 WINVER >= 0x400 */ case SPI_GETDEFAULTINPUTLANG: /* 89 WINVER >= 0x400 */
ret = GetKeyboardLayout(0); ret = GetKeyboardLayout(0) ? TRUE : FALSE;
break; break;
WINE_SPI_FIXME(SPI_SETDEFAULTINPUTLANG); /* 90 WINVER >= 0x400 */ WINE_SPI_FIXME(SPI_SETDEFAULTINPUTLANG); /* 90 WINVER >= 0x400 */

5
windows/win.c
View File

@ -1108,8 +1108,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
wndPtr->pVScroll = NULL; wndPtr->pVScroll = NULL;
wndPtr->pHScroll = NULL; wndPtr->pHScroll = NULL;
wndPtr->userdata = 0; wndPtr->userdata = 0;
wndPtr->hSysMenu = (wndPtr->dwStyle & WS_SYSMENU) wndPtr->hSysMenu = (wndPtr->dwStyle & WS_SYSMENU) ? MENU_GetSysMenu( hwnd, 0 ) : 0;
? MENU_GetSysMenu( hwnd, 0 ) : 0;
wndPtr->cbWndExtra = wndExtra; wndPtr->cbWndExtra = wndExtra;
if (wndExtra) memset( wndPtr->wExtra, 0, wndExtra); if (wndExtra) memset( wndPtr->wExtra, 0, wndExtra);
@ -1252,7 +1251,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
cs.lpCreateParams = data; cs.lpCreateParams = data;
cs.hInstance = (HINSTANCE)instance; cs.hInstance = (HINSTANCE)instance;
cs.hMenu = (HMENU)menu; cs.hMenu = HMENU_32(menu);
cs.hwndParent = WIN_Handle32( parent ); cs.hwndParent = WIN_Handle32( parent );
cs.style = style; cs.style = style;
cs.lpszName = windowName; cs.lpszName = windowName;