Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
#ifndef __SQLTYPES
|
|
|
|
#define __SQLTYPES
|
2005-05-08 17:44:37 +00:00
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#define SQL_API __stdcall
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#ifndef RC_INVOKED
|
|
|
|
#define __need_wchar_t
|
|
|
|
#include <stddef.h>
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
typedef signed char SCHAR;
|
|
|
|
typedef long SDWORD;
|
|
|
|
typedef short SWORD;
|
|
|
|
typedef ULONG UDWORD;
|
|
|
|
typedef USHORT UWORD;
|
|
|
|
typedef signed long SLONG;
|
|
|
|
typedef signed short SSHORT;
|
|
|
|
typedef double SDOUBLE;
|
|
|
|
typedef double LDOUBLE;
|
|
|
|
typedef float SFLOAT;
|
|
|
|
typedef PVOID PTR;
|
|
|
|
typedef PVOID HENV;
|
|
|
|
typedef PVOID HDBC;
|
|
|
|
typedef PVOID HSTMT;
|
|
|
|
typedef short RETCODE;
|
|
|
|
typedef UCHAR SQLCHAR;
|
|
|
|
typedef SDWORD SQLINTEGER;
|
|
|
|
typedef SWORD SQLSMALLINT;
|
|
|
|
typedef UDWORD SQLUINTEGER;
|
|
|
|
typedef UWORD SQLUSMALLINT;
|
|
|
|
typedef PVOID SQLPOINTER;
|
|
|
|
typedef void* SQLHENV;
|
|
|
|
typedef void* SQLHDBC;
|
|
|
|
typedef void* SQLHSTMT;
|
|
|
|
typedef SQLSMALLINT SQLRETURN;
|
|
|
|
typedef HWND SQLHWND;
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#ifdef _WIN64
|
|
|
|
typedef INT64 SQLLEN;
|
|
|
|
typedef UINT64 SQLULEN;
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
typedef UINT64 SQLSETPOSIROW;
|
2005-05-08 17:44:37 +00:00
|
|
|
#else
|
|
|
|
#define SQLLEN SQLINTEGER
|
|
|
|
#define SQLULEN SQLUINTEGER
|
|
|
|
#define SQLSETPOSIROW SQLUSMALLINT
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
#endif /* _WIN64 */
|
|
|
|
|
|
|
|
typedef SQLULEN BOOKMARK;
|
|
|
|
typedef SQLLEN SQLROWOFFSET;
|
|
|
|
typedef SQLULEN SQLROWCOUNT;
|
|
|
|
typedef SQLULEN SQLTRANSID;
|
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
typedef wchar_t SQLWCHAR;
|
|
|
|
#ifdef UNICODE
|
|
|
|
typedef SQLWCHAR SQLTCHAR;
|
|
|
|
#else
|
|
|
|
typedef SQLCHAR SQLTCHAR;
|
|
|
|
#endif /* UNICODE */
|
|
|
|
|
|
|
|
typedef struct tagDATE_STRUCT {
|
|
|
|
SQLSMALLINT year;
|
|
|
|
SQLUSMALLINT month;
|
|
|
|
SQLUSMALLINT day;
|
|
|
|
} DATE_STRUCT;
|
|
|
|
typedef struct tagTIME_STRUCT {
|
|
|
|
SQLUSMALLINT hour;
|
|
|
|
SQLUSMALLINT minute;
|
|
|
|
SQLUSMALLINT second;
|
|
|
|
} TIME_STRUCT;
|
|
|
|
typedef struct tagTIMESTAMP_STRUCT {
|
|
|
|
SQLSMALLINT year;
|
|
|
|
SQLUSMALLINT month;
|
|
|
|
SQLUSMALLINT day;
|
|
|
|
SQLUSMALLINT hour;
|
|
|
|
SQLUSMALLINT minute;
|
|
|
|
SQLUSMALLINT second;
|
|
|
|
SQLUINTEGER fraction;
|
|
|
|
} TIMESTAMP_STRUCT;
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#if (ODBCVER >= 0x0300)
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
typedef SCHAR SQLSCHAR;
|
|
|
|
typedef void* SQLHANDLE;
|
|
|
|
typedef void* SQLHDESC;
|
|
|
|
typedef unsigned char SQLDATE;
|
|
|
|
typedef unsigned char SQLDECIMAL;
|
|
|
|
typedef double SQLDOUBLE;
|
|
|
|
typedef double SQLFLOAT;
|
|
|
|
typedef unsigned char SQLNUMERIC;
|
|
|
|
typedef float SQLREAL;
|
|
|
|
typedef unsigned char SQLTIME;
|
|
|
|
typedef unsigned char SQLTIMESTAMP;
|
|
|
|
typedef unsigned char SQLVARCHAR;
|
|
|
|
#define ODBCINT64 __int64
|
|
|
|
typedef __int64 SQLBIGINT;
|
|
|
|
typedef unsigned __int64 SQLUBIGINT;
|
2005-05-08 17:44:37 +00:00
|
|
|
typedef DATE_STRUCT SQL_DATE_STRUCT;
|
|
|
|
typedef TIME_STRUCT SQL_TIME_STRUCT;
|
|
|
|
typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
|
|
|
|
typedef enum {
|
|
|
|
SQL_IS_YEAR = 1,SQL_IS_MONTH,SQL_IS_DAY,SQL_IS_HOUR,
|
|
|
|
SQL_IS_MINUTE,SQL_IS_SECOND,SQL_IS_YEAR_TO_MONTH,SQL_IS_DAY_TO_HOUR,
|
|
|
|
SQL_IS_DAY_TO_MINUTE,SQL_IS_DAY_TO_SECOND,SQL_IS_HOUR_TO_MINUTE,
|
|
|
|
SQL_IS_HOUR_TO_SECOND,SQL_IS_MINUTE_TO_SECOND
|
|
|
|
} SQLINTERVAL;
|
|
|
|
typedef struct tagSQL_YEAR_MONTH {
|
|
|
|
SQLUINTEGER year;
|
|
|
|
SQLUINTEGER month;
|
|
|
|
} SQL_YEAR_MONTH_STRUCT;
|
|
|
|
typedef struct tagSQL_DAY_SECOND {
|
|
|
|
SQLUINTEGER day;
|
|
|
|
SQLUINTEGER hour;
|
|
|
|
SQLUINTEGER minute;
|
|
|
|
SQLUINTEGER second;
|
|
|
|
SQLUINTEGER fraction;
|
|
|
|
} SQL_DAY_SECOND_STRUCT;
|
|
|
|
typedef struct tagSQL_INTERVAL_STRUCT {
|
|
|
|
SQLINTERVAL interval_type;
|
|
|
|
SQLSMALLINT interval_sign;
|
|
|
|
union {
|
|
|
|
SQL_YEAR_MONTH_STRUCT year_month;
|
|
|
|
SQL_DAY_SECOND_STRUCT day_second;
|
|
|
|
} intval;
|
|
|
|
} SQL_INTERVAL_STRUCT;
|
|
|
|
#define SQL_MAX_NUMERIC_LEN 16
|
|
|
|
typedef struct tagSQL_NUMERIC_STRUCT {
|
|
|
|
SQLCHAR precision;
|
|
|
|
SQLSCHAR scale;
|
|
|
|
SQLCHAR sign;
|
|
|
|
SQLCHAR val[SQL_MAX_NUMERIC_LEN];
|
|
|
|
} SQL_NUMERIC_STRUCT;
|
|
|
|
#endif /* ODBCVER >= 0x0300 */
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#if (ODBCVER >= 0x0350)
|
|
|
|
|
|
|
|
#ifdef _GUID_DEFINED
|
|
|
|
# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined _GUID_DEFINED || defined GUID_DEFINED
|
|
|
|
typedef GUID SQLGUID;
|
|
|
|
#else
|
|
|
|
typedef struct tagSQLGUID{
|
|
|
|
DWORD Data1;
|
|
|
|
WORD Data2;
|
|
|
|
WORD Data3;
|
|
|
|
BYTE Data4[ 8 ];
|
|
|
|
} SQLGUID;
|
|
|
|
#endif /* GUID_DEFINED */
|
|
|
|
#endif /* ODBCVER >= 0x0350 */
|
|
|
|
#endif /* RC_INVOKED */
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
2005-05-08 17:44:37 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
Merge from amd64 branch:
40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes. (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)
svn path=/trunk/; revision=44614
2009-12-15 23:23:01 +00:00
|
|
|
|
|
|
|
#endif /* __SQLTYPES */
|