Nikolay Sivov : shlwapi: Fix SHGetViewStatePropertyBag() prototype.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8363316f620f00693fedea8a168276b53d9e86f7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8363316f620f00693fedea8a1...

Author: Nikolay Sivov 
Date:   Mon Feb  3 10:16:09 2020 +0300

shlwapi: Fix SHGetViewStatePropertyBag() prototype.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/shlwapi/ordinal.c      | 27 ---------------------------
 dlls/shlwapi/shlwapi_main.c | 10 ++++++++++
 include/shlwapi.h           | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index dd39366c80..8767d0b579 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -4284,33 +4284,6 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey,
     return E_NOTIMPL;
 }

-/***********************************************************************
- *             SHGetViewStatePropertyBag [SHLWAPI.515]
- *
- * Retrieves a property bag in which the view state information of a folder
- * can be stored.
- *
- * PARAMS
- *  pidl        [I] PIDL of the folder requested
- *  bag_name    [I] Name of the property bag requested
- *  flags       [I] Optional flags
- *  riid        [I] IID of requested property bag interface
- *  ppv         [O] Address to receive pointer to the new interface
- *
- * RETURNS
- *  success: S_OK
- *  failure: error code
- *
- */
-HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name,
-    DWORD flags, REFIID riid, void **ppv)
-{
-    FIXME("%p %s %d %s %p STUB\n", pidl, debugstr_w(bag_name), flags,
-          debugstr_guid(riid), ppv);
-
-    return E_NOTIMPL;
-}
-
 /***********************************************************************
  *             SHFormatDateTimeW [SHLWAPI.354]
  *
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index af79c33cb6..3717dfa712 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -156,3 +156,13 @@ UINT WINAPI WhichPlatform(void)

return state;
 }
+
+/***********************************************************************
+ *             SHGetViewStatePropertyBag [SHLWAPI.515]
+ */
+HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name, DWORD flags, REFIID riid, void **ppv)
+{
+    FIXME("%p, %s, %#x, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv);
+
+    return E_NOTIMPL;
+}
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 2bfca0bc90..4fd47d249f 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1150,6 +1150,20 @@ HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv);

UINT WINAPI WhichPlatform(void);

+#define SHGVSPB_PERUSER          0x00000001
+#define SHGVSPB_ALLUSERS         0x00000002
+#define SHGVSPB_PERFOLDER        0x00000004
+#define SHGVSPB_ALLFOLDERS       0x00000008
+#define SHGVSPB_INHERIT          0x00000010
+#define SHGVSPB_ROAM             0x00000020
+#define SHGVSPB_NOAUTODEFAULTS   0x80000000
+#define SHGVSPB_FOLDER           (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER)
+#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS)
+#define SHGVSPB_USERDEFAULTS     (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS)
+#define SHGVSPB_GLOBALDEFAULTS   (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS)
+
+HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, DWORD flags, REFIID riid, void **ppv);
+
 #include <poppack.h>

#ifdef __cplusplus