Maarten Lankhorst : include: Add SHCOLSTATE to shtypes.idl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 760c3b606b848776ffac1d49e92f2972d2f20979
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=760c3b606b848776ffac1d49e9...

Author: Maarten Lankhorst 
Date:   Wed Nov 11 00:45:44 2009 +0100

include: Add SHCOLSTATE to shtypes.idl.

---

include/shobjidl.idl |   16 ----------------
 include/shtypes.idl  |   26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index 5acd302..60da174 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -320,22 +320,6 @@ interface IEnumExtraSearch : IUnknown
 ]
 interface IShellFolder2 : IShellFolder
 {
-    typedef enum
-    {
-        SHCOLSTATE_TYPE_STR = 0x00000001,
-        SHCOLSTATE_TYPE_INT = 0x00000002,
-        SHCOLSTATE_TYPE_DATE = 0x00000003,
-        SHCOLSTATE_TYPEMASK = 0x0000000f,
-        SHCOLSTATE_ONBYDEFAULT = 0x00000010,
-        SHCOLSTATE_SLOW = 0x00000020,
-        SHCOLSTATE_EXTENDED = 0x00000040,
-        SHCOLSTATE_SECONDARYUI = 0x00000080,
-        SHCOLSTATE_HIDDEN = 0x00000100,
-        SHCOLSTATE_PREFER_VARCMP = 0x00000200
-    } SHCOLSTATE;
-
-    typedef DWORD SHCOLSTATEF;
-
     typedef struct
     {
         GUID    fmtid;
diff --git a/include/shtypes.idl b/include/shtypes.idl
index 89e6bb0..2433fb5 100644
--- a/include/shtypes.idl
+++ b/include/shtypes.idl
@@ -72,3 +72,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;