18 Jul
2009
18 Jul
'09
5:54 p.m.
Author: fireball
Date: Sat Jul 18 19:54:20 2009
New Revision: 42053
URL: http://svn.reactos.org/svn/reactos?rev=42053&view=rev
Log:
- Update headers.
- Remove ROS HACK from windef16.h.
- Add an empty placeholder header file rosuser.h.
Added:
branches/arwinss/reactos/include/reactos/win32k/rosuser.h (with props)
Modified:
branches/arwinss/reactos/include/psdk/winuser.h
branches/arwinss/reactos/include/reactos/wine/winbase16.h
branches/arwinss/reactos/include/reactos/wine/windef16.h
Modified: branches/arwinss/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi…
==============================================================================
--- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sat Jul 18 19:54:20 2009
@@ -525,6 +525,7 @@
#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
@@ -1142,6 +1143,7 @@
#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
@@ -1611,6 +1613,7 @@
#define WM_GETFONT 49
#define WM_SETHOTKEY 50
#define WM_GETHOTKEY 51
+#define WM_QUERYPARKICON 54
#define WM_QUERYDRAGICON 55
#define WM_COMPAREITEM 57
#if (WINVER >= 0x0500)
@@ -2012,11 +2015,12 @@
#define SBM_ENABLE_ARROWS 228
#define SBM_GETPOS 225
#define SBM_GETRANGE 227
+#define SBM_SETSCROLLINFO 233
#define SBM_GETSCROLLINFO 234
+#define SBM_GETSCROLLBARINFO 235
#define SBM_SETPOS 224
#define SBM_SETRANGE 226
#define SBM_SETRANGEREDRAW 230
-#define SBM_SETSCROLLINFO 233
#define STM_GETICON 369
#define STM_GETIMAGE 371
#define STM_SETICON 368
@@ -3803,12 +3807,12 @@
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);
@@ -3971,7 +3975,7 @@
BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
-BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
#if defined(_WINGDI_) && !defined(NOGDI)
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
@@ -4114,8 +4118,8 @@
#define GetSysModalWindow() (NULL)
HMENU WINAPI GetSystemMenu(HWND,BOOL);
int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,const INT *);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,const INT *);
LONG WINAPI GetWindowLongA(HWND,int);
LONG WINAPI GetWindowLongW(HWND,int);
#ifdef _WIN64
@@ -4255,12 +4259,12 @@
int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
-int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
+INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA);
+INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW);
BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
-HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
+HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD);
HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
@@ -4313,7 +4317,7 @@
HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
#endif
BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
-BOOL WINAPI RegisterLogonProcess(DWORD,BOOL);
+BOOL WINAPI RegisterLogonProcess(HANDLE,BOOL);
#if (_WIN32_WINNT >= 0x0501)
BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT);
#endif
@@ -4439,8 +4443,8 @@
#endif /* (_WIN32_WINNT >= 0x0500) */
BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,const INT *,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,const INT *,int);
WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
int WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT);
int WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL);
Added: branches/arwinss/reactos/include/reactos/win32k/rosuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
(empty)
Propchange: branches/arwinss/reactos/include/reactos/win32k/rosuser.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/arwinss/reactos/include/reactos/wine/winbase16.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sat Jul 18
19:54:20 2009
@@ -164,58 +164,6 @@
DWORD dwAllocBreak;
DWORD dwAllocCount;
} WINDEBUGINFO16, *LPWINDEBUGINFO16;
-
-/* definitions specific to Wine 16-bit relaying support */
-
-/* 32-bit stack layout after __wine_call_to_16() */
-typedef struct _STACK32FRAME
-{
- DWORD restore_addr; /* 00 return address for restoring code selector */
- DWORD codeselector; /* 04 code selector to restore */
- EXCEPTION_REGISTRATION_RECORD frame; /* 08 Exception frame */
- SEGPTR frame16; /* 10 16-bit frame from last CallFrom16() */
- DWORD edi; /* 14 saved registers */
- DWORD esi; /* 18 */
- DWORD ebx; /* 1c */
- DWORD ebp; /* 20 saved 32-bit frame pointer */
- DWORD retaddr; /* 24 return address */
- DWORD target; /* 28 target address / CONTEXT86 pointer */
- DWORD nb_args; /* 2c number of 16-bit argument bytes */
-} STACK32FRAME;
-
-/* 16-bit stack layout after __wine_call_from_16() */
-typedef struct _STACK16FRAME
-{
- STACK32FRAME *frame32; /* 00 32-bit frame from last CallTo16() */
- DWORD edx; /* 04 saved registers */
- DWORD ecx; /* 08 */
- DWORD ebp; /* 0c */
- WORD ds; /* 10 */
- WORD es; /* 12 */
- WORD fs; /* 14 */
- WORD gs; /* 16 */
- DWORD callfrom_ip; /* 18 callfrom tail IP */
- DWORD module_cs; /* 1c module code segment */
- DWORD relay; /* 20 relay function address */
- WORD entry_ip; /* 22 entry point IP */
- DWORD entry_point; /* 26 API entry point to call, reused as mutex count
*/
- WORD bp; /* 2a 16-bit stack frame chain */
- WORD ip; /* 2c return address */
- WORD cs; /* 2e */
-} STACK16FRAME;
-
-/* argument type flags for relay debugging */
-enum arg_types
-{
- ARG_NONE = 0, /* indicates end of arg list */
- ARG_WORD, /* unsigned word */
- ARG_SWORD, /* signed word */
- ARG_LONG, /* long or segmented pointer */
- ARG_PTR, /* linear pointer */
- ARG_STR, /* linear pointer to null-terminated string */
- ARG_SEGSTR, /* segmented pointer to null-terminated string */
- ARG_VARARG /* start of varargs */
-};
#include <poppack.h>
Modified: branches/arwinss/reactos/include/reactos/wine/windef16.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
--- branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sat Jul 18
19:54:20 2009
@@ -28,7 +28,6 @@
#endif
#include <windef.h>
#include <winbase.h>
-#include <exception.h> // ROS Hack
/* Standard data types */
typedef unsigned short BOOL16;