Address David's comments

Author: alinaliBQ

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

@@ -33,8 +33,6 @@ else()
   set(ODBCINST odbcinst)
 endif()
 
-add_definitions(-DUNICODE=1)
-
 add_subdirectory(odbc_impl)
 
 arrow_install_all_headers("arrow/flight/sql/odbc")
@@ -57,7 +55,7 @@ add_arrow_lib(arrow_flight_sql_odbc
               DEPENDENCIES
               arrow_flight_sql
               DEFINITIONS
-              FMT_HEADER_ONLY
+              UNICODE
               SHARED_LINK_FLAGS
               ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
               SHARED_LINK_LIBS

cpp/src/arrow/flight/sql/odbc/odbc_impl/CMakeLists.txt

@@ -110,6 +110,7 @@ add_library(arrow_odbc_spi_impl
             type_utilities.h
             util.cc
             util.h)
+target_compile_definitions(arrow_odbc_spi_impl PUBLIC UNICODE)
 target_include_directories(arrow_odbc_spi_impl PUBLIC include include/odbc_impl)
 target_include_directories(arrow_odbc_spi_impl PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_trust_store.cc

@@ -31,16 +31,14 @@ bool SystemTrustStore::HasNext() {
 
 std::string SystemTrustStore::GetNext() const {
   DWORD size = 0;
-  CryptBinaryToString(p_context_->pbCertEncoded, p_context_->cbCertEncoded,
-                      CRYPT_STRING_BASE64HEADER, nullptr, &size);
-
-  std::wstring wcert;
-  wcert.resize(size);
-  CryptBinaryToString(p_context_->pbCertEncoded, p_context_->cbCertEncoded,
-                      CRYPT_STRING_BASE64HEADER, &wcert[0], &size);
-  wcert.resize(size);
-
-  std::string cert = arrow::util::WideStringToUTF8(wcert).ValueOr("");
+  CryptBinaryToStringA(p_context_->pbCertEncoded, p_context_->cbCertEncoded,
+                       CRYPT_STRING_BASE64HEADER, nullptr, &size);
+
+  std::string cert;
+  cert.resize(size);
+  CryptBinaryToStringA(p_context_->pbCertEncoded, p_context_->cbCertEncoded,
+                       CRYPT_STRING_BASE64HEADER, &cert[0], &size);
+  cert.resize(size);
 
   return cert;
 }