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

controls/combo.c

@@ -582,7 +582,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG
                                            lphc->droppedRect.right - lphc->droppedRect.left,
                                            lphc->droppedRect.bottom - lphc->droppedRect.top,
                                            hwnd, (HMENU)ID_CB_LISTBOX,
-                                           GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
+                                           (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
       else
           lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle,
                                            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.bottom - lphc->droppedRect.top,
                                            hwnd, (HMENU)ID_CB_LISTBOX,
-                                           GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
+                                           (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc );
 
       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.bottom - lphc->textRect.top,
                                                    hwnd, (HMENU)ID_CB_EDIT,
-                                                   GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
+                                                   (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
               else
                   lphc->hWndEdit = CreateWindowExA(0, "Edit", NULL, lbeStyle,
                                                    lphc->textRect.left, lphc->textRect.top,
                                                    lphc->textRect.right - lphc->textRect.left,
                                                    lphc->textRect.bottom - lphc->textRect.top,
                                                    hwnd, (HMENU)ID_CB_EDIT,
-                                                   GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
+                                                   (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL );
 
 	      if( !lphc->hWndEdit )
 		bEdit = FALSE;
@@ -927,7 +927,8 @@ static HBRUSH COMBO_PrepareColors(
    */
   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
@@ -940,11 +941,13 @@ static HBRUSH COMBO_PrepareColors(
   {
     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
     {
-      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:
 	        if (lParam & PRF_ERASEBKGND)
-		  COMBO_EraseBackground(hwnd, lphc, wParam);
+		  COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
 
 		/* Fallthrough */
      	case WM_PAINT:
 		/* wParam may contain a valid HDC! */
-		return  COMBO_Paint(lphc, wParam);
+		return  COMBO_Paint(lphc, (HDC)wParam);
 	case WM_ERASEBKGND:
-		return  COMBO_EraseBackground(hwnd, lphc, wParam);
+		return  COMBO_EraseBackground(hwnd, lphc, (HDC)wParam);
 	case WM_GETDLGCODE:
 	{
 		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 );
 		return  TRUE;
 	case WM_SETFONT:
-		COMBO_Font( lphc, (HFONT16)wParam, (BOOL)lParam );
+		COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );
 		return  TRUE;
 	case WM_GETFONT:
 		return  (LRESULT)lphc->hFont;

controls/desktop.c

@@ -51,7 +51,7 @@ const struct builtin_class_descr DESKTOP_builtin_class =
     DesktopWndProc,       /* procW */
     0,                    /* extra */
     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))))
         {
             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 */
             SetBkColor( hdc, RGB(0,0,0) );
             SetTextColor( hdc, GetSysColor(COLOR_BACKGROUND) );
@@ -267,4 +267,3 @@ BOOL DESKTOP_SetPattern( LPCSTR pattern )
     else hbrushPattern = 0;
     return TRUE;
 }
-

controls/edit.c

@@ -1506,7 +1506,7 @@ static LPWSTR EDIT_GetPasswordPointer_SL(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) {
 	    CHAR *textA = NULL;
 	    UINT countA = 0;
@@ -2181,7 +2181,7 @@ static void EDIT_SetRectNP(EDITSTATE *es, LPRECT rc)
  */
 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 */
 	if(!IsWindow(es->hwndSelf))
@@ -2491,7 +2491,7 @@ static HLOCAL EDIT_EM_GetHandle(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;
 	UINT countA, alloc_size;
 
@@ -3121,7 +3121,7 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es)
  */
 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))
 		return;
@@ -3201,7 +3201,7 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL 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;
 	HLOCAL hloc32W_new;
 	WCHAR *textW;
@@ -3748,7 +3748,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name)
  */
 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;
 
 	if (es->hloc32W) {

controls/static.c

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

controls/uitools.c

@@ -576,20 +576,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.@)
  */
 BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags )
@@ -1383,22 +1369,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.@)
  */
 BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,

dlls/user/user16.c

@@ -92,6 +92,25 @@ HBITMAP16 WINAPI LoadBitmap16(HINSTANCE16 hInstance, LPCSTR 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)
  */
@@ -247,3 +266,31 @@ BOOL16 WINAPI DestroyCursor16(HCURSOR16 hCursor)
 {
   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;
+}

include/win.h

@@ -60,7 +60,7 @@ typedef struct tagWND
     UINT           wIDmenu;       /* ID or hmenu (from CreateWindow) */
     DWORD          helpContext;   /* Help context ID */
     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            irefCount;     /* window's reference count*/
     DWORD          userdata;      /* User private data */

windows/defwnd.c

@@ -488,7 +488,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 	{
 	    RECT rect;
             HDC hdc = (HDC)wParam;
-            HBRUSH hbr = GetClassLongW( hwnd, GCL_HBRBACKGROUND );
+            HBRUSH hbr = (HBRUSH)GetClassLongW( hwnd, GCL_HBRBACKGROUND );
             if (!hbr) return 0;
 
             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;
 
             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;
             for(len=1; len<64; len++)
                 if((hIcon = LoadIconW(instance, MAKEINTRESOURCEW(len))))

windows/message.c

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

windows/nonclient.c

@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"
+#include "wownt32.h"
 #include "win.h"
 #include "user.h"
 #include "dce.h"
@@ -30,9 +31,9 @@
 #include "cursoricon.h"
 #include "winpos.h"
 #include "nonclient.h"
-#include "wine/debug.h"
 #include "shellapi.h"
 #include "bitmap.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(nonclient);
 WINE_DECLARE_DEBUG_CHANNEL(shell);
@@ -873,7 +874,7 @@ void NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down )
 /***********************************************************************
  *           NC_DrawMaxButton
  */
-static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
+static void NC_DrawMaxButton( HWND hwnd, HDC hdc, BOOL down )
 {
     RECT rect;
     UINT flags = IsZoomed(hwnd) ? DFCS_CAPTIONRESTORE : DFCS_CAPTIONMAX;
@@ -891,7 +892,7 @@ static void NC_DrawMaxButton( HWND hwnd, HDC16 hdc, BOOL down )
 /***********************************************************************
  *           NC_DrawMinButton
  */
-static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down )
+static void NC_DrawMinButton( HWND hwnd, HDC hdc, BOOL down )
 {
     RECT rect;
     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.
  *   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;
     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.
  *   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;
     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 );
 
-    if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
-			      ((clip > 1) ? (DCX_INTERSECTRGN | DCX_KEEPCLIPRGN): 0) ))) return;
+    if (!(hdc = GetDCEx( hwnd, (clip > (HRGN)1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
+			      ((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.right-rectWindow.left,
 		        rectClient.bottom-rectWindow.top )
@@ -1541,11 +1542,11 @@ static void  NC_DoNCPaint95(
        Now, how is the "system" supposed to tell what happened?
      */
 
-    if (!(hdc = GetDCEx( hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
-			      ((clip > 1) ?(DCX_INTERSECTRGN | DCX_KEEPCLIPRGN) : 0) ))) return;
+    if (!(hdc = GetDCEx( hwnd, (clip > (HRGN)1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
+			      ((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.right-rectWindow.left,
 		        rectClient.bottom-rectWindow.top )
@@ -1559,7 +1560,7 @@ static void  NC_DoNCPaint95(
     rect.right  = rectWindow.right - rectWindow.left;
     rect.bottom = rectWindow.bottom - rectWindow.top;
 
-    if( clip > 1 )
+    if( clip > (HRGN)1 )
 	GetRgnBox( clip, &rectClip );
     else
     {
@@ -1782,7 +1783,7 @@ static void NC_TrackMinMaxBox95( HWND hwnd, WORD wParam )
     DWORD wndStyle = GetWindowLongA( hwnd, GWL_STYLE);
     HMENU hSysMenu = GetSystemMenu(hwnd, FALSE);
 
-    void  (*paintButton)(HWND, HDC16, BOOL, BOOL);
+    void  (*paintButton)(HWND, HDC, BOOL, BOOL);
 
     if (wParam == HTMINBUTTON)
     {
@@ -1857,7 +1858,7 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam )
     MSG msg;
     HDC hdc = GetWindowDC( hwnd );
     BOOL pressed = TRUE;
-    void  (*paintButton)(HWND, HDC16, BOOL);
+    void  (*paintButton)(HWND, HDC, BOOL);
 
     SetCapture( hwnd );
 
@@ -2218,7 +2219,7 @@ BOOL NC_DrawGrayButton(HDC hdc, int x, int y)
     SelectObject (hdcMask, hMaskBmp);
 
     /* 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,
 	    hdcMask, 0, 0, 0xB8074A);
 

windows/scroll.c

@@ -73,25 +73,6 @@ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
 }
 
 /*************************************************************************
- *		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.@)
  *
  *   Only the hrgnUpdate is return in device coordinate.

windows/sysparams.c

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

windows/win.c

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