From f0a9cdbf448ed3b882b0992febc7f6a80bb944ec Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 23 Jan 2004 23:38:26 +0000
Subject: [PATCH] Cleanup: Replace WINBOOL by BOOL

svn path=/trunk/; revision=7855
---
 reactos/lib/user32/controls/scrollbar.c |   2 +-
 reactos/lib/user32/misc/desktop.c       |  26 +++---
 reactos/lib/user32/misc/display.c       |  28 +++---
 reactos/lib/user32/misc/exit.c          |   6 +-
 reactos/lib/user32/misc/object.c        |  14 +--
 reactos/lib/user32/misc/stubs.c         |  64 ++++++-------
 reactos/lib/user32/misc/timer.c         |   7 +-
 reactos/lib/user32/misc/winhelp.c       |   6 +-
 reactos/lib/user32/misc/winsta.c        |  18 ++--
 reactos/lib/user32/windows/caret.c      |  30 +++----
 reactos/lib/user32/windows/class.c      |  32 +++----
 reactos/lib/user32/windows/clipboard.c  |  12 +--
 reactos/lib/user32/windows/cursor.c     |  28 +++---
 reactos/lib/user32/windows/dialog.c     |  40 ++++-----
 reactos/lib/user32/windows/draw.c       |   3 +-
 reactos/lib/user32/windows/hook.c       |  20 ++---
 reactos/lib/user32/windows/icon.c       |  24 ++---
 reactos/lib/user32/windows/input.c      |  46 +++++-----
 reactos/lib/user32/windows/menu.c       |  90 +++++++++----------
 reactos/lib/user32/windows/message.c    |  42 ++++-----
 reactos/lib/user32/windows/messagebox.c |   4 +-
 reactos/lib/user32/windows/nonclient.c  |  12 +--
 reactos/lib/user32/windows/paint.c      |  34 +++----
 reactos/lib/user32/windows/prop.c       |   6 +-
 reactos/lib/user32/windows/rect.c       |  22 ++---
 reactos/lib/user32/windows/text.c       |  35 ++++----
 reactos/lib/user32/windows/window.c     | 114 ++++++++++++------------
 27 files changed, 380 insertions(+), 385 deletions(-)

