CVS: winex/include wtypes.h,1.4,1.5
[email protected] 14 Dec 2007 20:23:48 -0000
| Newsgroups | gmane.comp.emulators.winex.cvs |
|---|---|
| Message-ID | <[email protected]> |
Subject: winex/include wtypes.h,1.4,1.5Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv15976/include
Modified Files:
wtypes.h
Log Message:
Recompiled remaining IDL files with new widl.
Index: wtypes.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wtypes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wtypes.h 1 Apr 2004 13:34:30 -0000 1.4
+++ wtypes.h 14 Dec 2007 20:23:46 -0000 1.5
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from wtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from wtypes.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,112 +7,70 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "basetsd.h"
-#include "guiddef.h"
+#include <basetsd.h>
+#include <guiddef.h>
#if 0 /* winnt.h */
typedef unsigned char BYTE;
-
typedef unsigned short WORD;
-
typedef unsigned long DWORD;
-
typedef long BOOL;
-
typedef unsigned char UCHAR;
-
typedef int INT;
-
typedef unsigned int UINT;
-
typedef short SHORT;
-
typedef unsigned short USHORT;
-
typedef long LONG;
-
typedef unsigned long ULONG;
-
typedef float FLOAT;
-
typedef double DOUBLE;
-
-typedef void *PVOID, *LPVOID;
-
+typedef void *PVOID;
+typedef void *LPVOID;
typedef DWORD *LPDWORD;
-
typedef char CHAR;
-
typedef CHAR *LPSTR;
-
typedef const CHAR *LPCSTR;
-
typedef wchar_t WCHAR;
-
typedef WCHAR *LPWSTR;
-
typedef const WCHAR *LPCWSTR;
-
typedef boolean BOOLEAN;
-
typedef DWORD COLORREF;
-
typedef void *HANDLE;
-
typedef void *HACCEL;
-
typedef void *HDC;
-
typedef void *HFONT;
-
typedef void *HMENU;
-
typedef void *HWND;
-
typedef void *HMODULE;
-
typedef void *HINSTANCE;
-
typedef void *HICON;
-
typedef void *HRGN;
-
typedef void *HTASK;
-
typedef void *HKEY;
-
typedef double DATE;
-
typedef LONG HRESULT;
-
typedef DWORD LCID;
-
typedef unsigned __int64 DWORDLONG;
-
typedef __int64 LONGLONG;
-
typedef unsigned __int64 ULONGLONG;
-
typedef struct _LARGE_INTEGER {
LONGLONG QuadPart;
} LARGE_INTEGER;
-
typedef struct _ULARGE_INTEGER {
ULONGLONG QuadPart;
} ULARGE_INTEGER;
-
typedef struct _SID_IDENTIFIER_AUTHORITY {
UCHAR Value[6];
-} SID_IDENTIFIER_AUTHORITY, *PSID_IDENTIFIER_AUTHORITY;
-
+} SID_IDENTIFIER_AUTHORITY;
+typedef struct _SID_IDENTIFIER_AUTHORITY *PSID_IDENTIFIER_AUTHORITY;
typedef struct _SID {
UCHAR Revision;
UCHAR SubAuthorityCount;
SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
ULONG SubAuthority[1];
-} SID, *PSID;
-
-typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;
-
+} SID;
+typedef struct _SID *PSID;
+typedef USHORT SECURITY_DESCRIPTOR_CONTROL;
+typedef USHORT *PSECURITY_DESCRIPTOR_CONTROL;
typedef struct _ACL {
UCHAR AclRevision;
UCHAR Sbz1;
@@ -120,9 +78,7 @@
USHORT AceCount;
USHORT Sbz2;
} ACL;
-
typedef ACL *PACL;
-
typedef struct _SECURITY_DESCRIPTOR {
UCHAR Revision;
UCHAR Sbz1;
@@ -131,53 +87,55 @@
PSID Group;
PACL Sacl;
PACL Dacl;
-} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
-
+} SECURITY_DESCRIPTOR;
+typedef struct _SECURITY_DESCRIPTOR *PSECURITY_DESCRIPTOR;
typedef struct _SECURITY_ATTRIBUTES {
DWORD nLength;
LPVOID lpSecurityDescriptor;
BOOL bInheritHandle;
-} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
-
+} SECURITY_ATTRIBUTES;
+typedef struct _SECURITY_ATTRIBUTES *PSECURITY_ATTRIBUTES;
+typedef struct _SECURITY_ATTRIBUTES *LPSECURITY_ATTRIBUTES;
typedef struct tagSIZE {
LONG cx;
LONG cy;
-} SIZE, *PSIZE, *LPSIZE;
-
-typedef SIZE SIZEL, *PSIZEL, *LPSIZEL;
-
+} SIZE;
+typedef struct tagSIZE *PSIZE;
+typedef struct tagSIZE *LPSIZE;
+typedef SIZE SIZEL;
+typedef SIZE *PSIZEL;
+typedef SIZE *LPSIZEL;
typedef struct tagRECT {
LONG left;
LONG top;
LONG right;
LONG bottom;
-} RECT, *PRECT, *LPRECT;
-
+} RECT;
+typedef struct tagRECT *PRECT;
+typedef struct tagRECT *LPRECT;
typedef const RECT *LPCRECT;
-
typedef struct _RECTL {
LONG left;
LONG top;
LONG right;
LONG bottom;
-} RECTL, *PRECTL, *LPRECTL;
-
+} RECTL;
+typedef struct _RECTL *PRECTL;
+typedef struct _RECTL *LPRECTL;
typedef const RECTL *LPCRECTL;
-
typedef struct tagPOINT {
LONG x;
LONG y;
-} POINT, *PPOINT, *LPPOINT;
-
+} POINT;
+typedef struct tagPOINT *PPOINT;
+typedef struct tagPOINT *LPPOINT;
typedef struct _POINTL {
LONG x;
LONG y;
-} POINTL, *PPOINTL;
-
+} POINTL;
+typedef struct _POINTL *PPOINTL;
typedef UINT_PTR WPARAM;
-
typedef LONG_PTR LPARAM;
-
typedef struct tagMSG {
HWND hwnd;
UINT message;
@@ -185,8 +143,10 @@
LPARAM lParam;
DWORD time;
POINT pt;
-} MSG, *PMSG, *NPMSG, *LPMSG;
-
+} MSG;
+typedef struct tagMSG *PMSG;
+typedef struct tagMSG *NPMSG;
+typedef struct tagMSG *LPMSG;
#endif /* winnt.h */
#ifndef _PALETTEENTRY_DEFINED
#define _PALETTEENTRY_DEFINED
@@ -195,8 +155,9 @@
BYTE peGreen;
BYTE peBlue;
BYTE peFlags;
-} PALETTEENTRY, *PPALETTEENTRY, *LPPALETTEENTRY;
-
+} PALETTEENTRY;
+typedef struct tagPALETTEENTRY *PPALETTEENTRY;
+typedef struct tagPALETTEENTRY *LPPALETTEENTRY;
#endif
#ifndef _LOGPALETTE_DEFINED
#define _LOGPALETTE_DEFINED
@@ -204,37 +165,32 @@
WORD palVersion;
WORD palNumEntries;
PALETTEENTRY palPalEntry[1];
-} LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE;
-
+} LOGPALETTE;
+typedef struct tagLOGPALETTE *PLOGPALETTE;
+typedef struct tagLOGPALETTE *LPLOGPALETTE;
#endif
#ifndef _FILETIME_
#define _FILETIME_
typedef struct _FILETIME {
DWORD dwLowDateTime;
DWORD dwHighDateTime;
-} FILETIME, *PFILETIME, *LPFILETIME;
-
+} FILETIME;
+typedef struct _FILETIME *PFILETIME;
+typedef struct _FILETIME *LPFILETIME;
#endif
typedef WCHAR OLECHAR;
-
typedef OLECHAR *LPOLESTR;
-
typedef const OLECHAR *LPCOLESTR;
-
#ifndef __WINE__
#define OLESTR(str) WINE_UNICODE_TEXT(str)
#endif
typedef CHAR OLECHAR16;
-
typedef LPSTR LPOLESTR16;
-
typedef LPCSTR LPCOLESTR16;
-
typedef OLECHAR16 *BSTR16;
typedef BSTR16 *LPBSTR16;
#define OLESTR16(x) x
typedef LONG SCODE;
-
typedef struct _COAUTHIDENTITY {
USHORT *User;
ULONG UserLength;
@@ -244,7 +200,6 @@
ULONG PasswordLength;
ULONG Flags;
} COAUTHIDENTITY;
-
typedef struct _COAUTHINFO {
DWORD dwAuthnSvc;
DWORD dwAuthzSvc;
@@ -254,14 +209,12 @@
COAUTHIDENTITY *pAuthIdentityData;
DWORD dwCapabilities;
} COAUTHINFO;
-
typedef struct _COSERVERINFO {
DWORD dwReserved1;
LPWSTR pwszName;
COAUTHINFO *pAuthInfo;
DWORD dwReserved2;
} COSERVERINFO;
-
typedef enum tagMEMCTX {
MEMCTX_TASK = 1,
MEMCTX_SHARED = 2,
@@ -269,7 +222,6 @@
MEMCTX_UNKNOWN = -1,
MEMCTX_SAME = -2
} MEMCTX;
-
#ifndef _ROTFLAGS_DEFINED
#define _ROTFLAGS_DEFINED
#define ROTFLAGS_REGISTRATIONKEEPSALIVE 0x1
@@ -293,7 +245,6 @@
CLSCTX_ENABLE_AAA = 0x10000,
CLSCTX_FROM_DEFAULT_CONTEXT = 0x20000
} CLSCTX;
-
#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER)
#define CLSCTX_ALL (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
#define CLSCTX_SERVER (CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
@@ -303,7 +254,6 @@
MSHLFLAGS_TABLEWEAK = 2,
MSHLFLAGS_NOPING = 4
} MSHLFLAGS;
-
typedef enum tagMSHCTX {
MSHCTX_LOCAL = 0,
MSHCTX_NOSHAREDMEM = 1,
@@ -311,50 +261,39 @@
MSHCTX_INPROC = 3,
MSHCTX_CROSSCTX = 4
} MSHCTX;
-
typedef struct _BYTE_BLOB {
unsigned long clSize;
byte abData[1];
} BYTE_BLOB;
-
typedef BYTE_BLOB *UP_BYTE_BLOB;
-
typedef struct _FLAGGED_BYTE_BLOB {
unsigned long fFlags;
unsigned long clSize;
byte abData[1];
} FLAGGED_BYTE_BLOB;
-
typedef FLAGGED_BYTE_BLOB *UP_FLAGGED_BYTE_BLOB;
-
typedef struct _FLAGGED_WORD_BLOB {
unsigned long fFlags;
unsigned long clSize;
unsigned short asData[1];
} FLAGGED_WORD_BLOB;
-
typedef FLAGGED_WORD_BLOB *UP_FLAGGED_WORD_BLOB;
-
typedef struct _BYTE_SIZEDARR {
unsigned long clSize;
byte *pData;
} BYTE_SIZEDARR;
-
typedef struct _SHORT_SIZEDARR {
unsigned long clSize;
unsigned short *pData;
} WORD_SIZEDARR;
-
typedef struct _LONG_SIZEDARR {
unsigned long clSize;
unsigned long *pData;
} DWORD_SIZEDARR;
-
typedef struct _HYPER_SIZEDARR {
unsigned long clSize;
hyper *pData;
} HYPER_SIZEDARR;
-
#define WDT_INPROC_CALL (0x48746457)
#define WDT_REMOTE_CALL (0x52746457)
@@ -366,21 +305,13 @@
LPWSTR pwszName;
} u;
} userCLIPFORMAT;
-
typedef userCLIPFORMAT *wireCLIPFORMAT;
-
typedef WORD CLIPFORMAT;
-unsigned long __RPC_USER CLIPFORMAT_UserSize (unsigned long *, unsigned long, CLIPFORMAT *);
-unsigned char * __RPC_USER CLIPFORMAT_UserMarshal (unsigned long *, unsigned char *, CLIPFORMAT *);
-unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(unsigned long *, unsigned char *, CLIPFORMAT *);
-void __RPC_USER CLIPFORMAT_UserFree (unsigned long *, CLIPFORMAT *);
-
typedef struct tagRemHGLOBAL {
long fNullHGlobal;
unsigned long cbData;
byte data[1];
} RemHGLOBAL;
-
typedef struct _userHGLOBAL {
long fContext;
union {
@@ -389,9 +320,7 @@
long hGlobal;
} u;
} userHGLOBAL;
-
typedef userHGLOBAL *wireHGLOBAL;
-
typedef struct tagRemHMETAFILEPICT {
long mm;
long xExt;
@@ -399,7 +328,6 @@
unsigned long cbData;
byte data[1];
} RemHMETAFILEPICT;
-
typedef struct _userHMETAFILE {
long fContext;
union {
@@ -408,16 +336,13 @@
long hGlobal;
} u;
} userHMETAFILE;
-
typedef userHMETAFILE *wireHMETAFILE;
-
typedef struct _remoteMETAFILEPICT {
long mm;
long xExt;
long yExt;
userHMETAFILE *hMF;
} remoteMETAFILEPICT;
-
typedef struct _userHMETAFILEPICT {
long fContext;
union {
@@ -426,14 +351,11 @@
long hGlobal;
} u;
} userHMETAFILEPICT;
-
typedef userHMETAFILEPICT *wireHMETAFILEPICT;
-
typedef struct tagRemHENHMETAFILE {
unsigned long cbData;
byte data[1];
} RemHENHMETAFILE;
-
typedef struct _userHENHMETAFILE {
long fContext;
union {
@@ -442,14 +364,11 @@
long hGlobal;
} u;
} userHENHMETAFILE;
-
typedef userHENHMETAFILE *wireHENHMETAFILE;
-
typedef struct tagRemHBITMAP {
unsigned long cbData;
byte data[1];
} RemHBITMAP;
-
typedef struct _userBITMAP {
LONG bmType;
LONG bmWidth;
@@ -460,7 +379,6 @@
ULONG cbSize;
byte pBuffer[1];
} userBITMAP;
-
typedef struct _userHBITMAP {
long fContext;
union {
@@ -469,20 +387,16 @@
long hGlobal;
} u;
} userHBITMAP;
-
typedef userHBITMAP *wireHBITMAP;
-
typedef struct tagRemHPALETTE {
unsigned long cbData;
byte data[1];
} RemHPALETTE;
-
typedef struct tagrpcLOGPALETTE {
WORD palVersion;
WORD palNumEntries;
PALETTEENTRY palPalEntry[1];
} rpcLOGPALETTE;
-
typedef struct _userHPALETTE {
long fContext;
union {
@@ -491,58 +405,21 @@
long hGlobal;
} u;
} userHPALETTE;
-
typedef userHPALETTE *wireHPALETTE;
-
#if 0
typedef void *HGLOBAL;
-unsigned long __RPC_USER HGLOBAL_UserSize (unsigned long *, unsigned long, HGLOBAL *);
-unsigned char * __RPC_USER HGLOBAL_UserMarshal (unsigned long *, unsigned char *, HGLOBAL *);
-unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(unsigned long *, unsigned char *, HGLOBAL *);
-void __RPC_USER HGLOBAL_UserFree (unsigned long *, HGLOBAL *);
-
typedef HGLOBAL HLOCAL;
-
typedef void *HBITMAP;
-unsigned long __RPC_USER HBITMAP_UserSize (unsigned long *, unsigned long, HBITMAP *);
-unsigned char * __RPC_USER HBITMAP_UserMarshal (unsigned long *, unsigned char *, HBITMAP *);
-unsigned char * __RPC_USER HBITMAP_UserUnmarshal(unsigned long *, unsigned char *, HBITMAP *);
-void __RPC_USER HBITMAP_UserFree (unsigned long *, HBITMAP *);
-
typedef void *HPALETTE;
-unsigned long __RPC_USER HPALETTE_UserSize (unsigned long *, unsigned long, HPALETTE *);
-unsigned char * __RPC_USER HPALETTE_UserMarshal (unsigned long *, unsigned char *, HPALETTE *);
-unsigned char * __RPC_USER HPALETTE_UserUnmarshal(unsigned long *, unsigned char *, HPALETTE *);
-void __RPC_USER HPALETTE_UserFree (unsigned long *, HPALETTE *);
-
typedef void *HENHMETAFILE;
-unsigned long __RPC_USER HENHMETAFILE_UserSize (unsigned long *, unsigned long, HENHMETAFILE *);
-unsigned char * __RPC_USER HENHMETAFILE_UserMarshal (unsigned long *, unsigned char *, HENHMETAFILE *);
-unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(unsigned long *, unsigned char *, HENHMETAFILE *);
-void __RPC_USER HENHMETAFILE_UserFree (unsigned long *, HENHMETAFILE *);
-
typedef void *HMETAFILE;
-unsigned long __RPC_USER HMETAFILE_UserSize (unsigned long *, unsigned long, HMETAFILE *);
-unsigned char * __RPC_USER HMETAFILE_UserMarshal (unsigned long *, unsigned char *, HMETAFILE *);
-unsigned char * __RPC_USER HMETAFILE_UserUnmarshal(unsigned long *, unsigned char *, HMETAFILE *);
-void __RPC_USER HMETAFILE_UserFree (unsigned long *, HMETAFILE *);
-
#endif
typedef void *HMETAFILEPICT;
-unsigned long __RPC_USER HMETAFILEPICT_UserSize (unsigned long *, unsigned long, HMETAFILEPICT *);
-unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (unsigned long *, unsigned char *, HMETAFILEPICT *);
-unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(unsigned long *, unsigned char *, HMETAFILEPICT *);
-void __RPC_USER HMETAFILEPICT_UserFree (unsigned long *, HMETAFILEPICT *);
-
#if 0
typedef GUID *REFGUID;
-
typedef IID *REFIID;
-
typedef CLSID *REFCLSID;
-
typedef FMTID *REFFMTID;
-
#endif
typedef enum tagDVASPECT {
DVASPECT_CONTENT = 1,
@@ -550,7 +427,6 @@
DVASPECT_ICON = 4,
DVASPECT_DOCPRINT = 8
} DVASPECT;
-
typedef enum tagSTGC {
STGC_DEFAULT = 0,
STGC_OVERWRITE = 1,
@@ -558,24 +434,20 @@
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4,
STGC_CONSOLIDATE = 8
} STGC;
-
typedef enum tagSTGMOVE {
STGMOVE_MOVE = 0,
STGMOVE_COPY = 1,
STGMOVE_SHALLOWCOPY = 2
} STGMOVE;
-
typedef enum tagSTATFLAG {
STATFLAG_DEFAULT = 0,
STATFLAG_NONAME = 1,
STATFLAG_NOOPEN = 2
} STATFLAG;
-
#if 0
typedef struct tagCY {
LONGLONG int64;
} CY;
-
#else
typedef union tagCY {
struct {
@@ -591,7 +463,6 @@
} CY;
#endif
typedef CY *LPCY;
-
typedef struct tagDEC {
USHORT wReserved;
BYTE scale;
@@ -599,46 +470,32 @@
ULONG Hi32;
ULONGLONG Lo64;
} DECIMAL;
-
typedef DECIMAL *LPDECIMAL;
-
typedef FLAGGED_WORD_BLOB *wireBSTR;
-
typedef OLECHAR *BSTR;
-unsigned long __RPC_USER BSTR_UserSize (unsigned long *, unsigned long, BSTR *);
-unsigned char * __RPC_USER BSTR_UserMarshal (unsigned long *, unsigned char *, BSTR *);
-unsigned char * __RPC_USER BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR *);
-void __RPC_USER BSTR_UserFree (unsigned long *, BSTR *);
-
typedef BSTR *LPBSTR;
-
typedef short VARIANT_BOOL;
-
typedef VARIANT_BOOL _VARIANT_BOOL;
-
#define VARIANT_TRUE ((VARIANT_BOOL)0xFFFF)
#define VARIANT_FALSE ((VARIANT_BOOL)0x0000)
typedef struct tagBSTRBLOB {
ULONG cbSize;
BYTE *pData;
-} BSTRBLOB, *LPBSTRBLOB;
-
+} BSTRBLOB;
+typedef struct tagBSTRBLOB *LPBSTRBLOB;
typedef struct tagBLOB {
ULONG cbSize;
BYTE *pBlobData;
-} BLOB, *LPBLOB;
-
+} BLOB;
+typedef struct tagBLOB *LPBLOB;
typedef struct tagCLIPDATA {
ULONG cbSize;
long ulClipFmt;
BYTE *pClipData;
} CLIPDATA;
-
#define CBPCLIPDATA(cb) ((cb).cbSize - sizeof((cb).ulClipFmt))
typedef ULONG PROPID;
-
typedef unsigned short VARTYPE;
-
enum VARENUM {
VT_EMPTY = 0,
VT_NULL = 1,
@@ -691,6 +548,23 @@
VT_TYPEMASK = 0xfff
};
+void * __RPC_USER MIDL_user_allocate(size_t);
+void __RPC_USER MIDL_user_free(void *);
+
+/*****************************************************************************
+ * IWinTypes interface (v0.1)
+ */
+#ifndef __IWinTypes_INTERFACE_DEFINED__
+#define __IWinTypes_INTERFACE_DEFINED__
+
+
+#endif /* __IWinTypes_INTERFACE_DEFINED__ */
+
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif