Changeset 7925 for trunk/include

Timestamp:

Feb 15, 2002, 6:16:36 PM (24 years ago)

Author:

sandervl

Message:

header updates

Location:

trunk/include/win

Files:

• objbase.h (modified) (1 diff)
• winbase.h (modified) (1 diff)
• windef.h (modified) (2 diffs)
• wine/obj_marshal.h (modified) (7 diffs)
• wtypes.h (modified) (1 diff)

trunk/include/win/objbase.h

@@ -1 @@
-/* $Id: objbase.h,v 1.3 2002-02-15 17:16:25 sandervl Exp $ */
-
 #ifndef __WINE_OBJBASE_H
 #define __WINE_OBJBASE_H

trunk/include/win/winbase.h

@@ -602 +602 @@
 
 #define PIPE_UNLIMITED_INSTANCES    255
+
+#define NMPWAIT_WAIT_FOREVER            0xffffffff
+#define NMPWAIT_NOWAIT                  0x00000001
+#define NMPWAIT_USE_DEFAULT_WAIT        0x00000000
 
 #ifndef NOLOGERROR

trunk/include/win/windef.h

@@ -12 +12 @@
 # undef UNICODE
 #endif  /* __WINE__ */
+
+#define WINVER 0x0500
 
 #ifdef __cplusplus
@@ -719 +721 @@
 } DECIMAL;
 
+#include <winbase.h>
+
 #ifdef __cplusplus
 }

trunk/include/win/wine/obj_marshal.h

@@ -1 @@
-/* $Id: obj_marshal.h,v 1.5 1999-08-22 22:52:08 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs that allow an interface to 
@@ -7 +6 @@
 #ifndef __WINE_WINE_OBJ_MARSHAL_H
 #define __WINE_WINE_OBJ_MARSHAL_H
-
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 
 #ifdef __cplusplus
@@ -23 +19 @@
 DEFINE_OLEGUID(IID_IStdMarshalInfo,     0x00000018L, 0, 0);
 typedef struct IStdMarshalInfo IStdMarshalInfo,*LPSTDMARSHALINFO;
+
+DEFINE_OLEGUID(CLSID_DfMarshal,         0x0000030BL, 0, 0);
 
 
@@ -42 +40 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IMarshal_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -54 +51 @@
 #define IMarshal_ReleaseMarshalData(p,a)          ICOM_CALL1(ReleaseMarshalData,p,a)
 #define IMarshal_DisconnectObject(p,a)            ICOM_CALL1(DisconnectObject,p,a)
-#endif
 
 
@@ -69 +65 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IStdMarshalInfo_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -76 +71 @@
 /*** IStdMarshalInfo methods ***/
 #define IStdMarshalInfo_GetClassForHandler(p,a,b,c) ICOM_CALL3(GetClassForHandler,p,a,b,c)
-#endif
 
 

trunk/include/win/wtypes.h

@@ -198 +198 @@
 #endif /* _FILETIME_ */
 
+
+#ifndef _SECURITY_DEFINED
+#define _SECURITY_DEFINED
+
+#include "pshpack1.h"
+
+typedef DWORD ACCESS_MASK, *PACCESS_MASK;
+
+typedef struct _GENERIC_MAPPING {
+    ACCESS_MASK GenericRead;
+    ACCESS_MASK GenericWrite;
+    ACCESS_MASK GenericExecute;
+    ACCESS_MASK GenericAll;
+} GENERIC_MAPPING, *PGENERIC_MAPPING;
+
+#ifndef SID_IDENTIFIER_AUTHORITY_DEFINED
+#define SID_IDENTIFIER_AUTHORITY_DEFINED
+typedef struct {
+    BYTE Value[6];
+} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY;
+#endif /* !defined(SID_IDENTIFIER_AUTHORITY_DEFINED) */
+
+#ifndef SID_DEFINED
+#define SID_DEFINED
+typedef struct _SID {
+    BYTE Revision;
+    BYTE SubAuthorityCount;
+    SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+    DWORD SubAuthority[1];
+} SID,*PSID;
+#endif /* !defined(SID_DEFINED) */
+
+#define SID_REVISION                    (1)     /* Current revision */
+#define SID_MAX_SUB_AUTHORITIES         (15)    /* current max subauths */
+#define SID_RECOMMENDED_SUB_AUTHORITIES (1)     /* recommended subauths */
+
+
+/* 
+ * ACL 
+ */
+
+#define ACL_REVISION1 1
+#define ACL_REVISION2 2
+#define ACL_REVISION3 3
+#define ACL_REVISION4 4
+
+typedef enum _ACL_INFORMATION_CLASS {
+    AclRevisionInformation = 1,
+    AclSizeInformation
+} ACL_INFORMATION_CLASS;
+
+typedef struct _ACL_REVISION_INFORMATION {
+    DWORD AclRevision;
+} ACL_REVISION_INFORMATION;
+typedef ACL_REVISION_INFORMATION *PACL_REVISION_INFORMATION;
+
+typedef struct _ACL_SIZE_INFORMATION {
+    DWORD AceCount;
+    DWORD AclBytesInUse;
+    DWORD AclBytesFree;
+} ACL_SIZE_INFORMATION;
+typedef ACL_SIZE_INFORMATION *PACL_SIZE_INFORMATION;
+
+#define MIN_ACL_REVISION ACL_REVISION2
+#define MAX_ACL_REVISION ACL_REVISION4
+
+typedef struct _ACL {
+    BYTE AclRevision;
+    BYTE Sbz1;
+    WORD AclSize;
+    WORD AceCount;
+    WORD Sbz2;
+} ACL, *PACL;
+
+
+/* SECURITY_DESCRIPTOR */
+#define SECURITY_DESCRIPTOR_REVISION    1
+#define SECURITY_DESCRIPTOR_REVISION1   1
+
+
+#define SE_OWNER_DEFAULTED      0x0001
+#define SE_GROUP_DEFAULTED      0x0002
+#define SE_DACL_PRESENT         0x0004
+#define SE_DACL_DEFAULTED       0x0008
+#define SE_SACL_PRESENT         0x0010
+#define SE_SACL_DEFAULTED       0x0020
+#define SE_SELF_RELATIVE        0x8000
+
+typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION;
+typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL;
+
+/* The security descriptor structure */
+typedef struct {
+    BYTE Revision;
+    BYTE Sbz1;
+    SECURITY_DESCRIPTOR_CONTROL Control;
+    DWORD Owner;
+    DWORD Group;
+    DWORD Sacl;
+    DWORD Dacl;
+} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE;
+
+typedef struct {
+    BYTE Revision;
+    BYTE Sbz1;
+    SECURITY_DESCRIPTOR_CONTROL Control;
+    PSID Owner;
+    PSID Group;
+    PACL Sacl;
+    PACL Dacl;
+} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
+
+#define SECURITY_DESCRIPTOR_MIN_LENGTH   (sizeof(SECURITY_DESCRIPTOR)) 
+
+#include "poppack.h"
+
+#endif /* _SECURITY_DEFINED */
+
 #ifndef _ROTFLAGS_DEFINED
 #define _ROTFLAGS_DEFINED