[ros-diffs] [spetreolle] 46515: Revert 46514, fixes build.

Author: spetreolle
Date: Sun Mar 28 12:54:44 2010
New Revision: 46515

URL: http://svn.reactos.org/svn/reactos?rev=46515&view=rev
Log:
Revert 46514, fixes build.

Modified:
    trunk/reactos/dll/win32/user32/misc/desktop.c
    trunk/reactos/dll/win32/user32/misc/winsta.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/draw.c
    trunk/reactos/include/psdk/wingdi.h
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/dll/win32/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -522,7 +522,7 @@
 HDESK
 WINAPI
 OpenDesktopA(
-  LPCSTR lpszDesktop,
+  LPSTR lpszDesktop,
   DWORD dwFlags,
   BOOL fInherit,
   ACCESS_MASK dwDesiredAccess)
@@ -558,7 +558,7 @@
 HDESK
 WINAPI
 OpenDesktopW(
-  LPCWSTR lpszDesktop,
+  LPWSTR lpszDesktop,
   DWORD dwFlags,
   BOOL fInherit,
   ACCESS_MASK dwDesiredAccess)

Modified: trunk/reactos/dll/win32/user32/misc/winsta.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -18,7 +18,7 @@
  * @implemented
  */
 HWINSTA WINAPI
-CreateWindowStationA(LPCSTR lpwinsta,
+CreateWindowStationA(LPSTR lpwinsta,
 		     DWORD dwReserved,
 		     ACCESS_MASK dwDesiredAccess,
 		     LPSECURITY_ATTRIBUTES lpsa)
@@ -52,7 +52,7 @@
  * @implemented
  */
 HWINSTA WINAPI
-CreateWindowStationW(LPCWSTR lpwinsta,
+CreateWindowStationW(LPWSTR lpwinsta,
 		     DWORD dwReserved,
 		     ACCESS_MASK dwDesiredAccess,
 		     LPSECURITY_ATTRIBUTES lpsa)
@@ -266,7 +266,7 @@
  * @implemented
  */
 HWINSTA WINAPI
-OpenWindowStationA(LPCSTR lpszWinSta,
+OpenWindowStationA(LPSTR lpszWinSta,
 		   BOOL fInherit,
 		   ACCESS_MASK dwDesiredAccess)
 {
@@ -298,7 +298,7 @@
  * @implemented
  */
 HWINSTA WINAPI
-OpenWindowStationW(LPCWSTR lpszWinSta,
+OpenWindowStationW(LPWSTR lpszWinSta,
 		   BOOL fInherit,
 		   ACCESS_MASK dwDesiredAccess)
 {

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -851,6 +851,10 @@
     return 0;
 }
 
+/* Undocumented flags. */
+#define SWP_NOCLIENTMOVE          0x0800
+#define SWP_NOCLIENTSIZE          0x1000
+
 LRESULT
 DefWndHandleWindowPosChanged(HWND hWnd, WINDOWPOS* Pos)
 {

Modified: trunk/reactos/dll/win32/user32/windows/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -36,6 +36,8 @@
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* GLOBALS *******************************************************************/
+
+#define DSS_DEFAULT 0x0040  /* Make it bold */
 
 static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555,
                                        0xaaaa, 0x5555, 0xaaaa, 0x5555 };

Modified: trunk/reactos/include/psdk/wingdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -69,7 +69,6 @@
 #define DI_MASK	1
 #define DI_NORMAL	3
 #define DI_APPBANDING 1
-#define DI_NOMIRROR	16
 #define EMR_HEADER	1
 #define EMR_POLYBEZIER 2
 #define EMR_POLYGON	3
@@ -185,19 +184,12 @@
 #define EMR_SETICMPROFILEW 113
 #define EMR_ALPHABLEND 114
 #define EMR_ALPHADIBBLEND 115
-#define EMR_SETLAYOUT 115
 #define EMR_TRANSPARENTBLT 116
 #define EMR_TRANSPARENTDIB 117
-#define EMR_RESERVED_117 117
 #define EMR_GRADIENTFILL 118
 #define EMR_SETLINKEDUFIS 119
 #define EMR_SETTEXTJUSTIFICATION 120
 #define EMR_COLORMATCHTOTARGETW 121
-#define EMR_CREATECOLORSPACEW 122
-
-#define EMR_MIN 1
-#define EMR_MAX 122
-
 #endif
 #define ENHMETA_SIGNATURE 1179469088
 #define EPS_SIGNATURE 0x46535045
@@ -273,16 +265,6 @@
 #define META_CREATEFONTINDIRECT	0x2FB
 #define META_CREATEBRUSHINDIRECT	0x2FC
 #define META_CREATEREGION	0x6FF
-#define META_DRAWTEXT	0x062F
-#define META_RESETDC	0x014C
-#define META_STARTDOC	0x014D
-#define META_STARTPAGE	0x004F
-#define META_ENDPAGE	0x0050
-#define META_ABORTDOC	0x0052
-#define META_ENDDOC	0x005E
-#define META_CREATEBRUSH	0x00F8
-#define META_CREATEBITMAPINDIRECT	0x02FD
-#define META_CREATEBITMAP	0x06FE
 #define PT_MOVETO	6
 #define PT_LINETO	2
 #define PT_BEZIERTO	4
@@ -397,17 +379,6 @@
 #define JOHAB_CHARSET	130
 #define VIETNAMESE_CHARSET	163
 #define MAC_CHARSET 77
-/* I don't know if the values of *_CHARSET macros are defined in Windows
- * or if we can choose them as we want. -- srtxg
- */
-#define VISCII_CHARSET        (BYTE)240 /* viscii1.1-1 */
-#define TCVN_CHARSET          (BYTE)241 /* tcvn-0 */
-#define KOI8_CHARSET          (BYTE)242 /* koi8-{r,u,ru} */
-#define ISO3_CHARSET          (BYTE)243 /* iso8859-3 */
-#define ISO4_CHARSET          (BYTE)244 /* iso8859-4 */
-#define ISO10_CHARSET         (BYTE)245 /* iso8859-10 */
-#define CELTIC_CHARSET        (BYTE)246 /* iso8859-14 */
-
 #define OUT_DEFAULT_PRECIS	0
 #define OUT_STRING_PRECIS	1
 #define OUT_CHARACTER_PRECIS	2
@@ -429,8 +400,6 @@
 #define PROOF_QUALITY	2
 #define NONANTIALIASED_QUALITY 3
 #define ANTIALIASED_QUALITY 4
-#define CLEARTYPE_QUALITY 5
-#define CLEARTYPE_NATURAL_QUALITY 6
 #define DEFAULT_PITCH	0
 #define FIXED_PITCH	1
 #define VARIABLE_PITCH	2
@@ -593,7 +562,6 @@
 #define PS_TYPE_MASK	983040
 #define ALTERNATE	1
 #define WINDING	2
-#define POLYFILL_LAST	2
 #define DC_BINNAMES	12
 #define DC_BINS	6
 #define DC_COPIES	18
@@ -633,7 +601,6 @@
 #define DCBA_FACEDOWNRIGHT	259
 #define FLOODFILLBORDER 0
 #define FLOODFILLSURFACE 1
-#define ETO_GRAYED            0x00001
 #define ETO_OPAQUE            0x00002
 #define ETO_CLIPPED           0x00004
 #if (WINVER >= 0x0400)
@@ -844,16 +811,8 @@
 #define GGO_GRAY8_BITMAP 6
 #define GGO_GLYPH_INDEX 128
 #define GGO_UNHINTED 256
-#ifdef __WINESRC__
-#define WINE_GGO_GRAY16_BITMAP 0x10
-#define WINE_GGO_HRGB_BITMAP   0x11
-#define WINE_GGO_HBGR_BITMAP   0x12
-#define WINE_GGO_VRGB_BITMAP   0x13
-#define WINE_GGO_VBGR_BITMAP   0x14
-#endif
 #define GM_COMPATIBLE 1
 #define GM_ADVANCED 2
-#define GM_LAST     2
 #define MM_ANISOTROPIC 8
 #define MM_HIENGLISH 5
 #define MM_HIMETRIC 3
@@ -877,12 +836,6 @@
 #define PT_CLOSEFIGURE 1
 #define TT_AVAILABLE 1
 #define TT_ENABLED 2
-
-#ifdef __WINESRC__
-#define WINE_TT_SUBPIXEL_RENDERING_ENABLED 0x4000
-#define WINE_TT_HINTER_ENABLED 0x8000
-#endif
-
 #define BLACK_BRUSH 4
 #define DKGRAY_BRUSH 3
 #define GRAY_BRUSH 2
@@ -938,7 +891,6 @@
 #define MWT_MAX MWT_RIGHTMULTIPLY
 #define OPAQUE 2
 #define TRANSPARENT 1
-#define BKMODE_LAST  2
 #define BLACKONWHITE 1
 #define WHITEONBLACK 2
 #define COLORONCOLOR 3
@@ -1065,7 +1017,6 @@
 #define BS_DIBPATTERNPT	6
 #define BS_PATTERN8X8	7
 #define BS_DIBPATTERN8X8	8
-#define BS_MONOPATTERN	9
 #define LCS_CALIBRATED_RGB	0
 #define LCS_DEVICE_RGB	1
 #define LCS_DEVICE_CMYK	2
@@ -2211,26 +2162,6 @@
 	LONG cxSrc;
 	LONG cySrc;
 } EMRSTRETCHBLT,*PEMRSTRETCHBLT;
-typedef struct tagEMRALPHABLEND {
-	EMR      emr;
-	RECTL    rclBounds;
-	LONG     xDest;
-	LONG     yDest;
-	LONG     cxDest;
-	LONG     cyDest;
-	DWORD    dwRop;
-	LONG     xSrc;
-	LONG     ySrc;
-	XFORM    xformSrc;
-	COLORREF crBkColorSrc;
-	DWORD    iUsageSrc;
-	DWORD    offBmiSrc;
-	DWORD    cbBmiSrc;
-	DWORD    offBitsSrc;
-	DWORD    cbBitsSrc;
-	LONG     cxSrc;
-	LONG     cySrc;
-} EMRALPHABLEND, *PEMRALPHABLEND;
 typedef struct tagEMRSTRETCHDIBITS {
 	EMR emr;
 	RECTL rclBounds;
@@ -2984,17 +2915,12 @@
 BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
 BOOL WINAPI FlattenPath(HDC);
 BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
-BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT);
 BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
-DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *);
+DEVMODEW* WINAPI GdiConvertToDevmodeW(const DEVMODEA *);
 BOOL WINAPI GdiFlush(void);
-LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
-DWORD WINAPI GdiGetCodePage(HDC);
 DWORD WINAPI GdiGetBatchLimit(void);
 DWORD WINAPI GdiSetBatchLimit(DWORD);
-BOOL WINAPI GdiGradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
-BOOL WINAPI GdiIsMetaFileDC(HDC);
 #define GetCValue(cmyk) ((BYTE)(cmyk))
 #define GetMValue(cmyk) ((BYTE)((cmyk)>> 8))
 #define GetYValue(cmyk) ((BYTE)((cmyk)>>16))
@@ -3091,8 +3017,8 @@
 UINT WINAPI GetSystemPaletteUse(HDC);
 UINT WINAPI GetTextAlign(HDC);
 int WINAPI GetTextCharacterExtra(HDC);
-UINT WINAPI GetTextCharset(HDC);
-UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
+int WINAPI GetTextCharset(HDC);
+int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
 COLORREF WINAPI GetTextColor(HDC);
 BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
 BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
@@ -3133,11 +3059,11 @@
 BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int);
 BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
 BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD);
+BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
 BOOL WINAPI Polygon(HDC,const POINT*,int);
 BOOL WINAPI Polyline(HDC,const POINT*,int);
 BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,DWORD);
+BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
 BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
 BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
 BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
@@ -3168,7 +3094,7 @@
 HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
 int WINAPI SetAbortProc(HDC,ABORTPROC);
 int WINAPI SetArcDirection(HDC,int);
-LONG WINAPI SetBitmapBits(HBITMAP,LONG,PCVOID);
+LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID);
 BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
 COLORREF WINAPI SetBkColor(HDC,COLORREF);
 int WINAPI SetBkMode(HDC,int);
@@ -3204,7 +3130,6 @@
 BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
 int WINAPI SetPolyFillMode(HDC,int);
 BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);
-INT WINAPI SetRelAbs(HDC,INT);
 int WINAPI SetROP2(HDC,int);
 int WINAPI SetStretchBltMode(HDC,int);
 UINT WINAPI SetSystemPaletteUse(HDC,UINT);
@@ -3424,22 +3349,6 @@
 #endif
 #endif
 
-#ifdef __WINESRC__
-/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension
*/
-
-#define DCHC_INVALIDVISRGN      0x0001
-#define DCHC_DELETEDC           0x0002
-#define DCHF_INVALIDATEVISRGN   0x0001
-#define DCHF_VALIDATEVISRGN     0x0002
-
-typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);
-
-WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*);
-WINGDIAPI BOOL      WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR);
-WINGDIAPI WORD      WINAPI SetHookFlags(HDC,WORD);
-WINGDIAPI INT       WINAPI SelectVisRgn(HDC,HRGN);
-#endif /* __WINESRC__ */
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Mar 28 12:54:44 2010
@@ -299,9 +299,6 @@
 #define ES_LOWERCASE 16
 #define ES_MULTILINE 4
 #define ES_NOHIDESEL 256
