Fix native Windows MSVC build compatibility

platform/Windows/c64d/c64d.vcxproj

@@ -178,7 +178,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;msvcrtd.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -198,7 +198,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;msvcrtd.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -222,7 +222,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;msvcrt.lib;dbghelp.lib;mbedtls_bundle.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;dbghelp.lib;mbedtls_bundle.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='ClangCL'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
@@ -248,7 +248,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;msvcrt.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MTImageCodecs.lib;SDL3.lib;version.lib;imm32.lib;setupapi.lib;winmm.lib;wsock32.lib;ws2_32.lib;Iphlpapi.lib;userenv.lib;psapi.lib;uSockets.lib;libuv.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration Condition="'$(PlatformToolset)'!='ClangCL'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>

src/Emulators/vice/arch/menu_help.c

@@ -240,23 +240,23 @@ static void show_text(const char *text)
                     case '`':
                         string[x + z] = '\'';
                         break;
-                    case 'ä':
+                    case '\344':
                         string[x + z] = 'a';
                         break;
                     case '~':
                         string[x + z] = '-';
                         break;
-                    case 'é':
-                    case 'è':
+                    case '\351':
+                    case '\350':
                         string[x + z] = 'e';
                         break;
-                    case 'Ö':
+                    case '\326':
                         string[x + z] = 'O';
                         break;
-                    case 'ö':
+                    case '\366':
                         string[x + z] = 'o';
                         break;
-                    case 'å':
+                    case '\345':
                         string[x + z] = 'a';
                         break;
                     case '\t':

src/Emulators/vice/c64/cart/ide64.c

@@ -42,6 +42,10 @@
 #include <string.h>
 #include <time.h>
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#include <intrin.h>
+#endif
+
 #include "alarm.h"
 #include "archdep.h"
 #include "ata.h"
@@ -563,24 +567,31 @@ static int set_autodetect_size(int autodetect_size, void *param)
  * private helpers and never take the lock themselves, so there is no
  * re-entrancy.
  *
