diff --git a/src/libsync/utility_win.cpp b/src/libsync/utility_win.cpp index 78cbe4328..f4509674c 100644 --- a/src/libsync/utility_win.cpp +++ b/src/libsync/utility_win.cpp @@ -14,53 +14,19 @@ #include #include #include -#include -#include -#include static const char runPathC[] = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run"; -typedef HRESULT (WINAPI *SHGetKnownFolderPathFun)( - const GUID &rfid, - DWORD dwFlags, - HANDLE hToken, - PWSTR *ppszPath -); - static void setupFavLink_private(const QString &folder) { // Windows Explorer: Place under "Favorites" (Links) - - static SHGetKnownFolderPathFun SHGetKnownFolderPathPtr = NULL; - QString linkName; + wchar_t path[MAX_PATH]; + SHGetSpecialFolderPath(0, path, CSIDL_PROFILE, FALSE); + QString profile = QDir::fromNativeSeparators(QString::fromWCharArray(path)); QDir folderDir(QDir::fromNativeSeparators(folder)); - if (!SHGetKnownFolderPathPtr) - { - QLibrary kernel32Lib("shell32.dll"); - if(kernel32Lib.load()) - { - SHGetKnownFolderPathPtr = (SHGetKnownFolderPathFun) kernel32Lib.resolve("SHGetKnownFolderPath"); - } - } - - if(SHGetKnownFolderPathPtr) { - /* Use new WINAPI functions */ - wchar_t *path = NULL; - if(SHGetKnownFolderPathPtr(FOLDERID_Links, 0, NULL, &path) == S_OK) { - QString links = QDir::fromNativeSeparators(QString::fromWCharArray(path)); - linkName = QDir(links).filePath(folderDir.dirName() + QLatin1String(".lnk")); - } - } else { - /* Use legacy functions */ - wchar_t path[MAX_PATH]; - SHGetSpecialFolderPath(0, path, CSIDL_PROFILE, FALSE); - QString profile = QDir::fromNativeSeparators(QString::fromWCharArray(path)); - linkName = QDir(profile).filePath(QDir(QLatin1String("Links")).filePath(folderDir.dirName() + QLatin1String(".lnk"))); - } - qDebug() << Q_FUNC_INFO << " creating link from " << linkName << " to " << folder; + QString linkName = profile+QLatin1String("/Links/") + folderDir.dirName() + QLatin1String(".lnk"); if (!QFile::link(folder, linkName)) qDebug() << Q_FUNC_INFO << "linking" << folder << "to" << linkName << "failed!"; - } bool hasLaunchOnStartup_private(const QString &appName)