Sync with trunk head

[reactos.git] / include / psdk / shtypes.idl

diff --git a/include/psdk/shtypes.idl b/include/psdk/shtypes.idl
index 3a922b8..021d467 100644 (file)
--- a/include/psdk/shtypes.idl
+++ b/include/psdk/shtypes.idl
@@ -21,8 +21,6 @@
 
 import "wtypes.idl";
 
-
-
 cpp_quote("#include <pshpack1.h>")
 typedef struct
 {
@@ -34,60 +32,13 @@ typedef const SHITEMID *LPCSHITEMID;
 typedef struct _ITEMIDLIST
 {
     SHITEMID mkid; /* first itemid in list */
-} ITEMIDLIST;
-
-cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)")
-cpp_quote("typedef struct _ITEMIDLIST_RELATIVE : ITEMIDLIST {} ITEMIDLIST_RELATIVE;")
-cpp_quote("typedef struct _ITEMID_CHILD : ITEMIDLIST_RELATIVE {} ITEMID_CHILD;")
-cpp_quote("typedef struct _ITEMIDLIST_ABSOLUTE : ITEMIDLIST_RELATIVE {} ITEMIDLIST_ABSOLUTE;")
-cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */")
-typedef ITEMIDLIST ITEMIDLIST_RELATIVE;
-typedef ITEMIDLIST ITEMID_CHILD;
-typedef ITEMIDLIST ITEMIDLIST_ABSOLUTE;
-cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */")
-
+} ITEMIDLIST,*LPITEMIDLIST;
+typedef const ITEMIDLIST *LPCITEMIDLIST;
+typedef LPITEMIDLIST PITEMID_CHILD;
+typedef LPCITEMIDLIST PCUITEMID_CHILD;
+typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY;
 cpp_quote("#include <poppack.h>")
 
-typedef [unique] BYTE_BLOB * wirePIDL;
-typedef ITEMIDLIST /*__unaligned*/ * LPITEMIDLIST;
-typedef const ITEMIDLIST /*__unaligned*/ * LPCITEMIDLIST;
-
-cpp_quote("#if defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)")
-typedef ITEMIDLIST_ABSOLUTE * PIDLIST_ABSOLUTE;
-typedef const ITEMIDLIST_ABSOLUTE * PCIDLIST_ABSOLUTE;
-typedef const ITEMIDLIST_ABSOLUTE /*__unaligned*/ * PCUIDLIST_ABSOLUTE;
-typedef ITEMIDLIST_RELATIVE * PIDLIST_RELATIVE;
-typedef const ITEMIDLIST_RELATIVE * PCIDLIST_RELATIVE;
-typedef ITEMIDLIST_RELATIVE /*__unaligned*/ * PUIDLIST_RELATIVE;
-typedef const ITEMIDLIST_RELATIVE /*__unaligned*/ * PCUIDLIST_RELATIVE;
-typedef ITEMID_CHILD * PITEMID_CHILD;
-typedef const ITEMID_CHILD * PCITEMID_CHILD;
-typedef ITEMID_CHILD /*__unaligned*/ * PUITEMID_CHILD;
-typedef const ITEMID_CHILD /*__unaligned*/ * PCUITEMID_CHILD;
-
-typedef PCUITEMID_CHILD const *PCUITEMID_CHILD_ARRAY;
-typedef PCUIDLIST_RELATIVE const *PCUIDLIST_RELATIVE_ARRAY;
-typedef PCIDLIST_ABSOLUTE const *PCIDLIST_ABSOLUTE_ARRAY;
-typedef PCUIDLIST_ABSOLUTE const *PCUIDLIST_ABSOLUTE_ARRAY;
-cpp_quote("#else /* !(defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus)) */")
-cpp_quote("#define PIDLIST_ABSOLUTE         LPITEMIDLIST")
-cpp_quote("#define PCIDLIST_ABSOLUTE        LPCITEMIDLIST")
-cpp_quote("#define PCUIDLIST_ABSOLUTE       LPCITEMIDLIST")
-cpp_quote("#define PIDLIST_RELATIVE         LPITEMIDLIST")
-cpp_quote("#define PCIDLIST_RELATIVE        LPCITEMIDLIST")
-cpp_quote("#define PUIDLIST_RELATIVE        LPITEMIDLIST")
-cpp_quote("#define PCUIDLIST_RELATIVE       LPCITEMIDLIST")
-cpp_quote("#define PITEMID_CHILD            LPITEMIDLIST")
-cpp_quote("#define PCITEMID_CHILD           LPCITEMIDLIST")
-cpp_quote("#define PUITEMID_CHILD           LPITEMIDLIST")
-cpp_quote("#define PCUITEMID_CHILD          LPCITEMIDLIST")
-cpp_quote("#define PCUITEMID_CHILD_ARRAY    LPCITEMIDLIST *")
-cpp_quote("#define PCUIDLIST_RELATIVE_ARRAY LPCITEMIDLIST *")
-cpp_quote("#define PCIDLIST_ABSOLUTE_ARRAY  LPCITEMIDLIST *")
-cpp_quote("#define PCUIDLIST_ABSOLUTE_ARRAY LPCITEMIDLIST *")
-cpp_quote("#endif /* defined(STRICT_TYPED_ITEMIDS) && defined(__cplusplus) */")
-
-
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
@@ -103,7 +54,7 @@ typedef enum tagSTRRET_TYPE
     STRRET_CSTR = 2
 } STRRET_TYPE;
 
-cpp_quote("#include <pshpack4.h>")
+cpp_quote("#include <pshpack8.h>")
 typedef struct _STRRET
 {
     UINT uType;                        /* STRRET_xxx */
@@ -124,3 +75,29 @@ typedef struct
     STRRET str;
 } SHELLDETAILS, *LPSHELLDETAILS;
 cpp_quote("#include <poppack.h>")
+
+typedef [v1_enum] enum tagSHCOLSTATE
+{
+    SHCOLSTATE_DEFAULT = 0,
+    SHCOLSTATE_TYPE_STR,
+    SHCOLSTATE_TYPE_INT,
+    SHCOLSTATE_TYPE_DATE,
+    SHCOLSTATE_TYPEMASK = 0xf,
+    SHCOLSTATE_ONBYDEFAULT = 0x10,
+    SHCOLSTATE_SLOW = 0x20,
+    SHCOLSTATE_EXTENDED = 0x40,
+    SHCOLSTATE_SECONDARYUI = 0x80,
+    SHCOLSTATE_HIDDEN = 0x100,
+    SHCOLSTATE_PREFER_VARCMP = 0x200,
+    SHCOLSTATE_PREFER_FMTCMP = 0x400,
+    SHCOLSTATE_NOSORTBYFOLDERNESS = 0x800,
+    SHCOLSTATE_VIEWONLY = 0x10000,
+    SHCOLSTATE_BATCHREAD = 0x20000,
+    SHCOLSTATE_NO_GROUPBY = 0x40000,
+    SHCOLSTATE_FIXED_WIDTH = 0x1000,
+    SHCOLSTATE_NODPISCALE = 0x2000,
+    SHCOLSTATE_FIXED_RATIO = 0x4000,
+    SHCOLSTATE_DISPLAYMASK = 0xf000
+} SHCOLSTATE;
+
+typedef DWORD SHCOLSTATEF;