- * Implemented as a GCC/Clang test-and-set spinlock: contention is two threads
- * and the critical sections are short, while every toolchain that builds this
- * window (GCC on Linux, Apple clang, and clang-cl on Windows) implements the
- * builtin. Including the Windows synchronization headers from a vendored VICE
+ * Implemented as a test-and-set spinlock: contention is two threads and the
+ * critical sections are short. MSVC uses _InterlockedExchange; GCC and Clang
+ * use the __sync builtins. Including Windows synchronization headers from a vendored VICE
  * file is NOT an alternative: the app's compiles see a different preprocessor
  * setup than a normal Windows program and winnt.h refuses the empty target
  * architecture. */
 static volatile long usb_server_lock_word = 0;
 static void usb_server_lock(void)
 {
+#if defined(_MSC_VER) && !defined(__clang__)
+    while (_InterlockedExchange(&usb_server_lock_word, 1)) {
+#else
     while (__sync_lock_test_and_set(&usb_server_lock_word, 1)) {
+#endif
         while (usb_server_lock_word) {
         }
     }
 }
 static void usb_server_unlock(void)
 {
+#if defined(_MSC_VER) && !defined(__clang__)
+    _InterlockedExchange(&usb_server_lock_word, 0);
+#else
     __sync_lock_release(&usb_server_lock_word);
+#endif
 }
 
 static void usbserver_activate(int);

src/Emulators/vice/root/infocontrib.h

@@ -286,7 +286,7 @@ const char info_contrib_text[] =
 "  Started the work on hardware-level 1541 emulation and wrote the\n"
 "  new monitor introduced with VICE 0.15.\n"
 "\n"
-"  André Fachat <fachat@physik.tu-chemnitz.de>\n"
+"  Andr\351 Fachat <fachat@physik.tu-chemnitz.de>\n"
 "  Copyright (C) 1996-2001\n"
 "  Wrote the PET and CBM-II emulators, the CIA and VIA emulation,\n"
 "  the IEEE488 interface, implemented the IEC serial bus in `xvic'\n"
@@ -336,7 +336,7 @@ const char info_contrib_text[] =
 "  Copyright (C) 2011-2017\n"
 "  Provided the Spanish user interface translations.\n"
 "\n"
-"  Paul Dubé \n"
+"  Paul Dub\351 \n"
 "  Copyright (C) 2004-2017\n"
 "  Provided the French user interface translations.\n"
 "\n"
@@ -437,7 +437,7 @@ const char info_contrib_text[] =
 "  Implemented the SDL UI slider control and fixed some\n"
 "  GP2X/Dingoo SDL UI issues.\n"
 "\n"
-"  István Fábián\n"
+"  Istv\341n F\341bi\341n\n"
 "  Contributed a initial patch with the more correct 1541 bus\n"
 "  timing code and which gave us hints for to improving the 1541\n"
 "  emulation.\n"
@@ -525,7 +525,7 @@ const char info_contrib_text[] =
 "  driver, basic support for the OPENCBM library and some\n"
 "  other patches.\n"
 "\n"
-"  Frank König <frank_koenig@t-online.de>\n"
+"  Frank K\366nig <frank_koenig@t-online.de>\n"
 "  Contributed the Win32 joystick autofire feature.\n"
 "\n"
 "  Bernd Kortz <bernd.korz@yellowtab.com>\n"
@@ -564,7 +564,7 @@ const char info_contrib_text[] =
 "  lvd <lvd.mhm@gmail.com>\n"
 "  Provided some monitor fixes.\n"
 "\n"
-"  Marko Mäkelä <msmakela@gmail.com>\n"
+"  Marko M\344kel\344 <msmakela@gmail.com>\n"
 "  Wrote lots of CPU documentation. Wrote the VIC Flash Plugin\n"
 "  cartridge emulation in xvic. Wrote the Ultimem cartridge\n"
 "  emulation in xvic.\n"
@@ -615,7 +615,7 @@ const char info_contrib_text[] =
 "  Per Olofsson <MagerValp@Goth.Org>\n"
 "  Digitalized the C64 colors used in the (old) default palette.\n"
 "\n"
-"  Lasse Öörni <loorni@mail.student.oulu.fi>\n"
+"  Lasse \326\366rni <loorni@mail.student.oulu.fi>\n"
 "  Contributed the Windows Multimedia sound driver\n"
 "\n"
 "  Stein Pedersen <galfodo@users.sourceforge.net>\n"
@@ -648,7 +648,7 @@ const char info_contrib_text[] =
 "  David Roden\n"
 "  Fixed various issues related to ffmpeg settings.\n"
 "\n"
-"  Pablo Roldán <pdroldan@yahoo.com>\n"
+"  Pablo Rold\341n <pdroldan@yahoo.com>\n"
 "  Contributed initial patch for VIC-II PAL-N model selection.\n"
 "\n"
 "  Mathias Roslund <vice.emu@amidog.se>\n"
@@ -792,7 +792,7 @@ const char info_contrib_text[] =
 "\n"
 "  Last but not least, a very special thank to Andreas Arens, Lutz\n"
 "  Sammer, Edgar Tornig, Christian Bauer, Wolfgang Lorenz, Miha\n"
-"  Peternel, Per Håkan Sundell and David Horrocks for writing\n"
+"  Peternel, Per H\345kan Sundell and David Horrocks for writing\n"
 "  cool emulators to compete with.  :-)\n"
 "\n"
 "\n";
@@ -833,7 +833,7 @@ vice_team_t ex_team[] = {
     { "2000-2004", "Markus Brenner", "Markus Brenner <markus@brenner.de>" },
     { "1999-2004", "Thomas Bretz", "Thomas Bretz <tbretz@ph.tum.de>" },
     { "1997-2001", "Daniel Sladic", "Daniel Sladic <sladic@eecg.toronto.edu>" },
-    { "1996-2001", "André Fachat", "André Fachat <fachat@physik.tu-chemnitz.de>" },
+    { "1996-2001", "Andr\351 Fachat", "Andr\351 Fachat <fachat@physik.tu-chemnitz.de>" },
     { "1996-1999", "Ettore Perazzoli", "Ettore Perazzoli <ettore@comm2000.it>" },
     { "1993-1994, 1997-1999", "Teemu Rantanen", "Teemu Rantanen <tvr@cs.hut.fi>" },
     { "1993-1996", "Jouko Valta", "Jouko Valta <jopi@stekt.oulu.fi>" },
@@ -854,7 +854,7 @@ vice_trans_t trans_team[] = {
     { "2009-2017", "Mikkel Holm Olsen", "Danish", "Mikkel Holm Olsen <vice-dk@symlink.dk>" },
     { "2000-2017", "Martin Pottendorfer", "German", "Martin Pottendorfer <pottendo@gmx.net>" },
     { "2011-2017", "Manuel Antonio Rodriguez Bas", "Spanish", "Manuel Antonio Rodriguez Bas <formater@winuaespanol.com>" },
-    { "2004-2017", "Paul Dubé", "French", "Paul Dubé " },
+    { "2004-2017", "Paul Dub\351", "French", "Paul Dub\351 " },
     { "2006-2017", "Czirkos Zoltan", "Hungarian", "Czirkos Zoltan <cirix@fw.hu>" },
     { "2006-2017", "Karai Csaba", "Hungarian", "Karai Csaba <cskarai@freemail.hu>" },
     { "2001-2017", "Andrea Musuruane", "Italian", "Andrea Musuruane <musuruan@bmm.it>" },

src/Plugins/GoatTracker/CGT2Favorites.cpp

@@ -151,8 +151,9 @@ void CGT2Favorites::Load()
 		memset(&e.package, 0, sizeof(INSTRPACKAGE));
 
 		// displayName
-		if (entry["name"].type() == Hjson::Type::String)
-			e.displayName = (std::string)entry["name"];
+		Hjson::Value displayNameValue = entry["name"];
+		if (displayNameValue.type() == Hjson::Type::String)
+			e.displayName = static_cast<const std::string&>(displayNameValue);
 
 		// INSTR fields
 		if (entry["ad"].defined())        e.package.instr.ad        = (unsigned char)(int)entry["ad"];
@@ -161,9 +162,10 @@ void CGT2Favorites::Load()
 		if (entry["gatetimer"].defined()) e.package.instr.gatetimer = (unsigned char)(int)entry["gatetimer"];
 		if (entry["firstwave"].defined()) e.package.instr.firstwave = (unsigned char)(int)entry["firstwave"];
 
-		if (entry["instrname"].type() == Hjson::Type::String)
+		Hjson::Value instrumentNameValue = entry["instrname"];
+		if (instrumentNameValue.type() == Hjson::Type::String)
 		{
-			std::string n = (std::string)entry["instrname"];
+			std::string n = static_cast<const std::string&>(instrumentNameValue);
 			strncpy(e.package.instr.name, n.c_str(), MAX_INSTRNAMELEN - 1);
 			e.package.instr.name[MAX_INSTRNAMELEN - 1] = '\0';
 		}

src/Views/CViewFileBrowser.cpp

@@ -6,6 +6,7 @@
 #include <string>
 #include <cctype>
 #include "CSlrString.h"
+#include "SYS_FileSystem.h"
 
 using namespace ImGui;