diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 8de0db6b41..e5097481f0 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -517,7 +517,6 @@ set(pcsx2WindowsSources
gui/CpuUsageProviderMSW.cpp
windows/cheats/browser.cpp
windows/cheats/cheats.cpp
- windows/DwmSetup.cpp
windows/FlatFileReaderWindows.cpp
windows/Optimus.cpp
windows/PatchBrowser.cpp
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index e44ea51a57..a76b2ad16e 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -490,9 +490,6 @@ bool Pcsx2App::OnInit()
InitDefaultGlobalAccelerators();
delete wxLog::SetActiveTarget( new pxLogConsole() );
-#ifdef __WXMSW__
- pxDwm_Load();
-#endif
SysExecutorThread.Start();
DetectCpuAndUserMode();
@@ -656,10 +653,6 @@ void Pcsx2App::CleanupOnExit()
Console.Indent().Error( ex.FormatDiagnosticMessage() );
}
-#ifdef __WXMSW__
- pxDwm_Unload();
-#endif
-
// Notice: deleting the plugin manager (unloading plugins) here causes Lilypad to crash,
// likely due to some pending message in the queue that references lilypad procs.
// We don't need to unload plugins anyway tho -- shutdown is plenty safe enough for
diff --git a/pcsx2/gui/MSWstuff.h b/pcsx2/gui/MSWstuff.h
index 063c7dd90a..4779c37650 100644
--- a/pcsx2/gui/MSWstuff.h
+++ b/pcsx2/gui/MSWstuff.h
@@ -19,7 +19,3 @@
extern void MSW_SetWindowAfter( WXWidget hwnd, WXWidget hwndAfter );
extern void MSW_OutputDebugString( const wxString& text );
extern float MSW_GetDPIScale();
-
-extern void pxDwm_Load();
-extern void pxDwm_Unload();
-extern void pxDwm_SetPresentParams( WXWidget wnd );
diff --git a/pcsx2/windows/DwmSetup.cpp b/pcsx2/windows/DwmSetup.cpp
deleted file mode 100644
index 84d8f27130..0000000000
--- a/pcsx2/windows/DwmSetup.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* PCSX2 - PS2 Emulator for PCs
- * Copyright (C) 2002-2010 PCSX2 Dev Team
- *
- * PCSX2 is free software: you can redistribute it and/or modify it under the terms
- * of the GNU Lesser General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * PCSX2 is distributed in the hope that it will be useful, 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.
- *
- * You should have received a copy of the GNU General Public License along with PCSX2.
- * If not, see .
- */
-
-#include "PrecompiledHeader.h"
-#include "Utilities/Console.h"
-#include "MSWstuff.h"
-
-#include
-#include
-
-#include
-
-typedef HRESULT WINAPI Fntype_DwmEnableMMCSS(DWORD enable);
-typedef HRESULT WINAPI Fntype_DwmSetPresentParameters( HWND hwnd, DWM_PRESENT_PARAMETERS *pPresentParams );
-
-static wxDynamicLibrary lib_dwmapi;
-
-// This could potentially reduce lag while running in Aero,
-// by telling the DWM the application requires
-// multimedia-class scheduling for smooth display.
-void pxDwm_Load()
-{
- wxDoNotLogInThisScope please;
-
- // Version test is not needed since we're using LoadLibrary. --air
-
- /*OSVERSIONINFOEX info = {0};
- info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
- info.dwMajorVersion = 6;
-
- DWORDLONG mask=0;
- VER_SET_CONDITION(mask,VER_MAJORVERSION, VER_GREATER_EQUAL);
- VER_SET_CONDITION(mask,VER_MINORVERSION, VER_GREATER_EQUAL);
- VER_SET_CONDITION(mask,VER_SERVICEPACKMAJOR,VER_GREATER_EQUAL);
- VER_SET_CONDITION(mask,VER_SERVICEPACKMINOR,VER_GREATER_EQUAL);
-
- //info
- if(VerifyVersionInfo(&info,
- VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR,
- mask))*/
-
- lib_dwmapi.Load( L"dwmapi.dll" );
- if( !lib_dwmapi.IsLoaded() ) return;
-
- if( Fntype_DwmEnableMMCSS* pDwmEnableMMCSS = (Fntype_DwmEnableMMCSS*)lib_dwmapi.GetSymbol(L"DwmEnableMMCSS") )
- {
- Console.WriteLn( "[Dwm] Desktop Window Manager detected." );
-
- // Seems to set the Windows timer resolution to 10ms
- if(FAILED(pDwmEnableMMCSS(TRUE)))
- Console.WriteLn("[Dwm] DwmEnableMMCSS returned a failure code.");
- }
-}
-
-// wnd - this parameter should be the GS display panel or the top level frame that holds it (not
-// sure if it's supposed to be the actual gsPanel or the top level window/frame that the
-// panel belongs to)
-//
-void pxDwm_SetPresentParams( WXWidget wnd )
-{
- if( !lib_dwmapi.IsLoaded() ) return;
- Fntype_DwmSetPresentParameters* pDwmSetPresentParameters = (Fntype_DwmSetPresentParameters*)lib_dwmapi.GetSymbol(L"DwmSetPresentParameters");
-
- if( pDwmSetPresentParameters == NULL ) return;
-
- DWM_PRESENT_PARAMETERS params;
-
- params.cbSize = sizeof(DWM_PRESENT_PARAMETERS);
- params.fQueue = FALSE;
-
- if(FAILED(pDwmSetPresentParameters( (HWND)wnd, ¶ms )))
- Console.WriteLn("[Dwm] DwmSetPresentParameters returned a failure code.");
-
- //DwmSetDxFrameDuration(hMainWindow,1);
-}
-
-void pxDwm_Unload()
-{
- lib_dwmapi.Unload();
-}
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj
index 9154f5fc10..2752cb31f9 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj
@@ -394,7 +394,6 @@
-
diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
index b4d3bcce84..5a6bc37cfd 100644
--- a/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
+++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
@@ -716,9 +716,6 @@
AppHost\Panels
-
- AppHost\Win32
-
AppHost\Win32