From f8bf0861b23cfffa996bfa86827455b9e8f4e6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Sat, 9 Dec 2023 08:05:02 +0100 Subject: [PATCH] steam.exe: Define SHGetFolderPath(A|W) to remove shlobj.h include. It breaks on DECLSPEC_IMPORT EXTERN_C. --- steam_helper/steam.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp index 4700a1af..8ab65875 100644 --- a/steam_helper/steam.cpp +++ b/steam_helper/steam.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -73,6 +72,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(steam); +/* from shlobj.h, which breaks because of DECLSPEC_IMPORT EXTERN_C in C++ */ +#define CSIDL_LOCAL_APPDATA 0x001c +#define CSIDL_FLAG_CREATE 0x8000 + +EXTERN_C WINSHELLAPI HRESULT WINAPI SHGetFolderPathA(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPSTR pszPath); +EXTERN_C WINSHELLAPI HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPWSTR pszPath); +#define SHGetFolderPath WINELIB_NAME_AW(SHGetFolderPath) + static const WCHAR PROTON_VR_RUNTIME_W[] = {'P','R','O','T','O','N','_','V','R','_','R','U','N','T','I','M','E',0}; static const WCHAR VR_PATHREG_OVERRIDE_W[] = {'V','R','_','P','A','T','H','R','E','G','_','O','V','E','R','R','I','D','E',0}; static const WCHAR VR_OVERRIDE_W[] = {'V','R','_','O','V','E','R','R','I','D','E',0};