18 May
2008
18 May
'08
3:17 p.m.
Author: hpoussin
Date: Sun May 18 10:17:12 2008
New Revision: 33582
URL: http://svn.reactos.org/svn/reactos?rev=33582&view=rev
Log:
Add ms-dtyp.idl file, and use it
Added:
trunk/reactos/include/reactos/idl/ms-dtyp.idl (with props)
Modified:
trunk/reactos/include/reactos/idl/idl.rbuild
trunk/reactos/include/reactos/idl/pnp.idl
trunk/reactos/include/reactos/idl/svcctl.idl
Modified: trunk/reactos/include/reactos/idl/idl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb…
==============================================================================
--- trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] Sun May 18 10:17:12 2008
@@ -7,7 +7,7 @@
<module name="pnp_client" type="rpcclient">
<file>pnp.idl</file>
</module>
-<module name="scm_server" type="rpcserver">
+<module name="scm_server" type="rpcserver"
allowwarnings="true">
<file>svcctl.idl</file>
</module>
<module name="scm_client" type="rpcclient">
@@ -19,7 +19,7 @@
<module name="eventlog_client" type="rpcclient" >
<file>eventlogrpc.idl</file>
</module>
-<module name="lsa_server" type="rpcserver">
+<module name="lsa_server" type="rpcserver"
allowwarnings="true">
<file>lsa.idl</file>
</module>
<module name="lsa_client" type="rpcclient">
Added: trunk/reactos/include/reactos/idl/ms-dtyp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty…
==============================================================================
--- trunk/reactos/include/reactos/idl/ms-dtyp.idl (added)
+++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sun May 18 10:17:12 2008
@@ -1,0 +1,283 @@
+cpp_quote("#ifndef _DTYP_IDL");
+cpp_quote("#define _DTYP_IDL");
+
+/* Common data types */
+
+typedef int BOOL, *PBOOL, *LPBOOL;
+typedef unsigned char BYTE, *PBYTE, *LPBYTE;
+typedef char CHAR, *PCHAR;
+typedef unsigned long DWORD, *PDWORD, *LPDWORD;
+typedef unsigned int DWORD32;
+typedef unsigned __int64 DWORD64;
+//typedef unsigned long error_status_t;
+typedef int INT, *LPINT;
+typedef signed char INT8;
+typedef signed short INT16;
+typedef signed int INT32;
+typedef signed __int64 INT64;
+typedef signed int LONG32;
+typedef signed __int64 LONG64;
+cpp_quote("#if 0");
+typedef long NTSTATUS;
+cpp_quote("#endif");
+typedef unsigned __int64 QWORD;
+typedef short SHORT;
+typedef __int64 TIME;
+typedef unsigned char UCHAR, *PUCHAR;
+typedef unsigned int UINT;
+typedef unsigned char UINT8;
+typedef unsigned short UINT16;
+typedef unsigned int UINT32;
+typedef unsigned __int64 UINT64;
+typedef unsigned long ULONG, *PULONG;
+typedef unsigned int ULONG32;
+typedef unsigned __int64 ULONG64;
+typedef unsigned __int64 ULONGLONG;
+typedef unsigned short USHORT;
+typedef unsigned short WORD, *PWORD, *LPWORD;
+typedef long LONG, *PLONG, *LPLONG;
+typedef signed __int64 LONGLONG;
+
+typedef float FLOAT;
+typedef double DOUBLE;
+
+typedef BYTE BOOLEAN, *PBOOLEAN;
+#ifdef _WIN64
+typedef __int64 LONG_PTR;
+typedef unsigned __int64 ULONG_PTR;
+#else
+typedef LONG LONG_PTR;
+typedef ULONG ULONG_PTR;
+#endif
+typedef ULONG_PTR SIZE_T;
+cpp_quote("#if 0");
+typedef UCHAR *STRING;
+cpp_quote("#endif");
+typedef DWORD NET_API_STATUS;
+typedef ULONG_PTR DWORD_PTR;
+typedef ULONGLONG DWORDLONG, *PDWORDLONG;
+typedef DWORD HCALL;
+//typedef DWORD HRESULT;
+
+typedef void *HANDLE;
+typedef void /*VOID,*/ *PVOID;
+typedef void *RPC_BINDING_HANDLE;
+typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE;
+
+typedef wchar_t WCHAR, *PWCHAR;
+cpp_quote("#if 0");
+typedef wchar_t UNICODE;
+cpp_quote("#endif");
+typedef const char *LPCSTR;
+typedef const wchar_t *LPCWSTR;
+typedef char *PSTR, *LPSTR;
+typedef wchar_t *LPWSTR, *PWSTR;
+typedef const wchar_t *LMCSTR;
+typedef WCHAR *LMSTR;
+typedef WCHAR *BSTR;
+
+cpp_quote("#if 0");
+#ifdef Unicode
+typedef LPCWSTR LPCTSTR;
+typedef LPWSTR LPTSTR;
+typedef WCHAR TCHAR;
+#else
+typedef LPCSTR LPCTSTR;
+typedef LPSTR LPTSTR;
+typedef CHAR TCHAR;
+#endif
+cpp_quote("#endif");
+
+/* Common data structures */
+
+cpp_quote("#if 0");
+
+typedef struct _FILETIME {
+ DWORD dwLowDateTime;
+ DWORD dwHighDateTime;
+} FILETIME, *PFILETIME, *LPFILETIME;
+
+typedef struct _GUID {
+ DWORD Data1;
+ WORD Data2;
+ WORD Data3;
+ BYTE Data4[8];
+} GUID, UUID, *PGUID;
+
+typedef struct _LARGE_INTEGER {
+ LONGLONG QuadPart;
+} LARGE_INTEGER, *PLARGE_INTEGER;
+
+typedef DWORD LCID;
+
+cpp_quote("#endif");
+
+typedef struct _RPC_UNICODE_STRING {
+ USHORT Length;
+ USHORT MaximumLength;
+ [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer;
+} RPC_UNICODE_STRING, *PRPC_UNICODE_STRING;
+
+cpp_quote("#if 0");
+
+typedef struct _SYSTEMTIME {
+ WORD wYear;
+ WORD wMonth;
+ WORD wDayOfWeek;
+ WORD wDay;
+ WORD wHour;
+ WORD wMinute;
+ WORD wSecond;
+ WORD wMilliseconds;
+} SYSTEMTIME, *PSYSTEMTIME;
+
+typedef struct _UINT128 {
+ UINT64 lower;
+ UINT64 upper;
+} UINT128, *PUINT128;
+
+typedef struct _ULARGE_INTEGER {
+ ULONGLONG QuadPart;
+} ULARGE_INTEGER, *PULARGE_INTEGER;
+
+typedef struct _UNICODE_STRING {
+ USHORT Length;
+ USHORT MaximumLength;
+ [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer;
+} UNICODE_STRING, *PUNICODE_STRING;
+
+cpp_quote("#endif");
+
+/* Constructed security types */
+
+cpp_quote("#if 0");
+
+typedef struct _SID_IDENTIFIER_AUTHORITY {
+ BYTE Value[6];
+} SID_IDENTIFIER_AUTHORITY;
+
+typedef struct _SID {
+ BYTE Revision;
+ BYTE SubAuthorityCount;
+ SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+ [size_is(SubAuthorityCount)] DWORD SubAuthority[*];
+} SID, *PSID;
+
+typedef struct _ACCESS_MASK {
+ DWORD ACCESS_MASK;
+} ACCESS_MASK, *PACCESS_MASK;
+
+typedef struct _ACE_HEADER {
+ UCHAR AceType;
+ UCHAR AceFlags;
+ USHORT AceSize;
+} ACE_HEADER, *PACE_HEADER;
+
+typedef struct _ACCESS_ALLOWED_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE;
+
+typedef struct _ACCESS_ALLOWED_OBJECT_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD Flags;
+ GUID ObjectType;
+ GUID InheritedObjectType;
+ DWORD SidStart;
+} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE;
+
+typedef struct _ACCESS_DENIED_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE;
+
+typedef struct _ACCESS_ALLOWED_CALLBACK_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} ACCESS_ALLOWED_CALLBACK_ACE, *PACCESS_ALLOWED_CALLBACK_ACE;
+
+typedef struct _ACCESS_DENIED_CALLBACK_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} ACCESS_DENIED_CALLBACK_ACE, *PACCESS_DENIED_CALLBACK_ACE;
+
+typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD Flags;
+ GUID ObjectType;
+ GUID InheritedObjectType;
+ DWORD SidStart;
+} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE;
+
+typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD Flags;
+ GUID ObjectType;
+ GUID InheritedObjectType;
+ DWORD SidStart;
+} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE;
+
+typedef struct _SYSTEM_AUDIT_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE;
+
+typedef struct _SYSTEM_AUDIT_CALLBACK_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} SYSTEM_AUDIT_CALLBACK_ACE, *PSYSTEM_AUDIT_CALLBACK_ACE;
+
+typedef struct _SYSTEM_MANDATORY_LABEL_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD SidStart;
+} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE;
+
+typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE {
+ ACE_HEADER Header;
+ ACCESS_MASK Mask;
+ DWORD Flags;
+ GUID ObjectType;
+ GUID InheritedObjectType;
+ DWORD SidStart;
+} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE;
+
+typedef struct _ACL {
+ UCHAR AclRevision;
+ UCHAR Sbz1;
+ USHORT AclSize;
+ USHORT AceCount;
+ USHORT Sbz2;
+} ACL, *PACL;
+
+typedef struct _SECURITY_DESCRIPTOR {
+ UCHAR Revision;
+ UCHAR Sbz1;
+ USHORT Control;
+ ULONG Owner;
+ ULONG Group;
+ ULONG Sacl;
+ ULONG Dacl;
+} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
+
+typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
+
+cpp_quote("#endif");
+
+typedef struct _RPC_SID {
+ UCHAR Revision;
+ UCHAR SubAuthorityCount;
+ SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+ [size_is(SubAuthorityCount)] DWORD SubAuthority[];
+} RPC_SID, *PRPC_SID;
+
+cpp_quote("#endif /* _DTYP_IDL */");
Propchange: trunk/reactos/include/reactos/idl/ms-dtyp.idl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/include/reactos/idl/pnp.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id…
==============================================================================
--- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun May 18 10:17:12 2008
@@ -2,7 +2,7 @@
* Plug and Play Manager RPC interface definition
*/
-#include "include/reactos/idl/wtypes.idl"
+#include <ms-dtyp.idl>
const unsigned long PNP_MAX_STRING_LEN = 32767;
const unsigned long PNP_MAX_DEVICE_ID_LEN = 200;
Modified: trunk/reactos/include/reactos/idl/svcctl.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl…
==============================================================================
--- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun May 18 10:17:12 2008
@@ -2,7 +2,7 @@
* Service Control Manager (SCM) interface definition
*/
-#include "include/reactos/idl/wtypes.idl"
+#include <ms-dtyp.idl>
const unsigned int MAX_SERVICE_NAME_LENGTH = 255;
const unsigned short SC_MAX_DEPEND_SIZE = 4 * 1024;