From 9d9116bc040bc44ce2c4ee3e505bccc2445d323c Mon Sep 17 00:00:00 2001 From: NaamloosDT Date: Mon, 20 Nov 2017 19:37:31 +0100 Subject: [PATCH] Fix windows 7 support --- foobar2000/ATLHelpers/foobar2000_ATL_helpers.vcxproj | 1 + foobar2000/SDK/foobar2000_SDK.vcxproj | 1 + foobar2000/foo_mediacontrol/Discord.h | 3 +-- foobar2000/foo_mediacontrol/foo_mediacontrol.vcxproj | 3 ++- foobar2000/foo_mediacontrol/main.cpp | 2 +- foobar2000/foo_mediacontrol/track_data.cpp | 2 -- foobar2000/foo_mediacontrol/track_data.h | 9 +-------- .../foobar2000_component_client.vcxproj | 1 + foobar2000/helpers/CPowerRequest.h | 2 +- foobar2000/helpers/foobar2000_sdk_helpers.vcxproj | 1 + pfc/pfc.vcxproj | 1 + 11 files changed, 11 insertions(+), 15 deletions(-) diff --git a/foobar2000/ATLHelpers/foobar2000_ATL_helpers.vcxproj b/foobar2000/ATLHelpers/foobar2000_ATL_helpers.vcxproj index 21c1dab..865d158 100644 --- a/foobar2000/ATLHelpers/foobar2000_ATL_helpers.vcxproj +++ b/foobar2000/ATLHelpers/foobar2000_ATL_helpers.vcxproj @@ -116,6 +116,7 @@ ProgramDatabase NotSet $(ProjectDir)Include;%(AdditionalIncludeDirectories) + MultiThreaded diff --git a/foobar2000/SDK/foobar2000_SDK.vcxproj b/foobar2000/SDK/foobar2000_SDK.vcxproj index 392ac66..96c3f77 100644 --- a/foobar2000/SDK/foobar2000_SDK.vcxproj +++ b/foobar2000/SDK/foobar2000_SDK.vcxproj @@ -134,6 +134,7 @@ true ProgramDatabase NotSet + MultiThreaded NDEBUG;%(PreprocessorDefinitions) diff --git a/foobar2000/foo_mediacontrol/Discord.h b/foobar2000/foo_mediacontrol/Discord.h index 67ec833..47d01a8 100644 --- a/foobar2000/foo_mediacontrol/Discord.h +++ b/foobar2000/foo_mediacontrol/Discord.h @@ -24,7 +24,6 @@ void handleDiscordJoinRequest(const DiscordJoinRequest* request) {} void discordInit() { - char buffer[256]; DiscordEventHandlers handlers; memset(&handlers, 0, sizeof(handlers)); handlers.ready = handleDiscordReady; @@ -39,7 +38,7 @@ void discordInit() void UpdatePresence(wchar_t *songname, wchar_t *artist) { char buffer[256]; - sprintf(buffer, "%s - %s", util::wide_to_utf8(artist), util::wide_to_utf8(songname)); + sprintf_s(buffer, 256, "%s - %s", util::wide_to_utf8(artist), util::wide_to_utf8(songname)); DiscordRichPresence discordPresence; memset(&discordPresence, 0, sizeof(discordPresence)); discordPresence.largeImageKey = "fb2000"; diff --git a/foobar2000/foo_mediacontrol/foo_mediacontrol.vcxproj b/foobar2000/foo_mediacontrol/foo_mediacontrol.vcxproj index e0dca01..97e98f5 100644 --- a/foobar2000/foo_mediacontrol/foo_mediacontrol.vcxproj +++ b/foobar2000/foo_mediacontrol/foo_mediacontrol.vcxproj @@ -88,7 +88,8 @@ $(SolutionDir)..\ATLHelpers\Include /ZW:nostdlib /FUplatform.winmd /FUwindows.winmd /Zi /sdl- %(AdditionalOptions) $(VSInstallDir)\vc\vcpackages;$(WindowsSdkDir)UnionMetadata;%(AdditionalUsingDirectories) - true + false + MultiThreaded Windows diff --git a/foobar2000/foo_mediacontrol/main.cpp b/foobar2000/foo_mediacontrol/main.cpp index 14ac06c..1dda535 100644 --- a/foobar2000/foo_mediacontrol/main.cpp +++ b/foobar2000/foo_mediacontrol/main.cpp @@ -1,4 +1,4 @@ #include "stdafx.h" -DECLARE_COMPONENT_VERSION("Discord Rich Presences","1.1","Adds the ability for foobar2000 to interact with Discord."); +DECLARE_COMPONENT_VERSION("Discord Rich Presences","1.2","Adds the ability for foobar2000 to interact with Discord."); VALIDATE_COMPONENT_FILENAME("foo_discord.dll"); diff --git a/foobar2000/foo_mediacontrol/track_data.cpp b/foobar2000/foo_mediacontrol/track_data.cpp index 849e169..a829bf0 100644 --- a/foobar2000/foo_mediacontrol/track_data.cpp +++ b/foobar2000/foo_mediacontrol/track_data.cpp @@ -15,7 +15,6 @@ track_data::track_data(metadb_handle_ptr metadb_data) { if (container != nullptr) { const file_info& info = container->info(); - m_genres = genre_data_vector(); // populate basic info map for (track_data_map::iterator it = m_data.begin(); it != m_data.end(); ++it) { @@ -35,7 +34,6 @@ track_data::track_data(metadb_handle_ptr metadb_data) { wchar_t* substring = wcstok_s(genres, genre_separator, &context); while (substring) { - m_genres.push_back(ref new Platform::String(substring)); substring = wcstok_s(nullptr, genre_separator, &context); } diff --git a/foobar2000/foo_mediacontrol/track_data.h b/foobar2000/foo_mediacontrol/track_data.h index ffd0d36..ea3fdd8 100644 --- a/foobar2000/foo_mediacontrol/track_data.h +++ b/foobar2000/foo_mediacontrol/track_data.h @@ -7,10 +7,8 @@ #define QUERY_TRACK_NUMBER "track number" #include -#include typedef std::map track_data_map; -typedef std::vector genre_data_vector; class track_data { public: @@ -49,10 +47,6 @@ class track_data { return m_name; } - inline genre_data_vector& get_genres() { - return m_genres; - } - inline album_art_data::ptr& get_album_art() { return m_album_art; } @@ -67,8 +61,7 @@ class track_data { { QUERY_ALBUM, empty }, { QUERY_TRACK_NUMBER, empty } }; - - genre_data_vector m_genres; + album_art_data::ptr m_album_art = nullptr; wchar_t* m_name; diff --git a/foobar2000/foobar2000_component_client/foobar2000_component_client.vcxproj b/foobar2000/foobar2000_component_client/foobar2000_component_client.vcxproj index e5ffd9b..97d9c1c 100644 --- a/foobar2000/foobar2000_component_client/foobar2000_component_client.vcxproj +++ b/foobar2000/foobar2000_component_client/foobar2000_component_client.vcxproj @@ -132,6 +132,7 @@ true ProgramDatabase NotSet + MultiThreaded NDEBUG;%(PreprocessorDefinitions) diff --git a/foobar2000/helpers/CPowerRequest.h b/foobar2000/helpers/CPowerRequest.h index 3fb907d..dd6d68a 100644 --- a/foobar2000/helpers/CPowerRequest.h +++ b/foobar2000/helpers/CPowerRequest.h @@ -53,7 +53,7 @@ class CPowerRequestAPI { static bool IsWin8() { auto ver = myGetOSVersion(); - return ver >= 0x602; + return true; } static WORD myGetOSVersion() { const DWORD ver = GetVersion(); diff --git a/foobar2000/helpers/foobar2000_sdk_helpers.vcxproj b/foobar2000/helpers/foobar2000_sdk_helpers.vcxproj index af8085c..1029d4f 100644 --- a/foobar2000/helpers/foobar2000_sdk_helpers.vcxproj +++ b/foobar2000/helpers/foobar2000_sdk_helpers.vcxproj @@ -91,6 +91,7 @@ true ProgramDatabase NotSet + MultiThreaded NDEBUG;%(PreprocessorDefinitions) diff --git a/pfc/pfc.vcxproj b/pfc/pfc.vcxproj index e71b45c..18799e3 100644 --- a/pfc/pfc.vcxproj +++ b/pfc/pfc.vcxproj @@ -134,6 +134,7 @@ true ProgramDatabase NotSet + MultiThreaded NDEBUG;%(PreprocessorDefinitions)