From c04cff832a7aa4f705e4bd7a56f158e7144ea817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 24 Apr 2016 01:35:44 +0200 Subject: [PATCH] End of support for Windows XP. Over three years ago Microsoft ended support for Windows XP. Today we do the same. If you still using this system we strongly encourage to update to a supported, secure operating system. --- Readme.md | 2 +- distrib/custom_messages.iss | 2 +- distrib/mpc-hc_setup.iss | 2 +- docs/Changelog.txt | 1 + docs/Readme.txt | 2 +- docs/Todo.md | 3 +-- src/mpc-hc/PPageOutput.cpp | 1 - src/mpc-hc/mpc-hc.rc | 7 +++---- src/mpc-hc/resource.h | 1 - 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Readme.md b/Readme.md index 0b94d3e946c..6af9a430bb2 100644 --- a/Readme.md +++ b/Readme.md @@ -38,7 +38,7 @@ See [CONTRIBUTING.md](/CONTRIBUTING.md) for more info. ## System Requirements * An SSE2 capable CPU -* Windows XP SP3, Vista, 7, 8, 8.1, 10 32-bit/64-bit +* Windows Vista, 7, 8, 8.1, 10 32-bit/64-bit ## Links diff --git a/distrib/custom_messages.iss b/distrib/custom_messages.iss index 9a8f7633986..fefe8d63d75 100644 --- a/distrib/custom_messages.iss +++ b/distrib/custom_messages.iss @@ -28,7 +28,7 @@ ; English WelcomeLabel1=[name/ver] en.WelcomeLabel2=This will install [name] on your computer.%n%nIt is recommended that you close all other applications before continuing. -en.WinVersionTooLowError=[name] requires Windows XP Service Pack 3 or newer to run. +en.WinVersionTooLowError=[name] requires Windows Vista or newer to run. [CustomMessages] diff --git a/distrib/mpc-hc_setup.iss b/distrib/mpc-hc_setup.iss index 819a7688935..8af1cb3167e 100644 --- a/distrib/mpc-hc_setup.iss +++ b/distrib/mpc-hc_setup.iss @@ -158,7 +158,7 @@ AllowNoIcons = yes ShowTasksTreeLines = yes DisableDirPage = auto DisableProgramGroupPage = auto -MinVersion = 5.1sp3 +MinVersion = 6.0 CloseApplications = true #ifexist "..\signinfo.txt" SignTool = MySignTool diff --git a/docs/Changelog.txt b/docs/Changelog.txt index 3fa2947e819..66ec553c4f3 100644 --- a/docs/Changelog.txt +++ b/docs/Changelog.txt @@ -16,6 +16,7 @@ next version - not released yet * Updated sanear to v0.3 * Updated Unrar to v5.5.7 * Split internal MPEG source filter option into a PS and TS variant +* End of support for Windows XP ! Fixed text subtitle rendering in Avisynth ! Fixed DPI scaling of non-client areas in main window ! Prevent crash for ASS subtitles with invalid (too high) blur values diff --git a/docs/Readme.txt b/docs/Readme.txt index f34c270067d..8e20a26f2ba 100644 --- a/docs/Readme.txt +++ b/docs/Readme.txt @@ -30,7 +30,7 @@ Main Features System Requirements ------------------- * An SSE2 capable CPU -* Windows XP SP3, Vista, 7, 8, 8.1, 10 32-bit/64-bit +* Windows Vista, 7, 8, 8.1, 10 32-bit/64-bit Links diff --git a/docs/Todo.md b/docs/Todo.md index 2c038f4a68b..ee2eaab43a8 100644 --- a/docs/Todo.md +++ b/docs/Todo.md @@ -9,7 +9,7 @@ 5. Improve nightly builds script to skip rebuilding LAV Filters if no relevant change has been committed 6. Investigate using AppVeyor for nightlies 7. Remove VirtualDub?? -8. Drop DX SDK 9, probably along with XP drop +8. Drop DX SDK 9 dependency 9. Do we need include qt, realmedia, vd2, winddk? 10. Remove some obsolete or unused stuff. DSUtil/vd\*, deinterlace, NullRenderers, filters/muxers, LCDUI, Struct.h, Line21 decoder, WinLIRC, uICE. 11. Remove VS2015 support @@ -17,7 +17,6 @@ ## MPC-HC 1. Remove support for unneeded/obsolete renderers -2. Drop XP support after its EOL ## MPCIconLib diff --git a/src/mpc-hc/PPageOutput.cpp b/src/mpc-hc/PPageOutput.cpp index 00e30cd34b5..9520627d6a2 100644 --- a/src/mpc-hc/PPageOutput.cpp +++ b/src/mpc-hc/PPageOutput.cpp @@ -561,7 +561,6 @@ void CPPageOutput::OnDSRendererChange() m_iDSDXVASupport.SetIcon(m_tick); } m_iDSSaveImageSupport.SetIcon(m_tick); - m_wndToolTip.UpdateTipText(ResStr(IDC_DSEVR), GetDlgItem(IDC_VIDRND_COMBO)); break; case VIDRNDT_DS_NULL_COMP: m_wndToolTip.UpdateTipText(ResStr(IDC_DSNULL_COMP), GetDlgItem(IDC_VIDRND_COMBO)); diff --git a/src/mpc-hc/mpc-hc.rc b/src/mpc-hc/mpc-hc.rc index 587869c086d..b1325e9e0a8 100644 --- a/src/mpc-hc/mpc-hc.rc +++ b/src/mpc-hc/mpc-hc.rc @@ -2452,16 +2452,15 @@ END STRINGTABLE BEGIN - IDC_DSSYSDEF "Default video renderer filter for DirectShow. Others will fall back to this one when they can't be loaded for some reason. On Windown XP this is the same as VMR-7 (windowed)." + IDC_DSSYSDEF "Default video renderer filter for DirectShow. Others will fall back to this one when they can't be loaded for some reason." IDC_DSOLD "This is the default renderer of Windows 9x/me/2k. Depending on the visibility of the video window and your video card's abilities, it will switch between GDI, DirectDraw, Overlay rendering modes dynamically." IDC_DSOVERLAYMIXER "Always renders in overlay. Generally only YUV formats are allowed, but they are presented directly without any color conversion to RGB. This is the fastest rendering method of all and the only where you can be sure about fullscreen video mirroring to tv-out activating." IDC_DSVMR9WIN "Only available if you have DirectX 9 installed. Very stable but it will never use Overlay rendering and because of this it may be a little slower than Overlay mixer." - IDC_DSVMR9REN "Same as the VMR-9 (windowed), but with the Allocator-Presenter plugin of MPC-HC for subtitling. Overlay video mirroring MIGHT work. ""True Color"" desktop color space recommended. Recommended for Windows XP." + IDC_DSVMR9REN "Same as the VMR-9 (windowed), but with the Allocator-Presenter plugin of MPC-HC for subtitling. Overlay video mirroring MIGHT work. ""True Color"" desktop color space recommended." IDC_DSDXR "Same as the VMR-9 (renderless), but uses a true two-pass bicubic resizer." IDC_DSNULL_COMP "Connects to any video-like media type and will send the incoming samples to nowhere. Use it when you don't need the video display and want to save the CPU from working unnecessarily." IDC_DSNULL_UNCOMP "Same as the normal Null renderer, but this will only connect to uncompressed types." - IDC_DSEVR "Only available on Vista or later or on XP with at least .NET Framework 3.5 installed." - IDC_DSEVR_CUSTOM "Same as the EVR, but with the Allocator-Presenter of MPC-HC for subtitling and postprocessing. Recommended for Windows Vista or later." + IDC_DSEVR_CUSTOM "Same as the EVR, but with the Allocator-Presenter of MPC-HC for subtitling and postprocessing. Recommended." END STRINGTABLE diff --git a/src/mpc-hc/resource.h b/src/mpc-hc/resource.h index b95155aa854..fdb2605ff01 100644 --- a/src/mpc-hc/resource.h +++ b/src/mpc-hc/resource.h @@ -468,7 +468,6 @@ #define IDC_DSDXR 12107 #define IDC_DSNULL_COMP 12108 #define IDC_DSNULL_UNCOMP 12109 -#define IDC_DSEVR 12110 #define IDC_DSEVR_CUSTOM 12111 #define IDC_DSMADVR 12112 #define IDC_DSSYNC 12113