When creating explorer favorite use more specific windows functions (#…

…5690) Fixes #2719
owncloud · Apr 27, 2017 · 3db8d3d · 3db8d3d
1 parent 72a3e08
commit 3db8d3d
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/src/libsync/utility_win.cpp b/src/libsync/utility_win.cpp
@@ -12,24 +12,42 @@
  * for more details.
  */
 
+#define _WIN32_WINNT 0x0600
+#define WINVER 0x0600
 #include <shlobj.h>
 #include <winbase.h>
 #include <windows.h>
+#include <winerror.h>
+#include <shlguid.h>
+#include <string>
+#include <QLibrary>
 
 static const char runPathC[] = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
 
+
+
 static void setupFavLink_private(const QString &folder)
 {
     // Windows Explorer: Place under "Favorites" (Links)
-    wchar_t path[MAX_PATH];
-    SHGetSpecialFolderPath(0, path, CSIDL_PROFILE, FALSE);
-    QString profile =  QDir::fromNativeSeparators(QString::fromWCharArray(path));
+
+    QString linkName; 
     QDir folderDir(QDir::fromNativeSeparators(folder));
-    QString linkName = profile+QLatin1String("/Links/") + folderDir.dirName() + QLatin1String(".lnk");
+
+    /* Use new WINAPI functions */
+    PWSTR path;
+
+    if(SHGetKnownFolderPath(FOLDERID_Links, 0, NULL, &path) == S_OK) {
+        QString links = QDir::fromNativeSeparators(QString::fromWCharArray(path)); 
+        linkName = QDir(links).filePath(folderDir.dirName() + QLatin1String(".lnk"));
+    	CoTaskMemFree(path);
+    }
+    qDebug() << Q_FUNC_INFO << " creating link from " << linkName << " to " << folder;
     if (!QFile::link(folder, linkName))
         qDebug() << Q_FUNC_INFO << "linking" << folder << "to" << linkName << "failed!";
+
 }
 
+
 bool hasLaunchOnStartup_private(const QString &appName)
 {
     QString runPath = QLatin1String(runPathC);