-#ifdef _WINE
-#define ES_COMBO 0x200   /* Undocumented. Parent is a combobox */
-#endif
 #define ES_NUMBER 0x2000
 #define ES_OEMCONVERT 0x400
 #define ES_PASSWORD 32
@@ -389,7 +386,6 @@
 #define WS_EX_COMPOSITED 0x2000000 /* XP */
 #define WS_EX_CONTEXTHELP 0x400
 #define WS_EX_CONTROLPARENT 0x10000
-#define WS_EX_DRAGDETECT 0x00000002L
 #define WS_EX_DLGMODALFRAME 1
 #define WS_EX_LAYERED 0x80000   /* w2k */
 #define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */
@@ -522,7 +518,6 @@
 #define DSS_NORMAL	0
 #define DSS_UNION	16
 #define DSS_DISABLED	32
-#define	DSS_DEFAULT	64
 #define DSS_MONO	128
 #define	DSS_HIDEPREFIX	0x0200
 #define	DSS_PREFIXONLY	0x0400
@@ -869,8 +864,6 @@
 #endif
 #define QS_SENDMESSAGE 64
 #define QS_TIMER 16
-/* Extra (undocumented) queue wake bits - see "Undoc. Windows" */
-#define QS_SMRESULT 0x8000
 
 #define USER_TIMER_MAXIMUM  2147483647
 #define USER_TIMER_MINIMUM  10
@@ -1142,7 +1135,6 @@
 #define MSGF_NEXTWINDOW 6
 #define MSGF_MAINLOOP 8
 #define MSGF_USER 4096
-#define MSGF_MAX  8
 #define MOUSEEVENTF_MOVE 1
 #define MOUSEEVENTF_LEFTDOWN 2
 #define MOUSEEVENTF_LEFTUP 4
@@ -1150,8 +1142,6 @@
 #define MOUSEEVENTF_RIGHTUP 16
 #define MOUSEEVENTF_MIDDLEDOWN 32
 #define MOUSEEVENTF_MIDDLEUP 64
-#define MOUSEEVENTF_XDOWN 128
-#define MOUSEEVENTF_XUP 256
 #define MOUSEEVENTF_WHEEL 0x0800
 #define MOUSEEVENTF_ABSOLUTE 32768
 #define PM_NOREMOVE 0
@@ -1212,10 +1202,6 @@
 #define SWP_NOSENDCHANGING 1024
 #define SWP_DEFERERASE 8192
 #define SWP_ASYNCWINDOWPOS  16384
-/* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE 0x0800
-#define SWP_NOCLIENTMOVE 0x1000
-#define SWP_STATECHANGED 0x8000
 
 #define HSHELL_WINDOWCREATED 1
 #define HSHELL_WINDOWDESTROYED 2
@@ -1574,9 +1560,6 @@
 #define WM_ACTIVATE 6
 #define WM_SETFOCUS 7
 #define WM_KILLFOCUS 8
-#ifdef _WINE
-#define WM_SETVISIBLE 9
-#endif
 #define WM_ENABLE 10
 #define WM_SETREDRAW 11
 #define WM_SETTEXT 12
@@ -1616,8 +1599,6 @@
 #define WM_GETFONT 49
 #define WM_SETHOTKEY 50
 #define WM_GETHOTKEY 51
-#define WM_ISACTIVEICON 53
-#define WM_QUERYPARKICON 54
 #define WM_QUERYDRAGICON 55
 #define WM_COMPAREITEM 57
 #if (WINVER >= 0x0500)
@@ -1672,7 +1653,6 @@
 #define WM_NCXBUTTONDBLCLK 173
 #endif /* (_WIN32_WINNT >= 0x0500) */
 
