Utility: update Path::{home,configuration}Directory() on Windows. #144
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of the old SHGetFolderPathW() API, they now use the SHGetKnownFolderPath() API, which was added in Windows Vista. As a side effect, if OneDrive is installed, homeDirectory() will now return the proper Documents directory, instead of the OneDrive equivalent.
williamjcm
force-pushed
the
path-windows-use-knownfolder-api
branch
from
f21f4e4 to
32fa8b5
Compare
|
Ignore the Apple CI failures, I cancelled them because they just wait forever (5d6fed8 will fix that). Let's see what AppVeyor says, then I'll merge. |
mosra
reviewed
Jun 11, 2022
|
To fix MinGW, this could help I think. diff --git a/src/Corrade/Utility/Path.cpp b/src/Corrade/Utility/Path.cpp
index 5a365189..08646468 100644
--- a/src/Corrade/Utility/Path.cpp
+++ b/src/Corrade/Utility/Path.cpp
@@ -74,6 +74,10 @@
/** @todo remove the superfluous includes when mingw is fixed (otherwise causes undefined EXTERN_C error) */
#ifdef CORRADE_TARGET_WINDOWS
#ifdef __MINGW32__
+/* For SHGetKnownFolderPath() on MinGW: https://stackoverflow.com/a/59033437 */
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION 0x06000000
+#endif
#include <wtypes.h>
#include <windef.h>
#include <wincrypt.h>And if you rebase on master, the Mac CI stops being cursed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of the old
SHGetFolderPathW()API, they now use theSHGetKnownFolderPath()API, which was added in Windows Vista.As a side effect, if OneDrive is installed,
homeDirectory()should now return the proper Documents directory, instead of the OneDrive equivalent. Though I couldn't test that, because I made sure to remove it from my machine as soon as possible.