diff options
| -rw-r--r-- | basic/CppunitTest_basic_macros.mk | 2 | ||||
| -rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 9 | ||||
| -rw-r--r-- | include/systools/win32/odbccp32.hxx | 48 |
3 files changed, 51 insertions, 8 deletions
diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk index 83a9221369f0..361bd5bb2d2f 100644 --- a/basic/CppunitTest_basic_macros.mk +++ b/basic/CppunitTest_basic_macros.mk @@ -45,9 +45,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \ ifeq ($(OS),WNT) $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \ oleaut32 \ - legacy_stdio_definitions \ odbc32 \ - odbccp32 \ )) endif diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index f048fee6dfda..b778d393019b 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -14,11 +14,7 @@ #include <comphelper/processfactory.hxx> #include <o3tl/char16_t2wchar_t.hxx> -#if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> -#include <odbcinst.h> +#include <systools/win32/odbccp32.hxx> #endif using namespace ::com::sun::star; @@ -211,7 +207,8 @@ void VBATest::testMiscOLEStuff() const int nBufSize = 1024 * 4; wchar_t sBuf[nBufSize]; - SQLGetInstalledDriversW( sBuf, nBufSize, nullptr ); + if (!sal::systools::odbccp32().SQLGetInstalledDrivers(sBuf, nBufSize)) + return; const wchar_t *pODBCDriverName = sBuf; bool bFound = false; 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: */ |