Use ansi codepage for multibyte strings (fixes #976)

src/lib/common/win32/DataDirectories.cpp

@@ -16,34 +16,12 @@
 */
 
 #include "../DataDirectories.h"
-
-#include <Shlobj.h>
-
-std::string unicode_to_mb(const WCHAR* utfStr)
-{
-    int utfLength = lstrlenW(utfStr);
-    int mbLength = WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, NULL, 0, NULL, NULL);
-    std::string mbStr(mbLength, 0);
-    WideCharToMultiByte(CP_UTF8, 0, utfStr, utfLength, &mbStr[0], mbLength, NULL, NULL);
-    return mbStr;
-}
-
-std::string known_folder_path(const KNOWNFOLDERID& id)
-{
-    std::string path;
-    WCHAR* buffer;
-    HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer);
-    if (result == S_OK) {
-        path = unicode_to_mb(buffer);
-        CoTaskMemFree(buffer);
-    }
-    return path;
-}
+#include "KnownFolderPaths.h"
 
 const std::string& DataDirectories::profile()
 {
     if (_profile.empty())
-        _profile = known_folder_path(FOLDERID_LocalAppData) + "\\Barrier";
+        _profile = KnownFolderPaths::localAppData() + "\\Barrier";
     return _profile;
 }
 const std::string& DataDirectories::profile(const std::string& path)
@@ -55,7 +33,7 @@ const std::string& DataDirectories::profile(const std::string& path)
 const std::string& DataDirectories::global()
 {
     if (_global.empty())
-        _global = known_folder_path(FOLDERID_ProgramData) + "\\Barrier";
+        _global = KnownFolderPaths::programData() + "\\Barrier";
     return _global;
 }
 const std::string& DataDirectories::global(const std::string& path)

src/lib/common/win32/KnownFolderPaths.cpp

@@ -0,0 +1,61 @@
+/*
+* barrier -- mouse and keyboard sharing utility
+* Copyright (C) 2018 Debauchee Open Source Group
+*
+* This package is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* found in the file LICENSE that should have accompanied this file.
+*
+* This package is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "KnownFolderPaths.h"
+#include <string>
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <Shlobj.h>
+
+std::string unicode_to_mb(const WCHAR* utfStr)
+{
+    int utfLength = lstrlenW(utfStr);
+    int mbLength = WideCharToMultiByte(CP_ACP, 0, utfStr, utfLength, NULL, 0, NULL, NULL);
+    std::string mbStr(mbLength, 0);
+    WideCharToMultiByte(CP_ACP, 0, utfStr, utfLength, &mbStr[0], mbLength, NULL, NULL);
+    return mbStr;
+}
+
+std::string known_folder_path(const KNOWNFOLDERID& id)
+{
+    std::string path;
+    WCHAR* buffer;
+    HRESULT result = SHGetKnownFolderPath(id, 0, NULL, &buffer);
+    if (result == S_OK) {
+        path = unicode_to_mb(buffer);
+        CoTaskMemFree(buffer);
+    }
+    return path;
+}
+
+std::string KnownFolderPaths::desktop()
+{
+    return known_folder_path(FOLDERID_Desktop);
+}
+
+std::string KnownFolderPaths::localAppData()
+{
+    return known_folder_path(FOLDERID_LocalAppData);
+}
+
+std::string KnownFolderPaths::programData()
+{
+    return known_folder_path(FOLDERID_ProgramData);
+}

src/lib/common/win32/KnownFolderPaths.h

@@ -0,0 +1,32 @@
+/*
+* barrier -- mouse and keyboard sharing utility
+* Copyright (C) 2018 Debauchee Open Source Group
+*
+* This package is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* found in the file LICENSE that should have accompanied this file.
+*
+* This package is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <string>
+
+class KnownFolderPaths
+{
+public:
+    static std::string desktop();
+    static std::string localAppData();
+    static std::string programData();
+
+private:
+    // static class
+    KnownFolderPaths() {}
+};

src/lib/platform/MSWindowsScreen.cpp

@@ -41,9 +41,9 @@
 #include "base/IEventQueue.h"
 #include "base/TMethodEventJob.h"
 #include "base/TMethodJob.h"
+#include "common/win32/KnownFolderPaths.h"
 
 #include <string.h>
-#include <Shlobj.h>
 #include <comutil.h>
 #include <algorithm>
 
@@ -145,15 +145,12 @@ MSWindowsScreen::MSWindowsScreen(
         forceShowCursor();
         LOG((CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_w, m_h, m_multimon ? "(multi-monitor)" : ""));
         LOG((CLOG_DEBUG "window is 0x%08x", m_window));
-
-        // SHGetFolderPath is deprecated in vista, but use it for xp support.
-        char desktopPath[MAX_PATH];
-        if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, desktopPath))) {
-            m_desktopPath = std::string(desktopPath);
+        m_desktopPath = KnownFolderPaths::desktop();
+        if (!m_desktopPath.empty()) {
             LOG((CLOG_DEBUG "using desktop for drop target: %s", m_desktopPath.c_str()));
         }
         else {
-            LOG((CLOG_ERR "failed to get desktop path, no drop target available, error=%d", GetLastError()));
+            LOG((CLOG_ERR "failed to get desktop path, no drop target available"));
         }
 
         OleInitialize(0);