diff --git a/reactos/lib/user32/controls/scrollbar.c b/reactos/lib/user32/controls/scrollbar.c
index 841db090260..2e06abc573c 100644
--- a/reactos/lib/user32/controls/scrollbar.c
+++ b/reactos/lib/user32/controls/scrollbar.c
@@ -876,7 +876,7 @@ ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnableScrollBar(HWND hWnd, UINT wSBflags, UINT wArrows)
 {
   return NtUserEnableScrollBar(hWnd, wSBflags, wArrows);
diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c
index 12c87ed8231..a51af63df8b 100644
--- a/reactos/lib/user32/misc/desktop.c
+++ b/reactos/lib/user32/misc/desktop.c
@@ -1,4 +1,4 @@
-/* $Id: desktop.c,v 1.27 2003/08/29 09:29:11 gvg Exp $
+/* $Id: desktop.c,v 1.28 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -28,14 +28,14 @@ GetSystemMetrics(int nIndex)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL SetDeskWallpaper(LPCSTR filename)
+BOOL STDCALL SetDeskWallpaper(LPCSTR filename)
 {
 	return SystemParametersInfoA(SPI_SETDESKWALLPAPER,0,(PVOID)filename,1);
 }
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SystemParametersInfoA(UINT uiAction,
 		      UINT uiParam,
 		      PVOID pvParam,
@@ -90,7 +90,7 @@ SystemParametersInfoA(UINT uiAction,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SystemParametersInfoW(UINT uiAction,
 		      UINT uiParam,
 		      PVOID pvParam,
@@ -103,7 +103,7 @@ SystemParametersInfoW(UINT uiAction,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 CloseDesktop(
   HDESK hDesktop)
@@ -184,7 +184,7 @@ CreateDesktopW(LPCWSTR lpszDesktop,
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDesktopsA(
   HWINSTA hwinsta,
@@ -199,7 +199,7 @@ EnumDesktopsA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDesktopsW(
   HWINSTA hwinsta,
@@ -231,7 +231,7 @@ STDCALL
 OpenDesktopA(
   LPSTR lpszDesktop,
   DWORD dwFlags,
-  WINBOOL fInherit,
+  BOOL fInherit,
   ACCESS_MASK dwDesiredAccess)
 {
   ANSI_STRING DesktopNameA;
@@ -265,7 +265,7 @@ STDCALL
 OpenDesktopW(
   LPWSTR lpszDesktop,
   DWORD dwFlags,
-  WINBOOL fInherit,
+  BOOL fInherit,
   ACCESS_MASK dwDesiredAccess)
 {
   UNICODE_STRING DesktopName;
@@ -286,7 +286,7 @@ HDESK
 STDCALL
 OpenInputDesktop(
   DWORD dwFlags,
-  WINBOOL fInherit,
+  BOOL fInherit,
   ACCESS_MASK dwDesiredAccess)
 {
   return NtUserOpenInputDesktop(
@@ -299,7 +299,7 @@ OpenInputDesktop(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PaintDesktop(
   HDC hdc)
@@ -311,7 +311,7 @@ PaintDesktop(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetThreadDesktop(
   HDESK hDesktop)
@@ -323,7 +323,7 @@ SetThreadDesktop(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SwitchDesktop(
   HDESK hDesktop)
diff --git a/reactos/lib/user32/misc/display.c b/reactos/lib/user32/misc/display.c
index 3ec29ea99df..4f1249985c8 100644
--- a/reactos/lib/user32/misc/display.c
+++ b/reactos/lib/user32/misc/display.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: display.c,v 1.7 2003/07/21 01:59:51 royce Exp $
+/* $Id: display.c,v 1.8 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
@@ -38,14 +38,14 @@
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnumDisplayDevicesA(
   LPCSTR lpDevice,
   DWORD iDevNum,
   PDISPLAY_DEVICE lpDisplayDevice,
   DWORD dwFlags)
 {
-  WINBOOL rc;
+  BOOL rc;
   UNICODE_STRING Device;
   if ( !RtlCreateUnicodeStringFromAsciiz ( &Device, (PCSZ)lpDevice ) )
     {
@@ -68,7 +68,7 @@ EnumDisplayDevicesA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplayDevicesW(
   LPCWSTR lpDevice,
@@ -77,7 +77,7 @@ EnumDisplayDevicesW(
   DWORD dwFlags)
 {
   UNICODE_STRING Device;
-  WINBOOL rc;
+  BOOL rc;
 
   RtlInitUnicodeString ( &Device, lpDevice );
 
@@ -96,7 +96,7 @@ EnumDisplayDevicesW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplayMonitors(
   HDC hdc,
@@ -111,7 +111,7 @@ EnumDisplayMonitors(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplaySettingsExA(
   LPCSTR lpszDeviceName,
@@ -119,7 +119,7 @@ EnumDisplaySettingsExA(
   LPDEVMODEA lpDevMode,
   DWORD dwFlags)
 {
-  WINBOOL rc;
+  BOOL rc;
   UNICODE_STRING DeviceName;
   DEVMODEW DevModeW;
 
@@ -142,7 +142,7 @@ EnumDisplaySettingsExA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplaySettingsA(
   LPCSTR lpszDeviceName,
@@ -156,7 +156,7 @@ EnumDisplaySettingsA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplaySettingsExW(
   LPCWSTR lpszDeviceName,
@@ -164,7 +164,7 @@ EnumDisplaySettingsExW(
   LPDEVMODEW lpDevMode,
   DWORD dwFlags)
 {
-  WINBOOL rc;
+  BOOL rc;
   UNICODE_STRING DeviceName;
 
   RtlInitUnicodeString ( &DeviceName, lpszDeviceName );
@@ -180,7 +180,7 @@ EnumDisplaySettingsExW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDisplaySettingsW(
   LPCWSTR lpszDeviceName,
@@ -194,7 +194,7 @@ EnumDisplaySettingsW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetMonitorInfoA(
   HMONITOR hMonitor,
@@ -208,7 +208,7 @@ GetMonitorInfoA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetMonitorInfoW(
   HMONITOR hMonitor,
diff --git a/reactos/lib/user32/misc/exit.c b/reactos/lib/user32/misc/exit.c
index 36c5e28e094..a0f91bc66b5 100644
--- a/reactos/lib/user32/misc/exit.c
+++ b/reactos/lib/user32/misc/exit.c
@@ -1,4 +1,4 @@
-/* $Id: exit.c,v 1.2 2003/07/10 21:04:31 chorns Exp $
+/* $Id: exit.c,v 1.3 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -15,7 +15,7 @@
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ExitWindowsEx(UINT uFlags,
 	      DWORD dwReserved)
 {
@@ -44,7 +44,7 @@ ExitWindowsEx(UINT uFlags,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 RegisterServicesProcess(DWORD ServicesProcessId)
 {
   CSRSS_API_REQUEST Request;
diff --git a/reactos/lib/user32/misc/object.c b/reactos/lib/user32/misc/object.c
index 41f4bc596ee..e83d3286918 100644
--- a/reactos/lib/user32/misc/object.c
+++ b/reactos/lib/user32/misc/object.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: object.c,v 1.5 2003/07/10 21:04:31 chorns Exp $
+/* $Id: object.c,v 1.6 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
@@ -37,7 +37,7 @@
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetUserObjectInformationA(
   HANDLE hObj,
@@ -53,7 +53,7 @@ SetUserObjectInformationA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetUserObjectInformationW(
   HANDLE hObj,
@@ -69,12 +69,12 @@ SetUserObjectInformationW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 UserHandleGrantAccess(
   HANDLE hUserHandle,
   HANDLE hJob,
-  WINBOOL bGrant)
+  BOOL bGrant)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -84,7 +84,7 @@ UserHandleGrantAccess(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetUserObjectInformationA(
   HANDLE hObj,
@@ -101,7 +101,7 @@ GetUserObjectInformationA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetUserObjectInformationW(
   HANDLE hObj,
diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c
index 018e12a9118..0fe06e8cd29 100644
--- a/reactos/lib/user32/misc/stubs.c
+++ b/reactos/lib/user32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.55 2003/12/08 18:21:24 navaraf Exp $
+/* $Id: stubs.c,v 1.56 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -20,7 +20,7 @@ typedef UINT *LPUINT;
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 AnyPopup(VOID)
 {
@@ -31,12 +31,12 @@ AnyPopup(VOID)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 AttachThreadInput(
   DWORD idAttach,
   DWORD idAttachTo,
-  WINBOOL fAttach)
+  BOOL fAttach)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -114,7 +114,7 @@ GetMouseMovePointsEx(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 LockWindowUpdate(
   HWND hWndLock)
@@ -127,7 +127,7 @@ LockWindowUpdate(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 LockWorkStation(VOID)
 {
@@ -186,7 +186,7 @@ STDCALL
 MsgWaitForMultipleObjects(
   DWORD nCount,
   CONST LPHANDLE pHandles,
-  WINBOOL fWaitAll,
+  BOOL fWaitAll,
   DWORD dwMilliseconds,
   DWORD dwWakeMask)
 {
@@ -215,7 +215,7 @@ RealMsgWaitForMultipleObjectsEx(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetSysColors(
   int cElements,
@@ -230,7 +230,7 @@ SetSysColors(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 TrackMouseEvent(
   LPTRACKMOUSEEVENT lpEventTrack)
@@ -243,7 +243,7 @@ TrackMouseEvent(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnregisterDeviceNotification(
   HDEVNOTIFY Handle)
@@ -320,12 +320,12 @@ SetDebugErrorLevel( DWORD dwLevel )
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EndTask(
 	HWND    hWnd,
-	WINBOOL fShutDown,
-	WINBOOL fForce)
+	BOOL fShutDown,
+	BOOL fForce)
 {
     SendMessageW(hWnd, WM_CLOSE, 0, 0);
     
@@ -345,7 +345,7 @@ EndTask(
  */
 VOID
 STDCALL
-SwitchToThisWindow ( HWND hwnd, WINBOOL fUnknown )
+SwitchToThisWindow ( HWND hwnd, BOOL fUnknown )
 {
   UNIMPLEMENTED;
 }
@@ -473,7 +473,7 @@ DragObject(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetUserObjectSecurity(
 		      HANDLE                hObj,
@@ -490,7 +490,7 @@ GetUserObjectSecurity(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetUserObjectSecurity(
 		      HANDLE                hObj,
@@ -564,7 +564,7 @@ GetInputDesktop ( VOID )
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetAccCursorInfo ( PCURSORINFO pci )
 {
@@ -575,7 +575,7 @@ GetAccCursorInfo ( PCURSORINFO pci )
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ClientThreadSetup ( VOID )
 {
@@ -697,7 +697,7 @@ BroadcastSystemMessageExA(
 /*
  * @unimplemented
  */
-WINBOOL 
+BOOL 
 STDCALL
 AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d)
 {
@@ -732,7 +732,7 @@ DisableProcessWindowsGhosting(VOID)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetLayeredWindowAttributes(
     HWND hwnd,
@@ -818,10 +818,10 @@ GetWindowRgnBox(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsGUIThread(
-    WINBOOL bConvert)
+    BOOL bConvert)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -830,7 +830,7 @@ IsGUIThread(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 PrintWindow(
     HWND hwnd,
@@ -844,7 +844,7 @@ PrintWindow(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 RegisterRawInputDevices(
     PCRAWINPUTDEVICE pRawInputDevices,
@@ -869,7 +869,7 @@ WINNLSGetIMEHotkey( HWND hwnd)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 WINNLSEnableIME( HWND hwnd, BOOL enable)
 {
@@ -880,7 +880,7 @@ WINNLSEnableIME( HWND hwnd, BOOL enable)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 WINNLSGetEnableStatus( HWND hwnd)
 {
@@ -891,7 +891,7 @@ WINNLSGetEnableStatus( HWND hwnd)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPSetIMEW( HWND hwnd, LPIMEPROW ime)
 {
@@ -902,7 +902,7 @@ IMPSetIMEW( HWND hwnd, LPIMEPROW ime)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPQueryIMEW( LPIMEPROW ime)
 {
@@ -913,7 +913,7 @@ IMPQueryIMEW( LPIMEPROW ime)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPGetIMEW( HWND hwnd, LPIMEPROW ime)
 {
@@ -924,7 +924,7 @@ IMPGetIMEW( HWND hwnd, LPIMEPROW ime)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPSetIMEA( HWND hwnd, LPIMEPROA ime)
 {
@@ -935,7 +935,7 @@ IMPSetIMEA( HWND hwnd, LPIMEPROA ime)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPQueryIMEA( LPIMEPROA ime)
 {
@@ -946,7 +946,7 @@ IMPQueryIMEA( LPIMEPROA ime)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IMPGetIMEA( HWND hwnd, LPIMEPROA ime)
 {
diff --git a/reactos/lib/user32/misc/timer.c b/reactos/lib/user32/misc/timer.c
index 2ffc1d56c8b..63bee116fb6 100644
--- a/reactos/lib/user32/misc/timer.c
+++ b/reactos/lib/user32/misc/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c,v 1.10 2003/11/18 05:17:22 royce Exp $
+/* $Id: timer.c,v 1.11 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
@@ -29,7 +29,6 @@
 /* INCLUDES ******************************************************************/
 
 #include <windows.h>
-/*#include <kernel32/error.h>*/
 #include <user32.h>
 #include <debug.h>
 
@@ -39,7 +38,7 @@
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 KillSystemTimer(
   HWND hWnd,
@@ -52,7 +51,7 @@ KillSystemTimer(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 KillTimer(
   HWND hWnd,
diff --git a/reactos/lib/user32/misc/winhelp.c b/reactos/lib/user32/misc/winhelp.c
index 17492aafaac..d90f791d863 100644
--- a/reactos/lib/user32/misc/winhelp.c
+++ b/reactos/lib/user32/misc/winhelp.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winhelp.c,v 1.5 2003/08/07 04:03:24 royce Exp $
+/* $Id: winhelp.c,v 1.6 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/winhelp.c
@@ -50,7 +50,7 @@ typedef struct
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD dwData)
 {
@@ -134,7 +134,7 @@ WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD dwData)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD dwData)
 {
diff --git a/reactos/lib/user32/misc/winsta.c b/reactos/lib/user32/misc/winsta.c
index 4d3cd36b115..76be6faf020 100644
--- a/reactos/lib/user32/misc/winsta.c
+++ b/reactos/lib/user32/misc/winsta.c
@@ -1,4 +1,4 @@
-/* $Id: winsta.c,v 1.13 2003/12/13 11:34:53 navaraf Exp $
+/* $Id: winsta.c,v 1.14 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -16,7 +16,7 @@
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CloseWindowStation(HWINSTA hWinSta)
 {
   return(NtUserCloseWindowStation(hWinSta));
@@ -80,7 +80,7 @@ CreateWindowStationW(LPWSTR lpwinsta,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnumWindowStationsA(ENUMWINDOWSTATIONPROCA lpEnumFunc,
 		    LPARAM lParam)
 {
@@ -92,7 +92,7 @@ EnumWindowStationsA(ENUMWINDOWSTATIONPROCA lpEnumFunc,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnumWindowStationsW(ENUMWINDOWSTATIONPROCW lpEnumFunc,
 		    LPARAM lParam)
 {
@@ -147,7 +147,7 @@ GetProcessWindowStation(VOID)
  */
 HWINSTA STDCALL
 OpenWindowStationA(LPSTR lpszWinSta,
-		   WINBOOL fInherit,
+		   BOOL fInherit,
 		   ACCESS_MASK dwDesiredAccess)
 {
   ANSI_STRING WindowStationNameA;
@@ -180,7 +180,7 @@ OpenWindowStationA(LPSTR lpszWinSta,
  */
 HWINSTA STDCALL
 OpenWindowStationW(LPWSTR lpszWinSta,
-		   WINBOOL fInherit,
+		   BOOL fInherit,
 		   ACCESS_MASK dwDesiredAccess)
 {
   UNICODE_STRING WindowStationName;
@@ -194,7 +194,7 @@ OpenWindowStationW(LPWSTR lpszWinSta,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetProcessWindowStation(HWINSTA hWinSta)
 {
   return NtUserSetProcessWindowStation(hWinSta);
@@ -220,7 +220,7 @@ SetWindowStationUser(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 LockWindowStation(HWINSTA hWinSta)
 {
@@ -231,7 +231,7 @@ LockWindowStation(HWINSTA hWinSta)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnlockWindowStation(HWINSTA hWinSta)
 {
diff --git a/reactos/lib/user32/windows/caret.c b/reactos/lib/user32/windows/caret.c
index c0e402e92ef..5337c2f6e0e 100644
--- a/reactos/lib/user32/windows/caret.c
+++ b/reactos/lib/user32/windows/caret.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: caret.c,v 1.5 2003/12/14 12:39:32 navaraf Exp $
+/* $Id: caret.c,v 1.6 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/caret.c
@@ -64,23 +64,23 @@ void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CreateCaret(HWND hWnd,
 	    HBITMAP hBitmap,
 	    int nWidth,
 	    int nHeight)
 {
-  return (WINBOOL)NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight);
+  return (BOOL)NtUserCreateCaret(hWnd, hBitmap, nWidth, nHeight);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DestroyCaret(VOID)
 {
-  return (WINBOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET);
+  return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_DESTROY_CARET);
 }
 
 
@@ -97,51 +97,51 @@ GetCaretBlinkTime(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetCaretPos(LPPOINT lpPoint)
 {
-  return (WINBOOL)NtUserGetCaretPos(lpPoint);
+  return (BOOL)NtUserGetCaretPos(lpPoint);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 HideCaret(HWND hWnd)
 {
-  return (WINBOOL)NtUserHideCaret(hWnd);
+  return (BOOL)NtUserHideCaret(hWnd);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetCaretBlinkTime(UINT uMSeconds)
 {
-  return (WINBOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME);
+  return (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetCaretPos(int X,
 	    int Y)
 {
-  return (WINBOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS);
+  return (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ShowCaret(HWND hWnd)
 {
-  return (WINBOOL)NtUserShowCaret(hWnd);
+  return (BOOL)NtUserShowCaret(hWnd);
 }
 
 /* EOF */
diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c
index 64e8391c80e..e422b4d8cec 100644
--- a/reactos/lib/user32/windows/class.c
+++ b/reactos/lib/user32/windows/class.c
@@ -1,4 +1,4 @@
-/* $Id: class.c,v 1.43 2004/01/19 20:19:50 gvg Exp $
+/* $Id: class.c,v 1.44 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -18,7 +18,7 @@
 
 
 
-static WINBOOL GetClassInfoExCommon(
+static BOOL GetClassInfoExCommon(
     HINSTANCE hInst,
     LPCWSTR lpszClass,
     LPWNDCLASSEXW lpwcx,
@@ -117,7 +117,7 @@ static WINBOOL GetClassInfoExCommon(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetClassInfoExA(
   HINSTANCE hinst,
@@ -131,7 +131,7 @@ GetClassInfoExA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetClassInfoExW(
   HINSTANCE hinst,
@@ -145,12 +145,8 @@ GetClassInfoExW(
 
 /*LPWSTR str;
   UNICODE_STRING str2;
-=======
-  LPWSTR str;
-  UNICODE_STRING str2, str3;
->>>>>>> 1.36
   WNDCLASSEXW w;
-  WINBOOL retval;
+  BOOL retval;
 
   if ( !lpszClass || !lpwcx )
   {
@@ -217,7 +213,7 @@ GetClassInfoExW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetClassInfoA(
   HINSTANCE hInstance,
@@ -225,7 +221,7 @@ GetClassInfoA(
   LPWNDCLASSA lpWndClass)
 {
   WNDCLASSEXA w;
-  WINBOOL retval;
+  BOOL retval;
 
   if ( !lpClassName || !lpWndClass )
   {
@@ -241,7 +237,7 @@ GetClassInfoA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetClassInfoW(
   HINSTANCE hInstance,
@@ -249,7 +245,7 @@ GetClassInfoW(
   LPWNDCLASSW lpWndClass)
 {
   WNDCLASSEXW w;
-  WINBOOL retval;
+  BOOL retval;
 
   if(!lpClassName || !lpWndClass)
   {
@@ -747,7 +743,7 @@ SetWindowLongW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnregisterClassA(
   LPCSTR lpClassName,
@@ -755,7 +751,7 @@ UnregisterClassA(
 {
   LPWSTR ClassName;
   NTSTATUS Status;
-  WINBOOL Result;
+  BOOL Result;
   
   if(!IS_ATOM(lpClassName))
   {
@@ -769,7 +765,7 @@ UnregisterClassA(
   else
     ClassName = (LPWSTR)lpClassName;
   
-  Result = (WINBOOL)NtUserUnregisterClass((LPCWSTR)ClassName, hInstance, 0);
+  Result = (BOOL)NtUserUnregisterClass((LPCWSTR)ClassName, hInstance, 0);
   
   if(ClassName && !IS_ATOM(lpClassName)) 
     HEAP_free(ClassName);
@@ -781,13 +777,13 @@ UnregisterClassA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnregisterClassW(
   LPCWSTR lpClassName,
   HINSTANCE hInstance)
 {
-  return (WINBOOL)NtUserUnregisterClass(lpClassName, hInstance, 0);
+  return (BOOL)NtUserUnregisterClass(lpClassName, hInstance, 0);
 }
 
 /* EOF */
diff --git a/reactos/lib/user32/windows/clipboard.c b/reactos/lib/user32/windows/clipboard.c
index 30abf899ac1..d478100bc36 100644
--- a/reactos/lib/user32/windows/clipboard.c
+++ b/reactos/lib/user32/windows/clipboard.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: clipboard.c,v 1.11 2003/12/28 08:59:24 gvg Exp $
+/* $Id: clipboard.c,v 1.12 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/clipboard.c
@@ -40,7 +40,7 @@
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 OpenClipboard(HWND hWndNewOwner)
 {
    return NtUserOpenClipboard(hWndNewOwner, 0);
@@ -49,7 +49,7 @@ OpenClipboard(HWND hWndNewOwner)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CloseClipboard(VOID)
 {
    return NtUserCloseClipboard();
@@ -67,7 +67,7 @@ CountClipboardFormats(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EmptyClipboard(VOID)
 {
    return NtUserEmptyClipboard();
@@ -185,7 +185,7 @@ GetPriorityClipboardFormat(UINT *paFormatPriorityList, INT cFormats)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsClipboardFormatAvailable(UINT format)
 {
    return NtUserIsClipboardFormatAvailable(format);
@@ -234,7 +234,7 @@ SetClipboardViewer(HWND hWndNewViewer)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext)
 {
    return NtUserChangeClipboardChain(hWndRemove, hWndNewNext);
diff --git a/reactos/lib/user32/windows/cursor.c b/reactos/lib/user32/windows/cursor.c
index ad96ecf3305..13828aeded2 100644
--- a/reactos/lib/user32/windows/cursor.c
+++ b/reactos/lib/user32/windows/cursor.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: cursor.c,v 1.17 2003/12/09 20:58:16 weiden Exp $
+/* $Id: cursor.c,v 1.18 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/cursor.c
@@ -115,17 +115,17 @@ CreateCursor(HINSTANCE hInst,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DestroyCursor(HCURSOR hCursor)
 {
-  return (WINBOOL)NtUserDestroyCursorIcon((HANDLE)hCursor, 0);
+  return (BOOL)NtUserDestroyCursorIcon((HANDLE)hCursor, 0);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetClipCursor(LPRECT lpRect)
 {
   return NtUserGetClipCursor(lpRect);
@@ -150,20 +150,20 @@ GetCursor(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetCursorInfo(PCURSORINFO pci)
 {
-  return (WINBOOL)NtUserGetCursorInfo(pci);
+  return (BOOL)NtUserGetCursorInfo(pci);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetCursorPos(LPPOINT lpPoint)
 {
-  WINBOOL res;
+  BOOL res;
   /* Windows doesn't check if lpPoint == NULL, we do */
   if(!lpPoint)
   {
@@ -171,7 +171,7 @@ GetCursorPos(LPPOINT lpPoint)
     return FALSE;
   }
   
-  res = (WINBOOL)NtUserCallTwoParam((DWORD)lpPoint, (DWORD)FALSE, 
+  res = (BOOL)NtUserCallTwoParam((DWORD)lpPoint, (DWORD)FALSE, 
                                     TWOPARAM_ROUTINE_CURSORPOSITION);
 
   return res;
@@ -232,7 +232,7 @@ LoadCursorW(HINSTANCE hInstance,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 ClipCursor(
   CONST RECT *lpRect)
@@ -254,14 +254,14 @@ SetCursor(HCURSOR hCursor)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetCursorPos(int X,
 	     int Y)
 {
   POINT pos;
   pos.x = (LONG)X;
   pos.y = (LONG)Y;
-  return (WINBOOL)NtUserCallTwoParam((DWORD)&pos, (DWORD)TRUE, 
+  return (BOOL)NtUserCallTwoParam((DWORD)&pos, (DWORD)TRUE, 
                                      TWOPARAM_ROUTINE_CURSORPOSITION);
 }
 
@@ -269,7 +269,7 @@ SetCursorPos(int X,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetSystemCursor(HCURSOR hcur,
 		DWORD id)
 {
@@ -282,7 +282,7 @@ SetSystemCursor(HCURSOR hcur,
  * @unimplemented
  */
 int STDCALL
-ShowCursor(WINBOOL bShow)
+ShowCursor(BOOL bShow)
 {
   UNIMPLEMENTED;
   return 0;
diff --git a/reactos/lib/user32/windows/dialog.c b/reactos/lib/user32/windows/dialog.c
index 80f0a791e88..a418016d48a 100644
--- a/reactos/lib/user32/windows/dialog.c
+++ b/reactos/lib/user32/windows/dialog.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dialog.c,v 1.23 2003/12/30 19:21:55 sedwards Exp $
+/* $Id: dialog.c,v 1.24 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/dialog.c
@@ -1746,7 +1746,7 @@ DlgDirListW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 DlgDirSelectComboBoxExA(
   HWND hDlg,
@@ -1762,7 +1762,7 @@ DlgDirSelectComboBoxExA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 DlgDirSelectComboBoxExW(
   HWND hDlg,
@@ -1778,7 +1778,7 @@ DlgDirSelectComboBoxExW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DlgDirSelectExA(
   HWND hDlg,
@@ -1793,7 +1793,7 @@ DlgDirSelectExA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DlgDirSelectExW(
   HWND hDlg,
@@ -1808,7 +1808,7 @@ DlgDirSelectExW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EndDialog(
   HWND hDlg,
@@ -1907,8 +1907,8 @@ STDCALL
 GetDlgItemInt(
   HWND hDlg,
   int nIDDlgItem,
-  WINBOOL *lpTranslated,
-  WINBOOL bSigned)
+  BOOL *lpTranslated,
+  BOOL bSigned)
 {
 	char str[30];
     char * endptr;
@@ -1977,7 +1977,7 @@ STDCALL
 GetNextDlgGroupItem(
   HWND hDlg,
   HWND hCtl,
-  WINBOOL bPrevious)
+  BOOL bPrevious)
 {
 	HWND hwnd, retvalue;
 
@@ -2039,13 +2039,13 @@ STDCALL
 GetNextDlgTabItem(
   HWND hDlg,
   HWND hCtl,
-  WINBOOL bPrevious)
+  BOOL bPrevious)
 {
 	return DIALOG_GetNextTabItem(hDlg, hDlg, hCtl, bPrevious);
 }
 
 #if 0
-WINBOOL
+BOOL
 STDCALL
 IsDialogMessage(
   HWND hDlg,
@@ -2059,7 +2059,7 @@ IsDialogMessage(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsDialogMessageA(
   HWND hDlg,
@@ -2151,7 +2151,7 @@ IsDialogMessageA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsDialogMessageW(
   HWND hDlg,
@@ -2256,7 +2256,7 @@ IsDlgButtonChecked(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 MapDialogRect(
   HWND hDlg,
@@ -2311,13 +2311,13 @@ SendDlgItemMessageW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetDlgItemInt(
   HWND hDlg,
   int nIDDlgItem,
   UINT uValue,
-  WINBOOL bSigned)
+  BOOL bSigned)
 {
 	char str[20];
 
@@ -2331,7 +2331,7 @@ SetDlgItemInt(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetDlgItemTextA(
   HWND hDlg,
@@ -2345,7 +2345,7 @@ SetDlgItemTextA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetDlgItemTextW(
   HWND hDlg,
@@ -2359,7 +2359,7 @@ SetDlgItemTextW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 CheckDlgButton(
   HWND hDlg,
@@ -2394,7 +2394,7 @@ static BOOL CALLBACK CheckRB(HWND hwnd, LPARAM lParam)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 CheckRadioButton(
   HWND hDlg,
diff --git a/reactos/lib/user32/windows/draw.c b/reactos/lib/user32/windows/draw.c
index 8037dfd0b8d..efe5583535d 100644
--- a/reactos/lib/user32/windows/draw.c
+++ b/reactos/lib/user32/windows/draw.c
@@ -31,6 +31,7 @@
 #ifndef __USE_W32API
 #define __USE_W32API
 #define _WIN32_WINNT 0x0500
+#define WINVER 0x0500
 #endif
 
 #include <windows.h>
@@ -1339,7 +1340,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags)
 }
 
 
-WINBOOL
+BOOL
 STDCALL
 IntGrayString(
   HDC hDC,
diff --git a/reactos/lib/user32/windows/hook.c b/reactos/lib/user32/windows/hook.c
index 43b35cd4e4b..8d474f79fc0 100644
--- a/reactos/lib/user32/windows/hook.c
+++ b/reactos/lib/user32/windows/hook.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hook.c,v 1.13 2003/12/15 19:32:31 gvg Exp $
+/* $Id: hook.c,v 1.14 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -40,7 +40,7 @@
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnhookWindowsHookEx(
   HHOOK Hook)
@@ -48,7 +48,7 @@ UnhookWindowsHookEx(
   return NtUserUnhookWindowsHookEx(Hook);
 }
 #if 0
-WINBOOL
+BOOL
 STDCALL
 CallMsgFilter(
   LPMSG lpMsg,
@@ -63,7 +63,7 @@ CallMsgFilter(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 CallMsgFilterA(
   LPMSG lpMsg,
@@ -77,7 +77,7 @@ CallMsgFilterA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 CallMsgFilterW(
   LPMSG lpMsg,
@@ -154,7 +154,7 @@ SetWindowsHookA(int idHook, HOOKPROC lpfn)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 DeregisterShellHookWindow(HWND hWnd)
 {
@@ -165,7 +165,7 @@ DeregisterShellHookWindow(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 RegisterShellHookWindow(HWND hWnd)
 {
@@ -176,7 +176,7 @@ RegisterShellHookWindow(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc )
 {
@@ -221,7 +221,7 @@ SetWinEventHook(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 UnhookWinEvent ( HWINEVENTHOOK hWinEventHook )
 {
@@ -232,7 +232,7 @@ UnhookWinEvent ( HWINEVENTHOOK hWinEventHook )
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsWinEventHookInstalled(
     DWORD event)
diff --git a/reactos/lib/user32/windows/icon.c b/reactos/lib/user32/windows/icon.c
index a80bcb7f7d5..dde510f5b2d 100644
--- a/reactos/lib/user32/windows/icon.c
+++ b/reactos/lib/user32/windows/icon.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: icon.c,v 1.17 2003/12/31 19:25:51 navaraf Exp $
+/* $Id: icon.c,v 1.18 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/icon.c
@@ -213,7 +213,7 @@ STDCALL
 CreateIconFromResource(
   PBYTE presbits,
   DWORD dwResSize,
-  WINBOOL fIcon,
+  BOOL fIcon,
   DWORD dwVer)
 {
   return CreateIconFromResourceEx(presbits, dwResSize, fIcon, dwVer, 0, 0, 0);
@@ -228,7 +228,7 @@ STDCALL
 CreateIconFromResourceEx(
   PBYTE pbIconBits,
   DWORD cbIconBits,
-  WINBOOL fIcon,
+  BOOL fIcon,
   DWORD dwVersion,
   int cxDesired,
   int cyDesired,
@@ -352,19 +352,19 @@ CreateIconIndirect(PICONINFO IconInfo)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DestroyIcon(
   HICON hIcon)
 {
-  return (WINBOOL)NtUserDestroyCursorIcon((HANDLE)hIcon, 0);
+  return (BOOL)NtUserDestroyCursorIcon((HANDLE)hIcon, 0);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DrawIcon(
   HDC hDC,
@@ -378,7 +378,7 @@ DrawIcon(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DrawIconEx(
   HDC hdc,
@@ -391,7 +391,7 @@ DrawIconEx(
   HBRUSH hbrFlickerFreeDraw,
   UINT diFlags)
 {
-  return (WINBOOL)NtUserDrawIconEx(hdc, xLeft, yTop, hIcon, cxWidth, cyWidth, 
+  return (BOOL)NtUserDrawIconEx(hdc, xLeft, yTop, hIcon, cxWidth, cyWidth, 
                                    istepIfAniCur, hbrFlickerFreeDraw, diFlags, 
                                    0, 0);
 }
@@ -400,14 +400,14 @@ DrawIconEx(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetIconInfo(
   HICON hIcon,
   PICONINFO IconInfo)
 {
   /* FIXME - copy bitmaps */
-  return (WINBOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
+  return (BOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo);
 }
 
 
@@ -444,7 +444,7 @@ int
 STDCALL
 LookupIconIdFromDirectory(
   PBYTE presbits,
-  WINBOOL fIcon)
+  BOOL fIcon)
 {
     return LookupIconIdFromDirectoryEx( presbits, fIcon,
 	   fIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR),
@@ -562,7 +562,7 @@ CURSORICON_FindBestIcon( GRPCURSORICONDIR *dir, int width, int height, int color
 INT STDCALL
 LookupIconIdFromDirectoryEx(
   PBYTE presbits,
-  WINBOOL fIcon,
+  BOOL fIcon,
   int cxDesired,
   int cyDesired,
   UINT Flags)
diff --git a/reactos/lib/user32/windows/input.c b/reactos/lib/user32/windows/input.c
index 362c2c27709..f72a5a23442 100644
--- a/reactos/lib/user32/windows/input.c
+++ b/reactos/lib/user32/windows/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.21 2003/12/02 11:38:47 gvg Exp $
+/* $Id: input.c,v 1.22 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -39,7 +39,7 @@
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DragDetect(
   HWND hWnd,
@@ -64,8 +64,8 @@ ActivateKeyboardLayout(HKL hkl,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
-BlockInput(WINBOOL fBlockIt)
+BOOL STDCALL
+BlockInput(BOOL fBlockIt)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -75,9 +75,9 @@ BlockInput(WINBOOL fBlockIt)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnableWindow(HWND hWnd,
-	     WINBOOL bEnable)
+	     BOOL bEnable)
 {
     LONG Style = NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE);
     Style = bEnable ? Style & ~WS_DISABLED : Style | WS_DISABLED;
@@ -199,7 +199,7 @@ GetKeyboardLayoutList(int nBuff,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetKeyboardLayoutNameA(LPSTR pwszKLID)
 {
   UNIMPLEMENTED;
@@ -210,7 +210,7 @@ GetKeyboardLayoutNameA(LPSTR pwszKLID)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
   UNIMPLEMENTED;
@@ -221,11 +221,11 @@ GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetKeyboardState(PBYTE lpKeyState)
 {
   
-  return (WINBOOL) NtUserGetKeyboardState((LPBYTE) lpKeyState);
+  return (BOOL) NtUserGetKeyboardState((LPBYTE) lpKeyState);
 }
 
 
@@ -243,7 +243,7 @@ GetKeyboardType(int nTypeFlag)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetLastInputInfo(PLASTINPUTINFO plii)
 {
   UNIMPLEMENTED;
@@ -335,13 +335,13 @@ OemKeyScan(WORD wOemChar)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 RegisterHotKey(HWND hWnd,
 	       int id,
 	       UINT fsModifiers,
 	       UINT vk)
 {
-  return (WINBOOL)NtUserRegisterHotKey(hWnd,
+  return (BOOL)NtUserRegisterHotKey(hWnd,
                                        id,
                                        fsModifiers,
                                        vk);
@@ -351,10 +351,10 @@ RegisterHotKey(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetDoubleClickTime(UINT uInterval)
 {
-  return (WINBOOL)NtUserSystemParametersInfo(SPI_SETDOUBLECLICKTIME,
+  return (BOOL)NtUserSystemParametersInfo(SPI_SETDOUBLECLICKTIME,
                                              uInterval,
                                              NULL,
                                              0);
@@ -374,22 +374,22 @@ SetFocus(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetKeyboardState(LPBYTE lpKeyState)
 {
- return (WINBOOL) NtUserSetKeyboardState((LPBYTE)lpKeyState);
+ return (BOOL) NtUserSetKeyboardState((LPBYTE)lpKeyState);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SwapMouseButton(
-  WINBOOL fSwap)
+  BOOL fSwap)
 {
-  return (WINBOOL)NtUserCallOneParam((DWORD)fSwap, 
+  return (BOOL)NtUserCallOneParam((DWORD)fSwap, 
                                      ONEPARAM_ROUTINE_SWAPMOUSEBUTTON);
 }
 
@@ -461,7 +461,7 @@ ToUnicodeEx(UINT wVirtKey,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 UnloadKeyboardLayout(HKL hkl)
 {
   UNIMPLEMENTED;
@@ -472,11 +472,11 @@ UnloadKeyboardLayout(HKL hkl)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 UnregisterHotKey(HWND hWnd,
 		 int id)
 {
-  return (WINBOOL)NtUserUnregisterHotKey(hWnd, id);
+  return (BOOL)NtUserUnregisterHotKey(hWnd, id);
 }
 
 
diff --git a/reactos/lib/user32/windows/menu.c b/reactos/lib/user32/windows/menu.c
index 83f0637caf8..48317dc3887 100644
--- a/reactos/lib/user32/windows/menu.c
+++ b/reactos/lib/user32/windows/menu.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.40 2004/01/02 19:49:47 gvg Exp $
+/* $Id: menu.c,v 1.41 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/menu.c
@@ -485,7 +485,7 @@ MenuIsStringItem(ULONG TypeData)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AppendMenuA(HMENU hMenu,
 	    UINT uFlags,
 	    UINT_PTR uIDNewItem,
@@ -499,7 +499,7 @@ AppendMenuA(HMENU hMenu,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AppendMenuW(HMENU hMenu,
 	    UINT uFlags,
 	    UINT_PTR uIDNewItem,
@@ -525,7 +525,7 @@ CheckMenuItem(HMENU hmenu,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CheckMenuRadioItem(HMENU hmenu,
 		   UINT idFirst,
 		   UINT idLast,
@@ -561,7 +561,7 @@ CreatePopupMenu(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DeleteMenu(HMENU hMenu,
 	   UINT uPosition,
 	   UINT uFlags)
@@ -573,7 +573,7 @@ DeleteMenu(HMENU hMenu,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DestroyMenu(HMENU hMenu)
 {
     return NtUserDestroyMenu(hMenu);
@@ -583,7 +583,7 @@ DestroyMenu(HMENU hMenu)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DrawMenuBar(HWND hWnd)
 {
   UNIMPLEMENTED
@@ -606,7 +606,7 @@ EnableMenuItem(HMENU hMenu,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EndMenu(VOID)
 {
   GUITHREADINFO guii;
@@ -632,7 +632,7 @@ GetMenu(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMenuBarInfo(HWND hwnd,
 	       LONG idObject,
 	       LONG idItem,
@@ -669,7 +669,7 @@ GetMenuDefaultItem(HMENU hMenu,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMenuInfo(HMENU hmenu,
 	    LPMENUINFO lpcmi)
 {
@@ -727,11 +727,11 @@ GetMenuItemID(HMENU hMenu,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMenuItemInfoA(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPMENUITEMINFOA lpmii)
 {
   UNIMPLEMENTED;
@@ -742,12 +742,12 @@ GetMenuItemInfoA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetMenuItemInfoW(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPMENUITEMINFOW lpmii)
 {
   UNIMPLEMENTED;
@@ -758,7 +758,7 @@ GetMenuItemInfoW(
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMenuItemRect(HWND hWnd,
 		HMENU hMenu,
 		UINT uItem,
@@ -863,7 +863,7 @@ GetSubMenu(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 HiliteMenuItem(
   HWND hwnd,
@@ -878,7 +878,7 @@ HiliteMenuItem(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InsertMenuA(
   HMENU hMenu,
@@ -911,24 +911,24 @@ InsertMenuA(
     mii.fMask |= MIIM_ID;
     mii.wID = (UINT)uIDNewItem;
   }
-  return InsertMenuItemA(hMenu, uPosition, (WINBOOL)!(MF_BYPOSITION & uFlags), &mii);
+  return InsertMenuItemA(hMenu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), &mii);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InsertMenuItemA(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPCMENUITEMINFOA lpmii)
 {
   MENUITEMINFOW mi;
   UNICODE_STRING MenuText;
-  WINBOOL res = FALSE;
+  BOOL res = FALSE;
   BOOL CleanHeap = FALSE;
   NTSTATUS Status;
 
@@ -963,17 +963,17 @@ InsertMenuItemA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InsertMenuItemW(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPCMENUITEMINFOW lpmii)
 {
   MENUITEMINFOW mi;
   UNICODE_STRING MenuText;
-  WINBOOL res = FALSE;
+  BOOL res = FALSE;
   BOOL CleanHeap = FALSE;
   HANDLE hHeap = RtlGetProcessHeap();
   mi.hbmpItem = (HBITMAP)0;
@@ -1015,7 +1015,7 @@ InsertMenuItemW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InsertMenuW(
   HMENU hMenu,
@@ -1048,14 +1048,14 @@ InsertMenuW(
     mii.fMask |= MIIM_ID;
     mii.wID = (UINT)uIDNewItem;
   }
-  return InsertMenuItemW(hMenu, uPosition, (WINBOOL)!(MF_BYPOSITION & uFlags), &mii);
+  return InsertMenuItemW(hMenu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), &mii);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsMenu(
   HMENU hMenu)
@@ -1169,7 +1169,7 @@ MenuItemFromPoint(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ModifyMenuA(
   HMENU hMnu,
@@ -1186,7 +1186,7 @@ ModifyMenuA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ModifyMenuW(
   HMENU hMnu,
@@ -1203,7 +1203,7 @@ ModifyMenuW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 RemoveMenu(
   HMENU hMenu,
@@ -1217,7 +1217,7 @@ RemoveMenu(
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetMenu(HWND hWnd,
 	HMENU hMenu)
 {
@@ -1228,7 +1228,7 @@ SetMenu(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuDefaultItem(
   HMENU hMenu,
@@ -1242,7 +1242,7 @@ SetMenuDefaultItem(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuInfo(
   HMENU hmenu,
@@ -1261,7 +1261,7 @@ SetMenuInfo(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuItemBitmaps(
   HMENU hMenu,
@@ -1278,12 +1278,12 @@ SetMenuItemBitmaps(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuItemInfoA(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPMENUITEMINFOA lpmii)
 {
   UNIMPLEMENTED;
@@ -1294,12 +1294,12 @@ SetMenuItemInfoA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuItemInfoW(
   HMENU hMenu,
   UINT uItem,
-  WINBOOL fByPosition,
+  BOOL fByPosition,
   LPMENUITEMINFOW lpmii)
 {
   UNIMPLEMENTED;
@@ -1310,7 +1310,7 @@ SetMenuItemInfoW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 TrackPopupMenu(
   HMENU hMenu,
@@ -1329,7 +1329,7 @@ TrackPopupMenu(
     tpm.rcExclude = *prcRect;
   }
   
-  return (WINBOOL)NtUserTrackPopupMenuEx(hMenu, uFlags, x, y, hWnd, 
+  return (BOOL)NtUserTrackPopupMenuEx(hMenu, uFlags, x, y, hWnd, 
                                          (prcRect ? &tpm : NULL));
 }
 
@@ -1337,7 +1337,7 @@ TrackPopupMenu(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 TrackPopupMenuEx(
   HMENU hmenu,
@@ -1347,14 +1347,14 @@ TrackPopupMenuEx(
   HWND hwnd,
   LPTPMPARAMS lptpm)
 {
-  return (WINBOOL)NtUserTrackPopupMenuEx(hmenu, fuFlags, x, y, hwnd, lptpm);
+  return (BOOL)NtUserTrackPopupMenuEx(hmenu, fuFlags, x, y, hwnd, lptpm);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetMenuContextHelpId(HMENU hmenu,
           DWORD dwContextHelpId)
@@ -1433,7 +1433,7 @@ MenuWindowProcW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ChangeMenuW(
     HMENU hMenu,
@@ -1449,7 +1449,7 @@ ChangeMenuW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ChangeMenuA(
     HMENU hMenu,
diff --git a/reactos/lib/user32/windows/message.c b/reactos/lib/user32/windows/message.c
index 8e5dcea4e3c..fdddbbbc1ff 100644
--- a/reactos/lib/user32/windows/message.c
+++ b/reactos/lib/user32/windows/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.32 2003/12/26 22:52:11 gvg Exp $
+/* $Id: message.c,v 1.33 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -50,7 +50,7 @@ GetMessageTime(VOID)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 InSendMessage(VOID)
 {
@@ -74,7 +74,7 @@ InSendMessageEx(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ReplyMessage(
   LRESULT lResult)
@@ -534,7 +534,7 @@ DispatchMessageW(CONST MSG *lpmsg)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMessageA(LPMSG lpMsg,
 	    HWND hWnd,
 	    UINT wMsgFilterMin,
@@ -555,7 +555,7 @@ GetMessageA(LPMSG lpMsg,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetMessageW(LPMSG lpMsg,
 	    HWND hWnd,
 	    UINT wMsgFilterMin,
@@ -576,7 +576,7 @@ GetMessageW(LPMSG lpMsg,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 PeekMessageA(LPMSG lpMsg,
 	     HWND hWnd,
 	     UINT wMsgFilterMin,
@@ -598,7 +598,7 @@ PeekMessageA(LPMSG lpMsg,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PeekMessageW(
   LPMSG lpMsg,
@@ -622,7 +622,7 @@ PeekMessageW(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PostMessageA(
   HWND hWnd,
@@ -637,7 +637,7 @@ PostMessageA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PostMessageW(
   HWND hWnd,
@@ -664,7 +664,7 @@ PostQuitMessage(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PostThreadMessageA(
   DWORD idThread,
@@ -679,7 +679,7 @@ PostThreadMessageA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 PostThreadMessageW(
   DWORD idThread,
@@ -775,7 +775,7 @@ SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SendMessageCallbackA(
   HWND hWnd,
@@ -798,7 +798,7 @@ SendMessageCallbackA(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SendMessageCallbackW(
   HWND hWnd,
@@ -859,7 +859,7 @@ SendMessageTimeoutW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SendNotifyMessageA(
   HWND hWnd,
@@ -875,7 +875,7 @@ SendNotifyMessageA(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 SendNotifyMessageW(
   HWND hWnd,
@@ -891,7 +891,7 @@ SendNotifyMessageW(
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 TranslateMessage(CONST MSG *lpMsg)
 {
   return(TranslateMessageEx((LPMSG)lpMsg, 0));
@@ -900,7 +900,7 @@ TranslateMessage(CONST MSG *lpMsg)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 TranslateMessageEx(CONST MSG *lpMsg, DWORD unk)
 {
   return(NtUserTranslateMessage((LPMSG)lpMsg, (HKL)unk));
@@ -910,7 +910,7 @@ TranslateMessageEx(CONST MSG *lpMsg, DWORD unk)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 WaitMessage(VOID)
 {
@@ -972,7 +972,7 @@ GetCapture(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ReleaseCapture(VOID)
 {
   NtUserSetCapture(NULL);
@@ -1009,7 +1009,7 @@ RealGetQueueStatus(UINT flags)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL GetInputState(VOID)
+BOOL STDCALL GetInputState(VOID)
 {
    DWORD ret;
    WORD  wake_bits;
@@ -1031,7 +1031,7 @@ WINBOOL STDCALL GetInputState(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL SetMessageQueue(int cMessagesMax)
+BOOL STDCALL SetMessageQueue(int cMessagesMax)
 {
   /* Function does nothing on 32 bit windows */
   return TRUE;
diff --git a/reactos/lib/user32/windows/messagebox.c b/reactos/lib/user32/windows/messagebox.c
index da330f38ecb..4b591c6123b 100644
--- a/reactos/lib/user32/windows/messagebox.c
+++ b/reactos/lib/user32/windows/messagebox.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: messagebox.c,v 1.22 2003/10/31 20:49:45 weiden Exp $
+/* $Id: messagebox.c,v 1.23 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/messagebox.c
@@ -896,7 +896,7 @@ SoftModalMessageBox(DWORD Unknown0)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 MessageBeep(UINT uType)
 {
diff --git a/reactos/lib/user32/windows/nonclient.c b/reactos/lib/user32/windows/nonclient.c
index d74cbaa5409..4beb3f33ffb 100644
--- a/reactos/lib/user32/windows/nonclient.c
+++ b/reactos/lib/user32/windows/nonclient.c
@@ -962,10 +962,10 @@ DefWndTrackScrollBar(HWND hWnd, WPARAM wParam, POINT Point)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AdjustWindowRectEx(LPRECT lpRect, 
 		   DWORD dwStyle, 
-		   WINBOOL bMenu, 
+		   BOOL bMenu, 
 		   DWORD dwExStyle)
 {
    SIZE BorderSize;
@@ -994,10 +994,10 @@ AdjustWindowRectEx(LPRECT lpRect,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AdjustWindowRect(LPRECT lpRect,
 		 DWORD dwStyle,
-		 WINBOOL bMenu)
+		 BOOL bMenu)
 {
    return AdjustWindowRectEx(lpRect, dwStyle, bMenu, 0);
 }
@@ -1265,7 +1265,7 @@ DrawCaption(HWND hWnd, HDC hDC, LPCRECT lprc, UINT uFlags)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 DrawCaptionTempW(
 		 HWND        hwnd,
@@ -1284,7 +1284,7 @@ DrawCaptionTempW(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 DrawCaptionTempA(
 		 HWND        hwnd,
diff --git a/reactos/lib/user32/windows/paint.c b/reactos/lib/user32/windows/paint.c
index 8dbaef71550..2ae089fc321 100644
--- a/reactos/lib/user32/windows/paint.c
+++ b/reactos/lib/user32/windows/paint.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: paint.c,v 1.20 2003/12/28 17:22:16 weiden Exp $
+/* $Id: paint.c,v 1.21 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -95,7 +95,7 @@ BeginPaint(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EndPaint(
   HWND hWnd,
@@ -122,12 +122,12 @@ ExcludeUpdateRgn(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 GetUpdateRect(
   HWND hWnd,
   LPRECT lpRect,
-  WINBOOL bErase)
+  BOOL bErase)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -142,7 +142,7 @@ STDCALL
 GetUpdateRgn(
   HWND hWnd,
   HRGN hRgn,
-  WINBOOL bErase)
+  BOOL bErase)
 {
   return NtUserGetUpdateRgn(hWnd, hRgn, bErase);
 }
@@ -151,12 +151,12 @@ GetUpdateRgn(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InvalidateRect(
   HWND hWnd,
   CONST RECT *lpRect,
-  WINBOOL bErase)
+  BOOL bErase)
 {
   return NtUserInvalidateRect( hWnd, lpRect, bErase );
 }
@@ -165,12 +165,12 @@ InvalidateRect(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 InvalidateRgn(
   HWND hWnd,
   HRGN hRgn,
-  WINBOOL bErase)
+  BOOL bErase)
 {
   return NtUserInvalidateRgn( hWnd, hRgn, bErase );
 }
@@ -179,7 +179,7 @@ InvalidateRgn(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 RedrawWindow(
   HWND hWnd,
@@ -194,7 +194,7 @@ RedrawWindow(
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ScrollDC(HDC hDC, int dx, int dy, CONST RECT *lprcScroll, CONST RECT *lprcClip,
    HRGN hrgnUpdate, LPRECT lprcUpdate)
 {
@@ -211,7 +211,7 @@ STDCALL
 SetWindowRgn(
   HWND hWnd,
   HRGN hRgn,
-  WINBOOL bRedraw)
+  BOOL bRedraw)
 {
   UNIMPLEMENTED;
   return 0;
@@ -221,7 +221,7 @@ SetWindowRgn(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 UpdateWindow(
   HWND hWnd)
@@ -233,7 +233,7 @@ UpdateWindow(
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 ValidateRect(
   HWND hWnd,
@@ -247,13 +247,13 @@ ValidateRect(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 ValidateRgn(
   HWND hWnd,
   HRGN hRgn)
 {
-  return (WINBOOL) NtUserCallTwoParam((DWORD) hWnd,
+  return (BOOL) NtUserCallTwoParam((DWORD) hWnd,
                                       (DWORD) hRgn,
                                       TWOPARAM_ROUTINE_VALIDATERGN);
 }
@@ -276,7 +276,7 @@ const BYTE MappingTable[33] = {5,9,2,3,5,7,0,0,0,7,5,5,3,2,7,5,3,3,0,5,7,10,5,0,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 DrawFrame(
 	  HDC    hDc,
diff --git a/reactos/lib/user32/windows/prop.c b/reactos/lib/user32/windows/prop.c
index 83803dadf8a..9a03232f25d 100644
--- a/reactos/lib/user32/windows/prop.c
+++ b/reactos/lib/user32/windows/prop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: prop.c,v 1.10 2003/11/20 15:35:32 weiden Exp $
+/* $Id: prop.c,v 1.11 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -390,7 +390,7 @@ RemovePropW(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetPropA(HWND hWnd, LPCSTR lpString, HANDLE hData)
 {
   PWSTR lpWString;
@@ -419,7 +419,7 @@ SetPropA(HWND hWnd, LPCSTR lpString, HANDLE hData)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetPropW(HWND hWnd, LPCWSTR lpString, HANDLE hData)
 {
   ATOM Atom;
diff --git a/reactos/lib/user32/windows/rect.c b/reactos/lib/user32/windows/rect.c
index 01354a98b09..e216b709a81 100644
--- a/reactos/lib/user32/windows/rect.c
+++ b/reactos/lib/user32/windows/rect.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: rect.c,v 1.13 2003/07/10 21:04:32 chorns Exp $
+/* $Id: rect.c,v 1.14 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -37,7 +37,7 @@
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CopyRect(LPRECT lprcDst, CONST RECT *lprcSrc)
 {
   if(lprcDst == NULL || lprcSrc == NULL)
@@ -51,7 +51,7 @@ CopyRect(LPRECT lprcDst, CONST RECT *lprcSrc)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EqualRect(
   CONST RECT *lprc1,
@@ -73,7 +73,7 @@ EqualRect(
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 InflateRect(LPRECT rect, int dx, int dy)
 {
   rect->left -= dx;
@@ -87,7 +87,7 @@ InflateRect(LPRECT rect, int dx, int dy)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IntersectRect(LPRECT lprcDst,
 	      CONST RECT *lprcSrc1,
 	      CONST RECT *lprcSrc2)
@@ -112,7 +112,7 @@ IntersectRect(LPRECT lprcDst,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsRectEmpty(CONST RECT *lprc)
 {
   return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom));
@@ -122,7 +122,7 @@ IsRectEmpty(CONST RECT *lprc)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 OffsetRect(LPRECT rect, int dx, int dy)
 {
   if(rect == NULL)
@@ -139,14 +139,14 @@ OffsetRect(LPRECT rect, int dx, int dy)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 PtInRect(CONST RECT *lprc, POINT pt)
 {
   return((pt.x >= lprc->left) && (pt.x < lprc->right) &&
 	 (pt.y >= lprc->top) && (pt.y < lprc->bottom));
 }
 
-WINBOOL STDCALL
+BOOL STDCALL
 SetRect(LPRECT lprc, int xLeft, int yTop, int xRight, int yBottom)
 {
   lprc->left = xLeft;
@@ -171,7 +171,7 @@ SetRectEmpty(LPRECT lprc)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SubtractRect(LPRECT lprcDst, CONST RECT *lprcSrc1, CONST RECT *lprcSrc2)
 {
   RECT tempRect;
@@ -206,7 +206,7 @@ SubtractRect(LPRECT lprcDst, CONST RECT *lprcSrc1, CONST RECT *lprcSrc2)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 UnionRect(LPRECT lprcDst, CONST RECT *lprcSrc1, CONST RECT *lprcSrc2)
 {
   if (IsRectEmpty(lprcSrc1))
diff --git a/reactos/lib/user32/windows/text.c b/reactos/lib/user32/windows/text.c
index 6839f319aec..e4349232b9d 100644
--- a/reactos/lib/user32/windows/text.c
+++ b/reactos/lib/user32/windows/text.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c,v 1.7 2003/07/10 21:04:32 chorns Exp $
+/* $Id: text.c,v 1.8 2004/01/23 23:38:26 ekohl Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -33,7 +33,6 @@
 #include <windows.h>
 #include <user32.h>
 
-//#include <kernel32/winnls.h>
 #include <ntos/rtl.h>
 
 #include <debug.h>
@@ -217,7 +216,7 @@ LPSTR WINAPI CharPrevExA( WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags )
     return (LPSTR)start;
 }
 
-//WINBOOL STDCALL CharToOemA(LPCSTR lpszSrc, LPSTR lpszDst)
+//BOOL STDCALL CharToOemA(LPCSTR lpszSrc, LPSTR lpszDst)
 /*
  * @implemented
  */
@@ -229,7 +228,7 @@ CharToOemA(LPCSTR s, LPSTR d)
     return CharToOemBuffA(s, d, strlen(s) + 1);
 }
 
-//WINBOOL STDCALL CharToOemBuffA(LPCSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
+//BOOL STDCALL CharToOemBuffA(LPCSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
 /*
  * @implemented
  */
@@ -248,7 +247,7 @@ CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len)
     return TRUE;
 }
 
-//WINBOOL STDCALL CharToOemBuffW(LPCWSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
+//BOOL STDCALL CharToOemBuffW(LPCWSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
 /*
  * @implemented
  */
@@ -262,7 +261,7 @@ CharToOemBuffW(LPCWSTR s, LPSTR d, DWORD len)
     return TRUE;
 }
 
-//WINBOOL STDCALL CharToOemW(LPCWSTR lpszSrc, LPSTR lpszDst)
+//BOOL STDCALL CharToOemW(LPCWSTR lpszSrc, LPSTR lpszDst)
 /*
  * @implemented
  */
@@ -351,7 +350,7 @@ CharUpperW(LPWSTR x)
     else return (LPWSTR)(UINT)towlower((WORD)(((DWORD)(x)) & 0xFFFF));
 }
 
-//WINBOOL STDCALL IsCharAlphaA(CHAR ch)
+//BOOL STDCALL IsCharAlphaA(CHAR ch)
 /*
  * @implemented
  */
@@ -374,7 +373,7 @@ const char IsCharAlphaNumericA_lookup_table[] = {
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsCharAlphaNumericA(CHAR ch)
 {
@@ -389,7 +388,7 @@ IsCharAlphaNumericA(CHAR ch)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsCharAlphaNumericW(WCHAR ch)
 {
@@ -397,7 +396,7 @@ IsCharAlphaNumericW(WCHAR ch)
 //  return FALSE;
 }
 
-//WINBOOL STDCALL IsCharAlphaW(WCHAR ch)
+//BOOL STDCALL IsCharAlphaW(WCHAR ch)
 /*
  * @implemented
  */
@@ -408,7 +407,7 @@ IsCharAlphaW(WCHAR x)
     return (get_char_typeW(x) & C1_ALPHA) != 0;
 }
 
-//WINBOOL STDCALL IsCharLowerA(CHAR ch)
+//BOOL STDCALL IsCharLowerA(CHAR ch)
 /*
  * @implemented
  */
@@ -421,7 +420,7 @@ IsCharLowerA(CHAR x)
     return IsCharLowerW(wch);
 }
 
-//WINBOOL STDCALL IsCharLowerW(WCHAR ch)
+//BOOL STDCALL IsCharLowerW(WCHAR ch)
 /*
  * @implemented
  */
@@ -432,7 +431,7 @@ IsCharLowerW(WCHAR x)
     return (get_char_typeW(x) & C1_LOWER) != 0;
 }
 
-//WINBOOL STDCALL IsCharUpperA(CHAR ch)
+//BOOL STDCALL IsCharUpperA(CHAR ch)
 /*
  * @implemented
  */
@@ -445,7 +444,7 @@ IsCharUpperA(CHAR x)
     return IsCharUpperW(wch);
 }
 
-//WINBOOL STDCALL IsCharUpperW(WCHAR ch)
+//BOOL STDCALL IsCharUpperW(WCHAR ch)
 /*
  * @implemented
  */
@@ -456,7 +455,7 @@ IsCharUpperW(WCHAR x)
     return (get_char_typeW(x) & C1_UPPER) != 0;
 }
 
-//WINBOOL STDCALL OemToCharA(LPCSTR lpszSrc, LPSTR lpszDst)
+//BOOL STDCALL OemToCharA(LPCSTR lpszSrc, LPSTR lpszDst)
 /*
  * @implemented
  */
@@ -467,7 +466,7 @@ OemToCharA(LPCSTR s, LPSTR d)
     return OemToCharBuffA(s, d, strlen(s) + 1);
 }
 
-//WINBOOL STDCALL OemToCharBuffA(LPCSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
+//BOOL STDCALL OemToCharBuffA(LPCSTR lpszSrc, LPSTR lpszDst, DWORD cchDstLength)
 /*
  * @implemented
  */
@@ -484,7 +483,7 @@ BOOL WINAPI OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len)
     return TRUE;
 }
 
-//WINBOOL STDCALL OemToCharBuffW(LPCSTR lpszSrc, LPWSTR lpszDst, DWORD cchDstLength)
+//BOOL STDCALL OemToCharBuffW(LPCSTR lpszSrc, LPWSTR lpszDst, DWORD cchDstLength)
 /*
  * @implemented
  */
@@ -496,7 +495,7 @@ OemToCharBuffW(LPCSTR s, LPWSTR d, DWORD len)
     return TRUE;
 }
 
-//WINBOOL STDCALL OemToCharW(LPCSTR lpszSrc, LPWSTR lpszDst)
+//BOOL STDCALL OemToCharW(LPCSTR lpszSrc, LPWSTR lpszDst)
 /*
  * @implemented
  */
diff --git a/reactos/lib/user32/windows/window.c b/reactos/lib/user32/windows/window.c
index 6345eb23341..8e1284d16a4 100644
--- a/reactos/lib/user32/windows/window.c
+++ b/reactos/lib/user32/windows/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.94 2004/01/15 20:59:57 gvg Exp $
+/* $Id: window.c,v 1.95 2004/01/23 23:38:26 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -93,7 +93,7 @@ User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AllowSetForegroundWindow(DWORD dwProcessId)
 {
   UNIMPLEMENTED;
@@ -130,7 +130,7 @@ BeginDeferWindowPos(int nNumWindows)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 BringWindowToTop(HWND hWnd)
 {
   UNIMPLEMENTED;
@@ -185,12 +185,12 @@ ChildWindowFromPointEx(HWND hwndParent,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 CloseWindow(HWND hWnd)
 {
     SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
 
-    return (WINBOOL)(hWnd);
+    return (BOOL)(hWnd);
 }
 
 /*
@@ -495,7 +495,7 @@ DeferWindowPos(HDWP hWinPosInfo,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 DestroyWindow(HWND hWnd)
 {
   return NtUserDestroyWindow(hWnd);
@@ -505,7 +505,7 @@ DestroyWindow(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EndDeferWindowPos(HDWP hWinPosInfo)
 {
 #if 0
@@ -537,7 +537,7 @@ GetForegroundWindow(VOID)
 }
 
 
-WINBOOL
+BOOL
 STATIC
 User32EnumWindows (
 	HDESK hDesktop,
@@ -612,7 +612,7 @@ User32EnumWindows (
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumChildWindows(
 	HWND hWndParent,
@@ -628,7 +628,7 @@ EnumChildWindows(
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumThreadWindows(DWORD dwThreadId,
 		  ENUMWINDOWSPROC lpfn,
@@ -643,7 +643,7 @@ EnumThreadWindows(DWORD dwThreadId,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 EnumWindows(ENUMWINDOWSPROC lpEnumFunc,
 	    LPARAM lParam)
 {
@@ -654,7 +654,7 @@ EnumWindows(ENUMWINDOWSPROC lpEnumFunc,
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 EnumDesktopWindows(
 	HDESK hDesktop,
@@ -770,7 +770,7 @@ FindWindowW(LPCWSTR lpClassName, LPCWSTR lpWindowName)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetAltTabInfoA(HWND hwnd,
 	       int iItem,
 	       PALTTABINFO pati,
@@ -785,7 +785,7 @@ GetAltTabInfoA(HWND hwnd,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetAltTabInfoW(HWND hwnd,
 	       int iItem,
 	       PALTTABINFO pati,
@@ -810,7 +810,7 @@ GetAncestor(HWND hwnd, UINT gaFlags)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetClientRect(HWND hWnd, LPRECT lpRect)
 {
   return(NtUserGetClientRect(hWnd, lpRect));
@@ -820,11 +820,11 @@ GetClientRect(HWND hWnd, LPRECT lpRect)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetGUIThreadInfo(DWORD idThread,
 		 LPGUITHREADINFO lpgui)
 {
-  return (WINBOOL)NtUserGetGUIThreadInfo(idThread, lpgui);
+  return (BOOL)NtUserGetGUIThreadInfo(idThread, lpgui);
 }
 
 
@@ -851,7 +851,7 @@ GetParent(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetProcessDefaultLayout(DWORD *pdwDefaultLayout)
 {
   UNIMPLEMENTED;
@@ -862,7 +862,7 @@ GetProcessDefaultLayout(DWORD *pdwDefaultLayout)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetTitleBarInfo(HWND hwnd,
 		PTITLEBARINFO pti)
 {
@@ -896,7 +896,7 @@ GetTopWindow(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetWindowInfo(HWND hwnd,
 	      PWINDOWINFO pwi)
 {
@@ -947,18 +947,18 @@ GetWindowModuleFileNameW(HWND hwnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetWindowPlacement(HWND hWnd,
 		   WINDOWPLACEMENT *lpwndpl)
 {
-  return (WINBOOL)NtUserGetWindowPlacement(hWnd, lpwndpl);
+  return (BOOL)NtUserGetWindowPlacement(hWnd, lpwndpl);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 GetWindowRect(HWND hWnd,
 	      LPRECT lpRect)
 {
@@ -1019,7 +1019,7 @@ GetWindowThreadProcessId(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsChild(HWND hWndParent,
 	HWND hWnd)
 {
@@ -1036,7 +1036,7 @@ IsChild(HWND hWndParent,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsIconic(HWND hWnd)
 {
   return (NtUserGetWindowLong( hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE) != 0;  
@@ -1046,7 +1046,7 @@ IsIconic(HWND hWnd)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsWindow(HWND hWnd)
 {
   DWORD WndProc = NtUserGetWindowLong(hWnd, GWL_WNDPROC, FALSE);
@@ -1057,17 +1057,17 @@ IsWindow(HWND hWnd)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsWindowUnicode(HWND hWnd)
 {
-	return (WINBOOL)NtUserCallOneParam((DWORD)hWnd,ONEPARAM_ROUTINE_ISWINDOWUNICODE);
+	return (BOOL)NtUserCallOneParam((DWORD)hWnd,ONEPARAM_ROUTINE_ISWINDOWUNICODE);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsWindowVisible(HWND hWnd)
 {
   while (NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_CHILD)
@@ -1085,7 +1085,7 @@ IsWindowVisible(HWND hWnd)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsWindowEnabled(
   HWND hWnd)
@@ -1101,7 +1101,7 @@ IsWindowEnabled(
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 IsZoomed(HWND hWnd)
 {
   return NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MAXIMIZE;
@@ -1111,7 +1111,7 @@ IsZoomed(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 LockSetForegroundWindow(UINT uLockCode)
 {
   UNIMPLEMENTED;
@@ -1122,13 +1122,13 @@ LockSetForegroundWindow(UINT uLockCode)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 MoveWindow(HWND hWnd,
 	   int X,
 	   int Y,
 	   int nWidth,
 	   int nHeight,
-	   WINBOOL bRepaint)
+	   BOOL bRepaint)
 {
   return NtUserMoveWindow(hWnd, X, Y, nWidth, nHeight, bRepaint);
 }
@@ -1137,7 +1137,7 @@ MoveWindow(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 AnimateWindow(HWND hwnd,
 	      DWORD dwTime,
 	      DWORD dwFlags)
@@ -1167,7 +1167,7 @@ AnimateWindow(HWND hwnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 OpenIcon(HWND hWnd)
 {
     if (!(NtUserGetWindowLong(hWnd, GWL_STYLE, FALSE) & WS_MINIMIZE))
@@ -1194,7 +1194,7 @@ RealChildWindowFromPoint(HWND hwndParent,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetForegroundWindow(HWND hWnd)
 {
    return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW);
@@ -1204,7 +1204,7 @@ SetForegroundWindow(HWND hWnd)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetLayeredWindowAttributes(HWND hwnd,
 			   COLORREF crKey,
 			   BYTE bAlpha,
@@ -1229,7 +1229,7 @@ SetParent(HWND hWndChild,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetProcessDefaultLayout(DWORD dwDefaultLayout)
 {
   UNIMPLEMENTED;
@@ -1240,18 +1240,18 @@ SetProcessDefaultLayout(DWORD dwDefaultLayout)
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetWindowPlacement(HWND hWnd,
 		   CONST WINDOWPLACEMENT *lpwndpl)
 {
-  return (WINBOOL)NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl);
+  return (BOOL)NtUserSetWindowPlacement(hWnd, (WINDOWPLACEMENT *)lpwndpl);
 }
 
 
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetWindowPos(HWND hWnd,
 	     HWND hWndInsertAfter,
 	     int X,
@@ -1267,7 +1267,7 @@ SetWindowPos(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetWindowTextA(HWND hWnd,
 	       LPCSTR lpString)
 {
@@ -1278,7 +1278,7 @@ SetWindowTextA(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 SetWindowTextW(HWND hWnd,
 	       LPCWSTR lpString)
 {
@@ -1289,9 +1289,9 @@ SetWindowTextW(HWND hWnd,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ShowOwnedPopups(HWND hWnd,
-		WINBOOL fShow)
+		BOOL fShow)
 {
   UNIMPLEMENTED;
   return FALSE;
@@ -1301,7 +1301,7 @@ ShowOwnedPopups(HWND hWnd,
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ShowWindow(HWND hWnd,
 	   int nCmdShow)
 {
@@ -1312,7 +1312,7 @@ ShowWindow(HWND hWnd,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ShowWindowAsync(HWND hWnd,
 		int nCmdShow)
 {
@@ -1341,7 +1341,7 @@ TileWindows(HWND hwndParent,
 /*
  * @unimplemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 UpdateLayeredWindow(HWND hwnd,
 		    HDC hdcDst,
 		    POINT *pptDst,
@@ -1396,7 +1396,7 @@ MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints)
 /*
  * @implemented
  */
-WINBOOL STDCALL 
+BOOL STDCALL 
 ScreenToClient(HWND hWnd, LPPOINT lpPoint)
 {
   return(MapWindowPoints(NULL, hWnd, lpPoint, 1));
@@ -1406,7 +1406,7 @@ ScreenToClient(HWND hWnd, LPPOINT lpPoint)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ClientToScreen(HWND hWnd, LPPOINT lpPoint)
 {
     return (MapWindowPoints( hWnd, NULL, lpPoint, 1 ));
@@ -1416,12 +1416,12 @@ ClientToScreen(HWND hWnd, LPPOINT lpPoint)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetWindowContextHelpId(HWND hwnd,
           DWORD dwContextHelpId)
 {
-  return (WINBOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)dwContextHelpId, 
+  return (BOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)dwContextHelpId, 
                                      TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID);
 }
 
@@ -1449,7 +1449,7 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount)
 /*
  * @unimplemented
  */
-WINBOOL
+BOOL
 STDCALL
 IsHungAppWindow(HWND hwnd)
 {
@@ -1470,7 +1470,7 @@ SetLastErrorEx(DWORD dwErrCode, DWORD dwType)
 /*
  * @implemented
  */
-WINBOOL
+BOOL
 STDCALL
 SetSystemMenu (
   HWND hwnd, 
@@ -1496,7 +1496,7 @@ HMENU
 STDCALL
 GetSystemMenu(
   HWND hWnd,
-  WINBOOL bRevert)
+  BOOL bRevert)
 {
   if(!hWnd)
   {
@@ -1563,7 +1563,7 @@ GetTaskmanWindow(VOID)
 /*
  * @implemented
  */
-WINBOOL STDCALL
+BOOL STDCALL
 ScrollWindow(HWND hWnd, int dx, int dy, CONST RECT *lpRect,
    CONST RECT *prcClip)
 {