[dchapyshev] 43160: - Sync headers with Wine 1.1.30

Author: dchapyshev
Date: Sat Sep 26 12:45:05 2009
New Revision: 43160

URL: http://svn.reactos.org/svn/reactos?rev=43160&view=rev
Log:
- Sync headers with Wine 1.1.30

Modified:
    trunk/reactos/include/psdk/commctrl.h
    trunk/reactos/include/psdk/shlwapi.h

Modified: trunk/reactos/include/psdk/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re…
==============================================================================
--- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Sep 26 12:45:05 2009
@@ -2964,6 +2964,7 @@
 #define LVCF_SUBITEM            0x0008
 #define LVCF_IMAGE              0x0010
 #define LVCF_ORDER              0x0020
+#define LVCF_MINWIDTH           0x0040
 
 #define LVCFMT_LEFT             0x0000
 #define LVCFMT_RIGHT            0x0001
@@ -4953,8 +4954,22 @@
 struct _DPA;
 typedef struct _DPA *HDPA;
 
+#define DPA_GetPtrCount(hdpa)  (*(INT*)(hdpa))
+
 typedef INT (CALLBACK *PFNDPAENUMCALLBACK)(LPVOID, LPVOID);
 typedef INT (CALLBACK *PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM);
+typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM);
+
+/* merge callback codes */
+#define DPAMM_MERGE     1
+#define DPAMM_DELETE    2
+#define DPAMM_INSERT    3
+
+/* merge options */
+#define DPAM_SORTED     0x00000001
+#define DPAM_NORMAL     0x00000002
+#define DPAM_UNION      0x00000004
+#define DPAM_INTERSECT  0x00000008
 
 HDPA   WINAPI DPA_Create(INT);
 BOOL   WINAPI DPA_Destroy(HDPA);
@@ -4962,11 +4977,25 @@
 BOOL   WINAPI DPA_DeleteAllPtrs(HDPA);
 BOOL   WINAPI DPA_SetPtr(HDPA, INT, LPVOID);
 LPVOID WINAPI DPA_GetPtr(HDPA, INT);
+INT    WINAPI DPA_GetPtrIndex(HDPA, LPCVOID);
+ULONGLONG WINAPI DPA_GetSize(HDPA);
+BOOL   WINAPI DPA_Grow(HDPA, INT);
 INT    WINAPI DPA_InsertPtr(HDPA, INT, LPVOID);
 BOOL   WINAPI DPA_Sort(HDPA, PFNDPACOMPARE, LPARAM);
 void   WINAPI DPA_EnumCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
 void   WINAPI DPA_DestroyCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID);
 INT    WINAPI DPA_Search(HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT);
+BOOL   WINAPI DPA_Merge(HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM);
+
+/* save/load from stream */
+typedef struct _DPASTREAMINFO
+{
+    INT    iPos;   /* item index */
+    LPVOID pvItem;
+} DPASTREAMINFO;
+
+struct IStream;
+typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, LPVOID);
 
 BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);
 

Modified: trunk/reactos/include/psdk/shlwapi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Sat Sep 26 12:45:05 2009
@@ -1014,7 +1014,7 @@
 #define SHGVSPB_USERDEFAULTS     (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS)
 #define SHGVSPB_GLOBALDEAFAULTS  (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS)
 
-HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, LPCWSTR pszBagName,
DWORD dwFlags, REFIID riid, void** ppv);
+HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, DWORD
flags, REFIID riid, void **ppv);
 #endif  /* (_WIN32_IE >= 0x0600) */