-#define WM_KEYF1 0x004d
 #define WM_KEYFIRST 256
 #define WM_KEYDOWN 256
 #define WM_KEYUP 257
@@ -1706,7 +1686,6 @@
 #define WM_VSCROLL 277
 #define WM_INITMENU 278
 #define WM_INITMENUPOPUP 279
-#define WM_SYSTIMER 280
 #define WM_MENUSELECT 287
 #define WM_MENUCHAR 288
 #define WM_ENTERIDLE 289
@@ -1726,15 +1705,6 @@
 #endif /* _WIN32_WCE */
 #endif /* (WINVER >= 0x0500) */
 
-/* D&D messages */
-#define WM_DROPOBJECT	    0x022A
-#define WM_QUERYDROPOBJECT  0x022B
-#define WM_BEGINDRAG	    0x022C
-#define WM_DRAGLOOP	    0x022D
-#define WM_DRAGSELECT	    0x022E
-#define WM_DRAGMOVE	    0x022F
-
-#define WM_CTLCOLOR 25
 #define WM_CTLCOLORMSGBOX 306
 #define WM_CTLCOLOREDIT 307
 #define WM_CTLCOLORLISTBOX 308
@@ -1745,7 +1715,6 @@
 #define MN_GETHMENU 481
 #define WM_MOUSEFIRST 512
 #define WM_MOUSEMOVE 512
-#define WM_LBTRACKPOINT 0x0131
 #define WM_LBUTTONDOWN 513
 #define WM_LBUTTONUP 514
 #define WM_LBUTTONDBLCLK 515
@@ -1834,7 +1803,6 @@
 #define WM_HOTKEY 786
 #define WM_PRINT 791
 #define WM_PRINTCLIENT 792
-#define WM_APPCOMMAND 793
 
 #define WM_DWMCOMPOSITIONCHANGED 0x031E
 #define WM_DWMNCRENDERINGCHANGED 0x031F
@@ -1851,8 +1819,6 @@
 #define WM_APP 32768
 #define WM_GETTITLEBARINFOEX 0x033F
 
-#define XBUTTON1      0x0001
-#define XBUTTON2      0x0002
 
 #if (_WIN32_WINNT >= 0x0400)
 #define WHEEL_DELTA 120
@@ -1916,7 +1882,6 @@
 #define CB_SETLOCALE 345
 #define CB_SETTOPINDEX 348
 #define CB_SHOWDROPDOWN 335
-#define CB_MSGMAX 357
 #define CBN_CLOSEUP 8
 #define CBN_DBLCLK 2
 #define CBN_DROPDOWN 7
@@ -1978,7 +1943,6 @@
 #define LB_ADDFILE 406
 #define LB_ADDSTRING 384
 #ifdef _WINE
-#define LB_CARETON 419
 #define LB_CARETOFF 420
 #endif
 #define LB_DELETESTRING 386
@@ -2226,7 +2190,6 @@
 #define VK_F24	0x87
 #define VK_NUMLOCK	0x90
 #define VK_SCROLL	0x91
-#define VK_OEM_NEC_EQUAL	0x92
 #define VK_LSHIFT	0xA0
 #define VK_RSHIFT	0xA1
 #define VK_LCONTROL	0xA2
