Added WM_TCARD and DWORDLONG.
diff --git a/include/windef.h b/include/windef.h index f567cd1..af82633 100644 --- a/include/windef.h +++ b/include/windef.h
@@ -160,8 +160,6 @@ typedef int BOOL; typedef double DATE; typedef double DOUBLE; -typedef double LONGLONG; -typedef double ULONGLONG; /* FIXME: Wine does not compile with strict on, therefore strict * handles are presently only usable on machines where sizeof(UINT) ==
diff --git a/include/winnt.h b/include/winnt.h index 93524cd..c735316 100644 --- a/include/winnt.h +++ b/include/winnt.h
@@ -7,6 +7,7 @@ #ifndef __WINE_WINNT_H #define __WINE_WINNT_H +#include "basetsd.h" #include "windef.h" #ifndef RC_INVOKED @@ -142,6 +143,17 @@ typedef BYTE BOOLEAN; typedef BOOLEAN *PBOOLEAN; +#ifndef _DWORDLONG_ +#define _DWORDLONG_ +typedef __uint64 DWORDLONG, *PDWORDLONG; +#endif + +#ifndef _ULONGLONG_ +#define _ULONGLONG_ +typedef __int64 LONGLONG, *PLONGLONG; +typedef __uint64 ULONGLONG, *PULONGLONG; +#endif + typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink;
diff --git a/include/winuser.h b/include/winuser.h index 06b3a6c..926f627 100644 --- a/include/winuser.h +++ b/include/winuser.h
@@ -636,6 +636,7 @@ #define WM_COPYDATA 0x004a #define WM_CANCELJOURNAL 0x004b #define WM_NOTIFY 0x004e +#define WM_TCARD 0x0052 #define WM_HELP 0x0053 #define WM_NOTIFYFORMAT 0x0055
diff --git a/include/wtypes.h b/include/wtypes.h index 32e66f5..4aa88a8 100644 --- a/include/wtypes.h +++ b/include/wtypes.h
@@ -5,11 +5,9 @@ #ifndef __WINE_WTYPES_H #define __WINE_WTYPES_H - -#include "windef.h" +#include "basetsd.h" #include "rpc.h" - typedef WORD CLIPFORMAT, *LPCLIPFORMAT; typedef CHAR OLECHAR16; @@ -27,6 +25,17 @@ typedef BSTR16 *LPBSTR16; typedef BSTR *LPBSTR; +#ifndef _DWORDLONG_ +#define _DWORDLONG_ +typedef __uint64 DWORDLONG, *PDWORDLONG; +#endif + +#ifndef _ULONGLONG_ +#define _ULONGLONG_ +typedef __int64 LONGLONG, *PLONGLONG; +typedef __uint64 ULONGLONG, *PULONGLONG; +#endif + #define OLESTR16(x) x #define OLESTR(x) L##x