Msvc fixes (#3348)

* Fix wrong dllexport MACRO. * Use portable `std::chrono` instead of `gettimeofday` not available for msvc. * Split (too) long string as msvc has length limit :-/ * Fix `#include` for msvc * Workaround for msvc: explicit conversion to function pointer (with expected call type convention). * Fix `WINAPI` placement. * Msvc already has `CreatePseudoConsole`/`ClosePseudoConsole`. * Msvc doesn't have `MSWEnableDarkMode`. * Workaround for msvc: `<windows.h>` `#define`s `small` (as `char`) :-/
eranif · Apr 15, 2024 · eae047a · eae047a
1 parent 3f5be91
commit eae047a
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 31 deletions.
diff --git a/CodeLite/LSP/Notification.h b/CodeLite/LSP/Notification.h
@@ -6,7 +6,7 @@
 namespace LSP
 {
 
-class WXDLLIMPEXP_SDK Notification : public LSP::MessageWithParams
+class WXDLLIMPEXP_CL Notification : public LSP::MessageWithParams
 {
 public:
     Notification();

diff --git a/CodeLite/LSP/Request.h b/CodeLite/LSP/Request.h
@@ -10,7 +10,7 @@
 namespace LSP
 {
 
-class WXDLLIMPEXP_SDK Request : public LSP::MessageWithParams
+class WXDLLIMPEXP_CL Request : public LSP::MessageWithParams
 {
     int m_id = wxNOT_FOUND;
     wxString m_server_name;

diff --git a/CodeLite/SocketAPI/clSocketBase.h b/CodeLite/SocketAPI/clSocketBase.h
@@ -27,7 +27,6 @@
 #define CLSOCKETBASE_H
 
 #include <string>
-#include <sys/param.h>
 #include <wx/msgqueue.h>
 #include <wx/sharedptr.h>
 #include <wx/string.h>

diff --git a/CodeLite/clConsoleMateTerminal.h b/CodeLite/clConsoleMateTerminal.h
@@ -3,7 +3,7 @@
 
 #include "clConsoleGnomeTerminal.h"
 
-class WXDLLIMPEXP_SDK clConsoleMateTerminal : public clConsoleGnomeTerminal
+class WXDLLIMPEXP_CL clConsoleMateTerminal : public clConsoleGnomeTerminal
 {
 public:
     clConsoleMateTerminal();

diff --git a/CodeLite/clConsoleXfce4Terminal.h b/CodeLite/clConsoleXfce4Terminal.h
@@ -2,7 +2,7 @@
 #define CLCONSOLEXFCE4TERMINAL_H
 
 #include "clConsoleGnomeTerminal.h"
-class WXDLLIMPEXP_SDK clConsoleXfce4Terminal : public clConsoleGnomeTerminal
+class WXDLLIMPEXP_CL clConsoleXfce4Terminal : public clConsoleGnomeTerminal
 {
 public:
     clConsoleXfce4Terminal();

diff --git a/CodeLite/clModuleLogger.cpp b/CodeLite/clModuleLogger.cpp
@@ -2,7 +2,7 @@
 
 #include "fileutils.h"
 
-#include <sys/time.h>
+#include <chrono>
 #include <wx/crt.h>
 #include <wx/datetime.h>
 
@@ -43,12 +43,10 @@ wxString clModuleLogger::Prefix()
         return wxEmptyString;
     }
 
+    const auto now = std::chrono::system_clock::now().time_since_epoch();
+    const int ms = std::chrono::duration_cast<std::chrono::milliseconds>(now).count() % 1000;
+    const wxString msStr = wxString::Format(wxT("%03d"), ms);
     wxString prefix;
-    timeval tim;
-    gettimeofday(&tim, NULL);
-    int ms = (int)tim.tv_usec / 1000.0;
-
-    wxString msStr = wxString::Format(wxT("%03d"), ms);
     prefix << wxT("[") << wxDateTime::Now().FormatISOTime() << wxT(":") << msStr;
     // add the thread ID
     prefix << wxT(" T:") << wxThread::GetCurrentId();

diff --git a/CodeLite/file_logger.cpp b/CodeLite/file_logger.cpp
@@ -27,7 +27,7 @@
 
 #include "cl_standard_paths.h"
 
-#include <sys/time.h>
+#include <chrono>
 #include <wx/crt.h>
 #include <wx/filename.h>
 #include <wx/log.h>
@@ -163,12 +163,10 @@ wxString FileLogger::Prefix(int verbosity)
         return wxEmptyString;
     }
 
+    const auto now = std::chrono::system_clock::now().time_since_epoch();
+    const int ms = std::chrono::duration_cast<std::chrono::milliseconds>(now).count() % 1000;
+    const wxString msStr = wxString::Format(wxT("%03d"), ms);
     wxString prefix;
-    timeval tim;
-    gettimeofday(&tim, NULL);
-    int ms = (int)tim.tv_usec / 1000.0;
-
-    wxString msStr = wxString::Format(wxT("%03d"), ms);
     prefix << wxT("[") << wxDateTime::Now().FormatISOTime() << wxT(":") << msStr;
     switch(verbosity) {
     case System:

diff --git a/CodeLite/winprocess_impl.cpp b/CodeLite/winprocess_impl.cpp
@@ -41,12 +41,14 @@
 
 typedef VOID* HPCON;
 
-typedef HRESULT WINAPI (*CreatePseudoConsole_T)(COORD size, HANDLE hInput, HANDLE hOutput, DWORD dwFlags, HPCON* phPC);
-typedef VOID WINAPI (*ClosePseudoConsole_T)(HPCON hPC);
+#if !defined(_MSC_VER)
+typedef HRESULT(WINAPI* CreatePseudoConsole_T)(COORD size, HANDLE hInput, HANDLE hOutput, DWORD dwFlags, HPCON* phPC);
+typedef VOID(WINAPI* ClosePseudoConsole_T)(HPCON hPC);
 
 thread_local bool loadOnce = true;
 thread_local CreatePseudoConsole_T CreatePseudoConsole = nullptr;
 thread_local ClosePseudoConsole_T ClosePseudoConsole = nullptr;
+#endif
 
 #ifndef PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE
 #define PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE 0x00020016
@@ -308,6 +310,7 @@ IProcess* WinProcessImpl::ExecuteConPTY(wxEvtHandler* parent, const wxString& cm
         return nullptr;
     }
 
+#if !defined(_MSC_VER)
     // Create the Pseudo Console, using the pipes
     if(loadOnce) {
         loadOnce = false;
@@ -318,6 +321,7 @@ IProcess* WinProcessImpl::ExecuteConPTY(wxEvtHandler* parent, const wxString& cm
             FreeLibrary(hDLL);
         }
     }
+#endif
 
     if(!CreatePseudoConsole || !ClosePseudoConsole) {
         ::CloseHandle(inputReadSide);

diff --git a/Debugger/debuggergdb.cpp b/Debugger/debuggergdb.cpp
@@ -53,7 +53,7 @@
 
 // On Windows lower than XP, the function DebugBreakProcess does not exist
 // so we need to bind it dynamically
-typedef BOOL WINAPI (*DBG_BREAK_PROC_FUNC_PTR)(HANDLE);
+typedef BOOL(WINAPI* DBG_BREAK_PROC_FUNC_PTR)(HANDLE);
 DBG_BREAK_PROC_FUNC_PTR DebugBreakProcessFunc = NULL;
 HINSTANCE Kernel32Dll = NULL;
 

diff --git a/FileGrep/FileGrep/main.cpp b/FileGrep/FileGrep/main.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <iostream>
+#include <locale>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
@@ -320,7 +320,7 @@ bool CodeLiteApp::OnInit()
 
 #ifdef __WXMSW__
     // HiDPI support
-    typedef BOOL WINAPI (*SetProcessDPIAwareFunc)();
+    typedef BOOL(WINAPI * SetProcessDPIAwareFunc)();
     HINSTANCE user32Dll = LoadLibrary(L"User32.dll");
     if (user32Dll) {
         SetProcessDPIAwareFunc pFunc = (SetProcessDPIAwareFunc)GetProcAddress(user32Dll, "SetProcessDPIAware");
@@ -361,7 +361,7 @@ bool CodeLiteApp::OnInit()
 
     ::wxInitAllImageHandlers();
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) && !defined(_MSC_VER)
     if (clConfig::Get().Read("CodeLiteAppearance", 0) == 1) {
         // force dark
         MSWEnableDarkMode(wxApp::DarkMode_Always);

diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
@@ -6184,7 +6184,7 @@ void clMainFrame::OnSetActivePoject(wxCommandEvent& e)
     CHECK_COND_RET(!projects.empty());
 
     // sort the entries
-    projects.Sort([](const wxString& first, const wxString& second) { return first.CmpNoCase(second) < 0; });
+    projects.Sort(+[](const wxString& first, const wxString& second) { return first.CmpNoCase(second) < 0; });
 
     int initialSelection = projects.Index(cur_active_project);
     clSingleChoiceDialog dlg(this, projects, initialSelection == wxNOT_FOUND ? 0 : initialSelection);

diff --git a/Plugin/ColoursAndFontsManager.cpp b/Plugin/ColoursAndFontsManager.cpp
@@ -1114,16 +1114,16 @@ void ColoursAndFontsManager::SetThemeTextSelectionColours(const wxString& theme_
     }
 }
 
-wxFont ColoursAndFontsManager::GetFixedFont(bool small) const
+wxFont ColoursAndFontsManager::GetFixedFont(bool smaller) const
 {
     auto lexer = GetLexer("text");
     auto font = lexer->GetFontForStyle(0, EventNotifier::Get()->TopFrame());
 #ifndef __WXMAC__
-    if (small) {
+    if (smaller) {
         font.SetFractionalPointSize(font.GetPointSize() * 0.9);
     }
 #else
-    wxUnusedVar(small);
+    wxUnusedVar(smaller);
 #endif
     return font;
 }

diff --git a/Plugin/ColoursAndFontsManager.h b/Plugin/ColoursAndFontsManager.h
@@ -94,7 +94,7 @@ class WXDLLIMPEXP_SDK ColoursAndFontsManager : public wxEvtHandler
     /**
      * @brief return the default editor font (monospaced)
      */
-    wxFont GetFixedFont(bool small = false) const;
+    wxFont GetFixedFont(bool smaller = false) const;
     /**
      * @brief return a suitable background colour that matches the lexer's bg colour
      */

diff --git a/codelite-generate-themes/codelite-generate-themes/main.cpp b/codelite-generate-themes/codelite-generate-themes/main.cpp
@@ -68,7 +68,7 @@ class MainApp : public wxApp
     {
 
 #ifdef __WXMSW__
-        typedef BOOL WINAPI (*SetProcessDPIAwareFunc)();
+        typedef BOOL(WINAPI * SetProcessDPIAwareFunc)();
         HINSTANCE user32Dll = LoadLibrary(L"User32.dll");
         if(user32Dll) {
             SetProcessDPIAwareFunc pFunc = (SetProcessDPIAwareFunc)GetProcAddress(user32Dll, "SetProcessDPIAware");

diff --git a/ctagsd/tests/strings.hpp b/ctagsd/tests/strings.hpp
@@ -1060,7 +1060,7 @@ class MainApp : public wxApp
         // m_persistencManager = new clPersistenceManager();
         // wxPersistenceManager::Set(*m_persistencManager);
 #ifdef __WXMSW__
-        typedef BOOL WINAPI (*SetProcessDPIAwareFunc)();
+        typedef BOOL (WINAPI* SetProcessDPIAwareFunc)();
         HINSTANCE user32Dll = LoadLibrary(L"User32.dll");
         if(user32Dll) {
             SetProcessDPIAwareFunc pFunc = (SetProcessDPIAwareFunc)GetProcAddress(user32Dll, "SetProcessDPIAware");

diff --git a/wxcrafter/src/main.cpp b/wxcrafter/src/main.cpp
@@ -48,7 +48,7 @@ static const wxCmdLineEntryDesc cmdLineDesc[] = {
 IMPLEMENT_APP(wxcApp)
 
 #ifdef __WXMSW__
-typedef BOOL WINAPI (*SetProcessDPIAwareFunc)();
+typedef BOOL(WINAPI* SetProcessDPIAwareFunc)();
 #endif
 
 wxcApp::wxcApp()

diff --git a/wxcrafter/src/wxcLicenseGPL2.cpp b/wxcrafter/src/wxcLicenseGPL2.cpp
@@ -303,7 +303,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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.
-
+)" R"(
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.