[fireball] 42573: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk.
Author: fireball Date: Sun Aug 9 22:23:50 2009 New Revision: 42573
URL: http://svn.reactos.org/svn/reactos?rev=42573&view=rev Log: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk.
Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h branches/arwinss/reactos/include/reactos/wine/windef.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/psdk/commctrl.h branches/arwinss/reactos/include/reactos/wine/winbase16.h branches/arwinss/reactos/include/reactos/wine/windef16.h
Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghel... ============================================================================== --- branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -31,7 +31,6 @@ #define WIN32_NO_STATUS #include "dbghelp_private.h" #include "winternl.h" -#include <exception.h> #include "wine/winbase16.h" #include "wine/debug.h"
Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winent... ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -14,10 +14,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winuser16.h" #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> +#include "winuser16.h" #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h"
Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/com... ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -3749,6 +3749,11 @@ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) +#define ListView_SetCheckState(hwndLV, i, bCheck) \ + { LVITEM _LVi; _LVi.state = INDEXTOSTATEIMAGEMASK((bCheck)?2:1); _LVi.stateMask = LVIS_STATEIMAGEMASK; \ + SNDMSG(hwndLV, LVM_SETITEMSTATE, (WPARAM)(UINT)(i), (LPARAM)(LPLVITEM)&_LVi);} +#define ListView_GetCheckState(hwndLV, i) \ + (((UINT)SNDMSG((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) >> 12) - 1) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \
Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/... ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */
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] Sun Aug 9 22:23:50 2009 @@ -165,6 +165,8 @@ DWORD dwAllocCount; } WINDEBUGINFO16, *LPWINDEBUGINFO16;
+/* definitions specific to Wine 16-bit relaying support */ + /* 32-bit stack layout after __wine_call_to_16() */ typedef struct _STACK32FRAME { @@ -202,6 +204,19 @@ 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>
#define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) @@ -301,6 +316,13 @@
#define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT) + + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL;
/* undocumented functions */ WORD WINAPI AllocCStoDSAlias16(WORD);
Removed: branches/arwinss/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos/... ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef.h (removed) @@ -1,1 +1,0 @@ -#include "../../psdk/windef.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] Sun Aug 9 22:23:50 2009 @@ -28,6 +28,9 @@ #endif #include <windef.h> #include <winbase.h> +#ifndef _NTNDK_ +#include <exception.h> // ROS Hack +#endif /* Standard data types */
typedef unsigned short BOOL16;
-
fireball＠svn.reactos.org