Skip to content

Commit 3b15b6f

Browse files
committed
use SHGetKnownFolderPath
SHGetFolderPathA is deprecated. Signed-off-by: Rosen Penev <[email protected]>
1 parent 898faff commit 3b15b6f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/makernote_int.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ namespace fs = std::experimental::filesystem;
3030
#include <pwd.h>
3131
#include <unistd.h>
3232
#else
33-
#include <shlobj.h>
34-
#ifndef CSIDL_PROFILE
35-
#define CSIDL_PROFILE 40
36-
#endif
3733
#include <process.h>
34+
#include <shlobj.h>
3835
#endif
3936

4037
#ifdef EXV_ENABLE_INIH
@@ -74,9 +71,10 @@ std::string getExiv2ConfigPath() {
7471
}
7572

7673
#ifdef _WIN32
77-
char buffer[1024];
78-
if (SUCCEEDED(SHGetFolderPathA(nullptr, CSIDL_PROFILE, nullptr, 0, buffer))) {
74+
PWSTR buffer = nullptr;
75+
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Profile, 0, nullptr, &buffer))) {
7976
currentPath = buffer;
77+
CoTaskMemFree(buffer);
8078
}
8179
#else
8280
auto pw = getpwuid(getuid());

0 commit comments

Comments
 (0)