Skip to content

W
wine-cw
Commit b7258b2c authored by Jon Griffiths's avatar Jon Griffiths Committed by Alexandre Julliard
Browse files
Options

Add some missing types needed for the upcoming ocidl.idl.

Add missing variant types. Correct the definition of DECIMAL type.
parent 3453746a
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 0 deletions
include/wtypes.h
View file @ b7258b2c
...@@ -36,6 +36,12 @@ typedef float FLOAT; ...@@ -36,6 +36,12 @@ typedef float FLOAT;
typedef double DOUBLE; typedef double DOUBLE;
typedef long LONG_PTR, *PLONG_PTR;
typedef unsigned int UINT_PTR, *PUINT_PTR;
typedef unsigned long ULONG_PTR, *PULONG_PTR;
typedef void *PVOID, *LPVOID; typedef void *PVOID, *LPVOID;
typedef char CHAR; typedef char CHAR;
...@@ -54,6 +60,16 @@ typedef boolean BOOLEAN; ...@@ -54,6 +60,16 @@ typedef boolean BOOLEAN;
typedef void *HANDLE; typedef void *HANDLE;
typedef void *HACCEL;
typedef void *HDC;
typedef void *HFONT;
typedef void *HWND;
typedef void *HMENU;
typedef void *HMODULE; typedef void *HMODULE;
typedef void *HINSTANCE; typedef void *HINSTANCE;
...@@ -64,6 +80,8 @@ typedef void *HTASK; ...@@ -64,6 +80,8 @@ typedef void *HTASK;
typedef void *HKEY; typedef void *HKEY;
typedef LONG_PTR LRESULT;
typedef double DATE; typedef double DATE;
typedef LONG HRESULT; typedef LONG HRESULT;
...@@ -117,6 +135,54 @@ typedef struct _SECURITY_DESCRIPTOR { ...@@ -117,6 +135,54 @@ typedef struct _SECURITY_DESCRIPTOR {
PACL Dacl; PACL Dacl;
} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
typedef struct tagSIZE {
LONG cx;
LONG cy;
} SIZE, *PSIZE, *LPSIZE;
typedef SIZE SIZEL, *PSIZEL, *LPSIZEL;
typedef struct tagPOINT {
LONG x;
LONG y;
} POINT, *PPOINT, *LPPOINT;
typedef struct _POINTL {
LONG x;
LONG y;
} POINTL;
typedef struct tagRECT {
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECT, *PRECT, *LPRECT;
typedef const RECT *LPCRECT;
typedef struct _RECTL {
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECTL, *PRECTL, *LPRECTL;
typedef const RECTL *LPCRECTL;
typedef UINT_PTR WPARAM;
typedef LONG_PTR LPARAM;
typedef struct tagMSG {
HWND hwnd;
UINT message;
WPARAM wParam;
LPARAM lParam;
DWORD time;
POINT pt;
} MSG, *PMSG, *NPMSG, *LPMSG;
#endif /* winnt.h */ #endif /* winnt.h */
#ifndef _PALETTEENTRY_DEFINED #ifndef _PALETTEENTRY_DEFINED
#define _PALETTEENTRY_DEFINED #define _PALETTEENTRY_DEFINED
...@@ -145,6 +211,55 @@ typedef struct _FILETIME { ...@@ -145,6 +211,55 @@ typedef struct _FILETIME {
} FILETIME, *PFILETIME, *LPFILETIME; } FILETIME, *PFILETIME, *LPFILETIME;
#endif #endif
#ifndef _TEXTMETRIC_DEFINED
#define _TEXTMETRIC_DEFINED
typedef struct {
LONG tmHeight;
LONG tmAscent;
LONG tmDescent;
LONG tmInternalLeading;
LONG tmExternalLeading;
LONG tmAveCharWidth;
LONG tmMaxCharWidth;
LONG tmWeight;
LONG tmOverhang;
LONG tmDigitizedAspectX;
LONG tmDigitizedAspectY;
BYTE tmFirstChar;
BYTE tmLastChar;
BYTE tmDefaultChar;
BYTE tmBreakChar;
BYTE tmItalic;
BYTE tmUnderlined;
BYTE tmStruckOut;
BYTE tmPitchAndFamily;
BYTE tmCharSet;
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
typedef struct {
LONG tmHeight;
LONG tmAscent;
LONG tmDescent;
LONG tmInternalLeading;
LONG tmExternalLeading;
LONG tmAveCharWidth;
LONG tmMaxCharWidth;
LONG tmWeight;
LONG tmOverhang;
LONG tmDigitizedAspectX;
LONG tmDigitizedAspectY;
WCHAR tmFirstChar;
WCHAR tmLastChar;
WCHAR tmDefaultChar;
WCHAR tmBreakChar;
BYTE tmItalic;
BYTE tmUnderlined;
BYTE tmStruckOut;
BYTE tmPitchAndFamily;
BYTE tmCharSet;
} TEXTMETRICW, *LPTEXTMETRICW, *PTEXTMETRICW;
#endif
typedef WCHAR OLECHAR; typedef WCHAR OLECHAR;
typedef OLECHAR *LPOLESTR; typedef OLECHAR *LPOLESTR;
...@@ -548,6 +663,7 @@ typedef union tagCY { ...@@ -548,6 +663,7 @@ typedef union tagCY {
#endif #endif
typedef CY *LPCY; typedef CY *LPCY;
#if 0
typedef struct tagDEC { typedef struct tagDEC {
USHORT wReserved; USHORT wReserved;
BYTE scale; BYTE scale;
...@@ -556,6 +672,33 @@ typedef struct tagDEC { ...@@ -556,6 +672,33 @@ typedef struct tagDEC {
ULONGLONG Lo64; ULONGLONG Lo64;
} DECIMAL; } DECIMAL;
#else
typedef struct tagDEC {
USHORT wReserved;
union {
struct {
BYTE scale;
BYTE sign;
} DUMMYSTRUCTNAME;
USHORT signscale;
} DUMMYUNIONNAME;
ULONG Hi32;
union {
struct {
#ifdef WORDS_BIGENDIAN
ULONG Mid32;
ULONG Lo32;
#else
ULONG Lo32;
ULONG Mid32;
#endif
} DUMMYSTRUCTNAME1;
ULONGLONG Lo64;
} DUMMYUNIONNAME1;
} DECIMAL;
#endif
#define DECIMAL_NEG ((BYTE)0x80)
#define DECIMAL_SETZERO(d) do{ memset(((char*)(d)) + sizeof(USHORT), 0, sizeof(ULONG) * 3u); }while (0)
typedef DECIMAL *LPDECIMAL; typedef DECIMAL *LPDECIMAL;
typedef FLAGGED_WORD_BLOB *wireBSTR; typedef FLAGGED_WORD_BLOB *wireBSTR;
...@@ -628,6 +771,8 @@ enum VARENUM { ...@@ -628,6 +771,8 @@ enum VARENUM {
VT_LPSTR = 30, VT_LPSTR = 30,
VT_LPWSTR = 31, VT_LPWSTR = 31,
VT_RECORD = 36, VT_RECORD = 36,
VT_INT_PTR = 37,
VT_UINT_PTR = 38,
VT_FILETIME = 64, VT_FILETIME = 64,
VT_BLOB = 65, VT_BLOB = 65,
VT_STREAM = 66, VT_STREAM = 66,
......
include/wtypes.idl
View file @ b7258b2c
...@@ -48,6 +48,11 @@ typedef unsigned long ULONG; ...@@ -48,6 +48,11 @@ typedef unsigned long ULONG;
typedef float FLOAT; typedef float FLOAT;
typedef double DOUBLE; typedef double DOUBLE;
/* FIXME: This is wrong for WIN64 */
typedef long LONG_PTR, *PLONG_PTR;
typedef unsigned int UINT_PTR, *PUINT_PTR;
typedef unsigned long ULONG_PTR, *PULONG_PTR;
typedef void *PVOID, *LPVOID; typedef void *PVOID, *LPVOID;
typedef char CHAR; typedef char CHAR;
...@@ -64,12 +69,19 @@ typedef void *HANDLE; ...@@ -64,12 +69,19 @@ typedef void *HANDLE;
#define DECLARE_HANDLE(name) typedef void *name #define DECLARE_HANDLE(name) typedef void *name
#define DECLARE_WIREM_HANDLE(name) typedef [wire_marshal(wire##name)] void*name #define DECLARE_WIREM_HANDLE(name) typedef [wire_marshal(wire##name)] void*name
DECLARE_HANDLE(HACCEL);
DECLARE_HANDLE(HDC);
DECLARE_HANDLE(HFONT);
DECLARE_HANDLE(HWND);
DECLARE_HANDLE(HMENU);
DECLARE_HANDLE(HMODULE); DECLARE_HANDLE(HMODULE);
DECLARE_HANDLE(HINSTANCE); DECLARE_HANDLE(HINSTANCE);
DECLARE_HANDLE(HRGN); DECLARE_HANDLE(HRGN);
DECLARE_HANDLE(HTASK); DECLARE_HANDLE(HTASK);
DECLARE_HANDLE(HKEY); DECLARE_HANDLE(HKEY);
typedef LONG_PTR LRESULT;
typedef double DATE; typedef double DATE;
typedef LONG HRESULT; typedef LONG HRESULT;
typedef DWORD LCID; typedef DWORD LCID;
...@@ -118,6 +130,56 @@ typedef struct _SECURITY_DESCRIPTOR { ...@@ -118,6 +130,56 @@ typedef struct _SECURITY_DESCRIPTOR {
PACL Dacl; PACL Dacl;
} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; } SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
typedef struct tagSIZE
{
LONG cx;
LONG cy;
} SIZE, *PSIZE, *LPSIZE;
typedef SIZE SIZEL, *PSIZEL, *LPSIZEL;
typedef struct tagPOINT
{
LONG x;
LONG y;
} POINT, *PPOINT, *LPPOINT;
typedef struct _POINTL
{
LONG x;
LONG y;
} POINTL;
typedef struct tagRECT
{
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECT, *PRECT, *LPRECT;
typedef const RECT *LPCRECT;
typedef struct _RECTL
{
LONG left;
LONG top;
LONG right;
LONG bottom;
} RECTL, *PRECTL, *LPRECTL;
typedef const RECTL *LPCRECTL;
typedef UINT_PTR WPARAM;
typedef LONG_PTR LPARAM;
typedef struct tagMSG
{
HWND hwnd;
UINT message;
WPARAM wParam;
LPARAM lParam;
DWORD time;
POINT pt;
} MSG, *PMSG, *NPMSG, *LPMSG;
cpp_quote("#endif /* winnt.h */") cpp_quote("#endif /* winnt.h */")
cpp_quote("#ifndef _PALETTEENTRY_DEFINED") cpp_quote("#ifndef _PALETTEENTRY_DEFINED")
...@@ -148,6 +210,57 @@ typedef struct _FILETIME { ...@@ -148,6 +210,57 @@ typedef struct _FILETIME {
} FILETIME, *PFILETIME, *LPFILETIME; } FILETIME, *PFILETIME, *LPFILETIME;
cpp_quote("#endif") cpp_quote("#endif")
cpp_quote("#ifndef _TEXTMETRIC_DEFINED")
cpp_quote("#define _TEXTMETRIC_DEFINED")
typedef struct
{
LONG tmHeight;
LONG tmAscent;
LONG tmDescent;
LONG tmInternalLeading;
LONG tmExternalLeading;
LONG tmAveCharWidth;
LONG tmMaxCharWidth;
LONG tmWeight;
LONG tmOverhang;
LONG tmDigitizedAspectX;
LONG tmDigitizedAspectY;
BYTE tmFirstChar;
BYTE tmLastChar;
BYTE tmDefaultChar;
BYTE tmBreakChar;
BYTE tmItalic;
BYTE tmUnderlined;
BYTE tmStruckOut;
BYTE tmPitchAndFamily;
BYTE tmCharSet;
} TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
typedef struct
{
LONG tmHeight;
LONG tmAscent;
LONG tmDescent;
LONG tmInternalLeading;
LONG tmExternalLeading;
LONG tmAveCharWidth;
LONG tmMaxCharWidth;
LONG tmWeight;
LONG tmOverhang;
LONG tmDigitizedAspectX;
LONG tmDigitizedAspectY;
WCHAR tmFirstChar;
WCHAR tmLastChar;
WCHAR tmDefaultChar;
WCHAR tmBreakChar;
BYTE tmItalic;
BYTE tmUnderlined;
BYTE tmStruckOut;
BYTE tmPitchAndFamily;
BYTE tmCharSet;
} TEXTMETRICW, *LPTEXTMETRICW, *PTEXTMETRICW;
cpp_quote("#endif")
/******************** BASIC COM/OLE TYPES ********************/ /******************** BASIC COM/OLE TYPES ********************/
typedef WCHAR OLECHAR; typedef WCHAR OLECHAR;
...@@ -503,6 +616,7 @@ cpp_quote("#endif") ...@@ -503,6 +616,7 @@ cpp_quote("#endif")
typedef CY *LPCY; typedef CY *LPCY;
cpp_quote("#if 0") /* for IDL only */
typedef struct tagDEC { typedef struct tagDEC {
USHORT wReserved; USHORT wReserved;
BYTE scale; BYTE scale;
...@@ -510,6 +624,34 @@ typedef struct tagDEC { ...@@ -510,6 +624,34 @@ typedef struct tagDEC {
ULONG Hi32; ULONG Hi32;
ULONGLONG Lo64; ULONGLONG Lo64;
} DECIMAL; } DECIMAL;
cpp_quote("#else") /* C/C++ defs */
cpp_quote("typedef struct tagDEC {")
cpp_quote(" USHORT wReserved;")
cpp_quote(" union {")
cpp_quote(" struct {")
cpp_quote(" BYTE scale;")
cpp_quote(" BYTE sign;")
cpp_quote(" } DUMMYSTRUCTNAME;")
cpp_quote(" USHORT signscale;")
cpp_quote(" } DUMMYUNIONNAME;")
cpp_quote(" ULONG Hi32;")
cpp_quote(" union {")
cpp_quote(" struct {")
cpp_quote("#ifdef WORDS_BIGENDIAN")
cpp_quote(" ULONG Mid32;")
cpp_quote(" ULONG Lo32;")
cpp_quote("#else")
cpp_quote(" ULONG Lo32;")
cpp_quote(" ULONG Mid32;")
cpp_quote("#endif")
cpp_quote(" } DUMMYSTRUCTNAME1;")
cpp_quote(" ULONGLONG Lo64;")
cpp_quote(" } DUMMYUNIONNAME1;")
cpp_quote("} DECIMAL;")
cpp_quote("#endif")
cpp_quote("#define DECIMAL_NEG ((BYTE)0x80)")
cpp_quote("#define DECIMAL_SETZERO(d) do{ memset(((char*)(d)) + sizeof(USHORT), 0, sizeof(ULONG) * 3u); }while (0)")
typedef DECIMAL *LPDECIMAL; typedef DECIMAL *LPDECIMAL;
typedef [unique] FLAGGED_WORD_BLOB *wireBSTR; typedef [unique] FLAGGED_WORD_BLOB *wireBSTR;
...@@ -576,6 +718,8 @@ enum VARENUM { ...@@ -576,6 +718,8 @@ enum VARENUM {
VT_LPSTR = 30, VT_LPSTR = 30,
VT_LPWSTR = 31, VT_LPWSTR = 31,
VT_RECORD = 36, VT_RECORD = 36,
VT_INT_PTR = 37,
VT_UINT_PTR = 38,
VT_FILETIME = 64, VT_FILETIME = 64,
VT_BLOB = 65, VT_BLOB = 65,
VT_STREAM = 66, VT_STREAM = 66,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment