summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2023-02-24 10:30:50 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2023-02-24 17:05:43 +0000
commit1786ddbde4b44575321aa6b9d9d367a964969063 (patch)
treee319a7f54e93fba1ac11c7e41e85d9fb042ef68e /include
parentae51dfb2379a9e9183afa9a1e5ee4fe4f4f0f7ef (diff)
Fix build in a specific VS2022 environment
Building CppunitTest_basic_macros using VS2022 failed for me reproducibly for some time, with make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:841: C:/lo/src/build/workdir/LinkTarget/CppunitTest/test_basic_macros.dll] Error 139 It is caused by linking odbccp32, and legacy_stdio_definitions required by the latter with current versions of UCRT. It seems to work OK for others; but being unable to find what's different on my system, I have this workaround, using run-time loading instead. Change-Id: Ic4094398f7510bc281dfa96f980f29f12f09d7ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147626 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/systools/win32/odbccp32.hxx48
1 files changed, 48 insertions, 0 deletions
diff --git a/include/systools/win32/odbccp32.hxx b/include/systools/win32/odbccp32.hxx
new file mode 100644
index 000000000000..51b1a10c9576
--- /dev/null
+++ b/include/systools/win32/odbccp32.hxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <sal/config.h>
+
+#include <prewin.h>
+#include <postwin.h>
+
+namespace sal::systools
+{
+// Linking to odbccp32 requires also legacy_stdio_definitions; and that breaks
+// in some configurations, with make error 139. Load it dynamically instead.
+class odbccp32
+{
+public:
+ odbccp32()
+ : m_hDLL(LoadLibraryW(L"odbccp32.dll"))
+ {
+ }
+ ~odbccp32() { FreeLibrary(m_hDLL); }
+
+ bool SQLGetInstalledDrivers(LPWSTR sBuf, WORD nBufSize) const
+ {
+ using proc_t = BOOL __stdcall(LPWSTR, WORD, WORD*);
+ return Invoke<proc_t>("SQLGetInstalledDriversW", sBuf, nBufSize, nullptr);
+ }
+
+private:
+ template <typename proc_t, typename... Args> bool Invoke(const char* func, Args... args) const
+ {
+ if (auto pFunc = reinterpret_cast<proc_t*>(GetProcAddress(m_hDLL, func)))
+ return pFunc(args...);
+ return false;
+ }
+
+ HMODULE m_hDLL;
+};
+} // sal::systools
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */