bink: Bump to C++23

dimhotepus · Jun 27, 2024 · 57327c7 · 57327c7
1 parent d845b4d
commit 57327c7
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 56 deletions.
diff --git a/bink_media_player/bink_media_player.vcxproj b/bink_media_player/bink_media_player.vcxproj
@@ -105,9 +105,9 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -144,9 +144,9 @@ copy /B "$(SolutionDir)out\binkmp\$(Platform)\$(Configuration)\binkmp.dll" "$(Ou
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -188,8 +188,8 @@ copy /B "$(SolutionDir)out\binkmp\$(Platform)\$(Configuration)\binkmp.dll" "$(Ou
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -233,8 +233,8 @@ copy /B "$(SolutionDir)out\binkmp\$(Platform)\$(Configuration)\binkmp.dll" "$(Ou
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/bink_media_player/bink_media_player_host.cc b/bink_media_player/bink_media_player_host.cc
@@ -79,13 +79,12 @@ namespace bink {
   }
 
   auto mss_create_result = bink::MssDigitalDriverFactory::Create(mss_settings);
-  if (auto *error = std::get_if<const char *>(&mss_create_result))
-      [[unlikely]] {
-    return NewResult{*error};
+  if (!mss_create_result.has_value()) [[unlikely]] {
+    return NewResult{std::unexpect, mss_create_result.error()};
   }
 
-  auto mss_digital_driver = std::move(
-      std::get<std::unique_ptr<bink::IMssDigitalDriver>>(mss_create_result));
+  std::unique_ptr<bink::IMssDigitalDriver> &mss_digital_driver =
+      mss_create_result.value();
 
   auto bink_create_result =
       bink::BinkMediaPlayerFactory::Create(bink::BinkMediaPlayerSettings{
@@ -96,13 +95,12 @@ namespace bink {
           .sound_output_system = bink::BinkSoundOutputSystem::Miles,
           .miles_driver_or_direct_sound = mss_digital_driver->native_handle(),
           .used_cpus_count = player_settings.used_cpus_count});
-  if (const auto *error = std::get_if<const char *>(&bink_create_result))
-      [[unlikely]] {
-    return NewResult{*error};
+  if (!bink_create_result.has_value()) [[unlikely]] {
+    return NewResult{std::unexpect, bink_create_result.error()};
   }
 
-  std::unique_ptr<bink::IBinkMediaPlayer> bink_media_player = std::move(
-      std::get<std::unique_ptr<bink::IBinkMediaPlayer>>(bink_create_result));
+  std::unique_ptr<bink::IBinkMediaPlayer> &bink_media_player =
+      bink_create_result.value();
 
   if (maybe_general_settings.has_value()) {
     const auto &audio_controls = bink_media_player->GetAudioControls();
@@ -131,16 +129,17 @@ BinkMediaPlayerHost &BinkMediaPlayerHost::operator=(
   return *this;
 }
 
-[[nodiscard]] BinkMediaPlayerHostTickResult BinkMediaPlayerHost::Tick() const noexcept {
+[[nodiscard]] BinkMediaPlayerHostTickResult BinkMediaPlayerHost::Tick()
+    const noexcept {
   // Is it time for a new Bink frame?
   if (bink_media_player_->CanPresent()) {
     // Yup, draw the next frame.
     bink_media_player_->Present(false);
 
     // Check player has frames to present.
     return bink_media_player_->HasFrames()
-        ? BinkMediaPlayerHostTickResult::HasFrames
-        : BinkMediaPlayerHostTickResult::NoFrames;
+               ? BinkMediaPlayerHostTickResult::HasFrames
+               : BinkMediaPlayerHostTickResult::NoFrames;
   }
 
   // Nope, give the rest of the system a chance to run.

diff --git a/bink_media_player/bink_media_player_host.h b/bink_media_player/bink_media_player_host.h
@@ -109,7 +109,7 @@ class BinkMediaPlayerHost {
   /**
    * @brief Bink media player host creation result.
    */
-  using NewResult = std::variant<BinkMediaPlayerHost, const char *>;
+  using NewResult = std::expected<BinkMediaPlayerHost, const char *>;
 
   /**
    * @brief Creates bink media player host.

diff --git a/bink_media_player/main.cc b/bink_media_player/main.cc
@@ -285,8 +285,8 @@ int WINAPI WinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE,
       bink::ScopedComInitializerFlags::kApartmentThreaded |
       bink::ScopedComInitializerFlags::kDisableOle1Dde |
       bink::ScopedComInitializerFlags::kSpeedOverMemory);
-  if (const auto *rc = std::get_if<std::error_code>(&scoped_com_initializer)) {
-    std::string error{rc->message()};
+  if (!scoped_com_initializer.has_value()) {
+    std::string error{scoped_com_initializer.error().message()};
     error.insert(0, "Component Object Model initialization failed: ");
 
     MessageBoxA(0, error.c_str(), "Bink Media Player - COM Initialize Error",
@@ -331,18 +331,17 @@ int WINAPI WinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE,
        .window = window,
        .bink_flags = kBinkFlags,
        .used_cpus_count = good_enough_decoder_cpu_cores_count});
-  if (const auto *error =
-          std::get_if<const char *>(&bink_media_player_result)) {
-    ::MessageBoxA(window, *error, "Bink Media Player - Media Open Error",
-                  MB_OK | MB_ICONSTOP);
+  if (!bink_media_player_result.has_value()) {
+    ::MessageBoxA(window, bink_media_player_result.error(),
+                  "Bink Media Player - Media Open Error", MB_OK | MB_ICONSTOP);
     return 4;  //-V112
   }
 
-  auto maybe_bink_media_player = std::optional{
-      std::get<bink::BinkMediaPlayerHost>(std::move(bink_media_player_result))};
+  auto maybe_bink_media_player =
+      std::optional{std::move(*bink_media_player_result)};
   bink_media_player_host.swap(maybe_bink_media_player);
 
-  bink::BinkMediaInfo media_info;
+  bink::BinkMediaInfo media_info = {0};
   if (!bink_media_player_host->GetMediaInfo(media_info)) {
     ::MessageBoxA(window, "Unable to get media info.",
                   "Bink Media Player - Media Open Error", MB_OK | MB_ICONSTOP);
@@ -367,8 +366,8 @@ int WINAPI WinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE,
 
     // Has Bink presented something?
     if (tick_result != bink::BinkMediaPlayerHostTickResult::NotReady) {
-      const auto has_frames = tick_result ==
-          bink::BinkMediaPlayerHostTickResult::HasFrames;
+      const auto has_frames =
+          tick_result == bink::BinkMediaPlayerHostTickResult::HasFrames;
 
       // No frames, lets close.
       if (!has_frames) ::DestroyWindow(window);

diff --git a/bink_media_player/scoped_com_initializer.h b/bink_media_player/scoped_com_initializer.h
@@ -94,7 +94,8 @@ class ScopedComInitializer {
     auto init = ScopedComInitializer{flags};
     return !init.error_code()
                ? SystemResult<ScopedComInitializer>{std::move(init)}
-               : SystemResult<ScopedComInitializer>{init.error_code()};
+               : SystemResult<ScopedComInitializer>{std::unexpect,
+                                                    init.error_code()};
   }
 
   ScopedComInitializer(ScopedComInitializer&& i) noexcept

diff --git a/binkmp/bink_media_player_factory.cc b/binkmp/bink_media_player_factory.cc
@@ -61,12 +61,13 @@ CreateResult<IBinkMediaPlayer> BinkMediaPlayerFactory::Create(
 #endif
     )
   };
-  if (setup_error) return CreateResult<IBinkMediaPlayer>{setup_error};
+  if (setup_error)
+    return CreateResult<IBinkMediaPlayer>{std::unexpect, setup_error};
 
   auto player = std::make_unique<BinkMediaPlayer>(settings);
-  return player->IsOpened()
-             ? CreateResult<IBinkMediaPlayer>{std::move(player)}
-             : CreateResult<IBinkMediaPlayer>{player->GetLastError()};
+  return player->IsOpened() ? CreateResult<IBinkMediaPlayer>{std::move(player)}
+                            : CreateResult<IBinkMediaPlayer>{
+                                  std::unexpect, player->GetLastError()};
 }
 
 }  // namespace bink
diff --git a/binkmp/binkmp.vcxproj b/binkmp/binkmp.vcxproj
@@ -130,9 +130,9 @@
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -167,9 +167,9 @@ if "$(PlatformShortName)" == "x86" (
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -201,9 +201,9 @@ if "$(PlatformShortName)" == "x86" (
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -238,9 +238,9 @@ if "$(PlatformShortName)" == "x86" (
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/binkmp/include/bink_base.h b/binkmp/include/bink_base.h
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <memory>
 #include <system_error>
-#include <variant>
+#include <expected>
 
 /*
  * Checks x is set in debug mode.
@@ -44,13 +44,13 @@ namespace bink {
  * @brief Bink media player create result.
  */
 template <typename T>
-using CreateResult = std::variant<std::unique_ptr<T>, const char*>;
+using CreateResult = std::expected<std::unique_ptr<T>, const char*>;
 
 /**
  * @brief Error code result.
  */
 template <typename T>
-using SystemResult = std::variant<T, std::error_code>;
+using SystemResult = std::expected<T, std::error_code>;
 
 }  // namespace bink
 

diff --git a/binkmp/include/ibink_audio_controls.h b/binkmp/include/ibink_audio_controls.h
@@ -54,14 +54,14 @@ struct BINK_ATTRIBUTE_NO_VTABLE IBinkAudioControls {
    * @brief Get tracks count.
    * @return Tracks count.
    */
-  virtual [[nodiscard]] uint32_t GetTracksCount() const noexcept = 0;
+  [[nodiscard]] virtual uint32_t GetTracksCount() const noexcept = 0;
 
   /**
    * @brief Get track by id.
    * @param track_id Track id.
    * @return Track if any.
    */
-  virtual [[nodiscard]] std::unique_ptr<IBinkAudioTrack> GetTrackById(
+  [[nodiscard]] virtual std::unique_ptr<IBinkAudioTrack> GetTrackById(
       AudioTrackId track_id) const noexcept = 0;
 
   /**

diff --git a/binkmp/mss_digital_driver_factory.cc b/binkmp/mss_digital_driver_factory.cc
@@ -13,9 +13,9 @@ CreateResult<IMssDigitalDriver> MssDigitalDriverFactory::Create(
   auto driver = std::make_unique<MssDigitalDriver>(
       settings.frequency, settings.bits_per_sample, settings.channels_count,
       settings.flags);
-  return driver->IsOpened()
-             ? CreateResult<IMssDigitalDriver>{std::move(driver)}
-             : CreateResult<IMssDigitalDriver>{driver->GetLastError()};
+  return driver->IsOpened() ? CreateResult<IMssDigitalDriver>{std::move(driver)}
+                            : CreateResult<IMssDigitalDriver>{
+                                  std::unexpect, driver->GetLastError()};
 }
 
 }  // namespace bink
diff --git a/binkw/binkw.vcxproj b/binkw/binkw.vcxproj
@@ -102,9 +102,11 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__RADINDLL__;_DEBUG;BINKW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -122,9 +124,11 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__RADINDLL__;WIN32;_DEBUG;BINKW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -144,9 +148,11 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__RADINDLL__;WIN32;NDEBUG;BINKW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -168,9 +174,11 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__RADINDLL__;NDEBUG;BINKW_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/mss/mss.vcxproj b/mss/mss.vcxproj
@@ -103,6 +103,9 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -120,6 +123,9 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -139,6 +145,9 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -160,6 +169,9 @@
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>4100</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>