Nikolay Sivov : shdocvw: Forward WhichPlatform() to shlwapi.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Feb  3 10:16:07 2020 +0300

shdocvw: Forward WhichPlatform() to shlwapi.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shdocvw/shdocvw.spec   |  2 +-
 dlls/shdocvw/shdocvw_main.c | 11 -----------
 include/shlwapi.h           |  8 +++++++-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec
index 485d1608db..aa1b5e0c96 100644
--- a/dlls/shdocvw/shdocvw.spec
+++ b/dlls/shdocvw/shdocvw.spec
@@ -2,7 +2,7 @@
 101 stdcall -noname IEWinMain(str long)
 102 stub -noname CreateShortcutInDirA
 103 stub -noname CreateShortcutInDirW
-104 stdcall -noname WhichPlatformFORWARD()
+104 stdcall -noname WhichPlatform() shlwapi.WhichPlatform
 105 stub -noname CreateShortcutInDirEx
 106 stub HlinkFindFrame
 107 stub SetShellOfflineState
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 98d0d2cde2..ac3913dd23 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -283,17 +283,6 @@ static void* fetch_shlwapi_ordinal(UINT_PTR ord)
     return (void*)GetProcAddress(h, (const char*)ord);
 }
 
-/******************************************************************
- *		WhichPlatformFORWARD            (SHDOCVW.@)
- */
-DWORD WINAPI WhichPlatformFORWARD(void)
-{
-    static DWORD (WINAPI *p)(void);
-
-    if (p || (p = fetch_shlwapi_ordinal(276))) return p();
-    return 1; /* not integrated, see shlwapi.WhichPlatform */
-}
-
 /******************************************************************
  *		StopWatchModeFORWARD            (SHDOCVW.@)
  */
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 8d6801a94d..2bfca0bc90 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1135,7 +1135,6 @@ BOOL WINAPI IsOS(DWORD);
 #define FDTF_RTLDATE            0x00000200
 #define FDTF_NOAUTOREADINGORDER 0x00000400
 
-
 typedef struct
 {
     const IID *piid;
@@ -1144,6 +1143,13 @@ typedef struct
 
 HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv);
 
+#define PLATFORM_UNKNOWN     0
+#define PLATFORM_IE3         1
+#define PLATFORM_BROWSERONLY 1
+#define PLATFORM_INTEGRATED  2
+
+UINT WINAPI WhichPlatform(void);
+
 #include <poppack.h> 
 
 #ifdef __cplusplus