@@ -3852,14 +3815,13 @@
 BOOL WINAPI BringWindowToTop(HWND);
 long WINAPI BroadcastSystemMessage(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
 #if (_WIN32_WINNT >= 0x0400)
-LONG WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-LONG WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
+long WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
+long WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
 #endif /* (_WIN32_WINNT >= 0x0400) */
 #if (_WIN32_WINNT >= 0x0501)
-LONG WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
-LONG WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
+long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
+long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
 #endif /* (_WIN32_WINNT >= 0x0501) */
-void WINAPI CalcChildScroll(HWND, INT);
 BOOL WINAPI CallMsgFilterA(LPMSG,INT);
 BOOL WINAPI CallMsgFilterW(LPMSG,INT);
 LRESULT WINAPI CallNextHookEx(HHOOK,int,WPARAM,LPARAM);
@@ -3943,8 +3905,8 @@
 HWND WINAPI
CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
 HWND WINAPI
CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
 #ifndef NOWINDOWSTATION
-HWINSTA WINAPI CreateWindowStationA(LPCSTR,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
-HWINSTA WINAPI CreateWindowStationW(LPCWSTR,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
+HWINSTA WINAPI CreateWindowStationA(LPSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
+HWINSTA WINAPI CreateWindowStationW(LPWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
 #endif
 LRESULT WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
 LRESULT WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
@@ -4089,7 +4051,7 @@
 HDC WINAPI GetDC(HWND);
 HDC WINAPI GetDCEx(HWND,HRGN,DWORD);
 HWND WINAPI GetDesktopWindow(void);
-LONG WINAPI GetDialogBaseUnits(void);
+long WINAPI GetDialogBaseUnits(void);
 int WINAPI GetDlgCtrlID(HWND);
 HWND WINAPI GetDlgItem(HWND,int);
 UINT WINAPI GetDlgItemInt(HWND,int,PBOOL,BOOL);
@@ -4265,7 +4227,6 @@
 BOOL WINAPI IsZoomed(HWND);
 VOID WINAPI keybd_event(BYTE,BYTE,DWORD,ULONG_PTR);
 BOOL WINAPI KillTimer(HWND,UINT_PTR);
-BOOL WINAPI KillSystemTimer(HWND,UINT_PTR);
 HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
 HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
 HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
@@ -4325,12 +4286,12 @@
 BOOL WINAPI OemToCharW(LPCSTR,LPWSTR);
 BOOL WINAPI OffsetRect(LPRECT,int,int);
 BOOL WINAPI OpenClipboard(HWND);
-HDESK WINAPI OpenDesktopA(LPCSTR,DWORD,BOOL,DWORD);
-HDESK WINAPI OpenDesktopW(LPCWSTR,DWORD,BOOL,DWORD);
+HDESK WINAPI OpenDesktopA(LPSTR,DWORD,BOOL,DWORD);
+HDESK WINAPI OpenDesktopW(LPWSTR,DWORD,BOOL,DWORD);
 BOOL WINAPI OpenIcon(HWND);
 HDESK WINAPI OpenInputDesktop(DWORD,BOOL,DWORD);
-HWINSTA WINAPI OpenWindowStationA(LPCSTR,BOOL,DWORD);
-HWINSTA WINAPI OpenWindowStationW(LPCWSTR,BOOL,DWORD);
+HWINSTA WINAPI OpenWindowStationA(LPSTR,BOOL,DWORD);
+HWINSTA WINAPI OpenWindowStationW(LPWSTR,BOOL,DWORD);
 BOOL WINAPI PaintDesktop(HDC);
 BOOL WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT);
 BOOL WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT);
@@ -4376,7 +4337,6 @@
 HANDLE WINAPI RemovePropW(HWND,LPCWSTR);
 BOOL WINAPI ReplyMessage(LRESULT);
 BOOL WINAPI ScreenToClient(HWND,LPPOINT);
-VOID WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM);
 BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT);
 BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
 int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
@@ -4412,7 +4372,6 @@
 HCURSOR WINAPI SetCursor(HCURSOR);
 BOOL WINAPI SetCursorPos(int,int);
 VOID WINAPI SetDebugErrorLevel(DWORD);
-BOOL WINAPI SetDeskWallPaper(LPCSTR);
 BOOL WINAPI SetDlgItemInt(HWND,int,UINT,BOOL);
 BOOL WINAPI SetDlgItemTextA(HWND,int,LPCSTR);
 BOOL WINAPI SetDlgItemTextW(HWND,int,LPCWSTR);
@@ -4445,10 +4404,8 @@
 DWORD WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD);
 #define SetSysModalWindow(h) (NULL)
 BOOL WINAPI SetSystemCursor(HCURSOR,DWORD);
-BOOL WINAPI SetSystemMenu(HWND,HMENU);
 BOOL WINAPI SetThreadDesktop(HDESK);
 UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC);
-UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);
 BOOL WINAPI SetUserObjectInformationA(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectInformationW(HANDLE,int,PVOID,DWORD);
 BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);