backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Added FpsLimiter setting

Browse Source
This commit is contained in:
narzoul 2022-06-19 22:59:05 +02:00
parent bf58555d22
commit 8fc97386b6
16 changed files with 264 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DDrawCompat/Common/ScopedThreadPriority.h Normal file
View File

@ -0,0 +1,24 @@
#pragma once
#include <Windows.h>
namespace Compat
{
class ScopedThreadPriority
{
public:
ScopedThreadPriority(int priority)
: m_prevPriority(GetThreadPriority(GetCurrentThread()))
{
SetThreadPriority(GetCurrentThread(), priority);
}
~ScopedThreadPriority()
{
SetThreadPriority(GetCurrentThread(), m_prevPriority);
}
private:
int m_prevPriority;
};
}

11
DDrawCompat/Common/Time.cpp
View File

@ -5,24 +5,23 @@
namespace Time
{
long long g_qpcFrequency = 0;
HANDLE g_waitableTimer = nullptr;
void init()
{
LARGE_INTEGER qpc;
QueryPerformanceFrequency(&qpc);
g_qpcFrequency = qpc.QuadPart;
g_waitableTimer = CreateWaitableTimer(nullptr, FALSE, nullptr);
}
void waitForNextTick()
{
thread_local HANDLE waitableTimer = CreateWaitableTimer(nullptr, FALSE, nullptr);
LARGE_INTEGER due = {};
due.QuadPart = -1;
if (!g_waitableTimer ||
!SetWaitableTimer(g_waitableTimer, &due, 0, nullptr, nullptr, FALSE) ||
WAIT_OBJECT_0 != WaitForSingleObject(g_waitableTimer, INFINITE))
if (!waitableTimer ||
!SetWaitableTimer(waitableTimer, &due, 0, nullptr, nullptr, FALSE) ||
WAIT_OBJECT_0 != WaitForSingleObject(waitableTimer, INFINITE))
{
Sleep(1);
}

1
DDrawCompat/Config/Config.cpp
View File

@ -15,6 +15,7 @@ namespace Config
Settings::DisplayResolution displayResolution;
Settings::DpiAwareness dpiAwareness;
Settings::ForceD3D9On12 forceD3D9On12;
Settings::FpsLimiter fpsLimiter;
Settings::FullscreenMode fullscreenMode;
Settings::LogLevel logLevel;
Settings::RemoveBorders removeBorders;

2
DDrawCompat/Config/Config.h
View File

@ -13,6 +13,7 @@
#include <Config/Settings/DisplayResolution.h>
#include <Config/Settings/DpiAwareness.h>
#include <Config/Settings/ForceD3D9On12.h>
#include <Config/Settings/FpsLimiter.h>
#include <Config/Settings/FullscreenMode.h>
#include <Config/Settings/LogLevel.h>
#include <Config/Settings/RemoveBorders.h>
@ -42,6 +43,7 @@ namespace Config
extern Settings::DisplayResolution displayResolution;
extern Settings::DpiAwareness dpiAwareness;
extern Settings::ForceD3D9On12 forceD3D9On12;
extern Settings::FpsLimiter fpsLimiter;
extern Settings::FullscreenMode fullscreenMode;
extern Settings::LogLevel logLevel;
extern Settings::RemoveBorders removeBorders;

26
DDrawCompat/Config/Settings/FpsLimiter.cpp Normal file
View File

@ -0,0 +1,26 @@
#include <Config/Settings/FpsLimiter.h>
namespace Config
{
namespace Settings
{
FpsLimiter::FpsLimiter()
: MappedSetting("FpsLimiter", "off", {
{"off", OFF},
{"flipstart", FLIPSTART},
{"flipend", FLIPEND},
{"msgloop", MSGLOOP}
})
{
}
Setting::ParamInfo FpsLimiter::getParamInfo() const
{
if (OFF != m_value)
{
return { "MaxFPS", 10, 200, 60, m_param };
}
return {};
}
}
}

22
DDrawCompat/Config/Settings/FpsLimiter.h Normal file
View File

@ -0,0 +1,22 @@
#pragma once
#include <Config/MappedSetting.h>
namespace Config
{
namespace Settings
{
class FpsLimiter : public MappedSetting<UINT>
{
public:
static const UINT OFF = 0;
static const UINT FLIPSTART = 1;
static const UINT FLIPEND = 2;
static const UINT MSGLOOP = 3;
FpsLimiter();
virtual ParamInfo getParamInfo() const override;
};
}
}

30
DDrawCompat/DDraw/RealPrimarySurface.cpp
View File

@ -5,6 +5,7 @@
#include <Common/CompatPtr.h>
#include <Common/Hook.h>
#include <Common/ScopedCriticalSection.h>
#include <Common/ScopedThreadPriority.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <D3dDdi/Device.h>
@ -748,4 +749,33 @@ namespace DDraw
}
return true;
}
void RealPrimarySurface::waitForFlipFpsLimit()
{
static long long g_qpcPrevWaitEnd = Time::queryPerformanceCounter() - Time::g_qpcFrequency;
auto qpcNow = Time::queryPerformanceCounter();
auto qpcWaitEnd = g_qpcPrevWaitEnd + Time::g_qpcFrequency / Config::fpsLimiter.getParam();
if (qpcNow - qpcWaitEnd >= 0)
{
g_qpcPrevWaitEnd = qpcNow;
g_qpcDelayedFlipEnd = qpcNow;
return;
}
g_qpcPrevWaitEnd = qpcWaitEnd;
g_qpcDelayedFlipEnd = qpcWaitEnd;
Compat::ScopedThreadPriority prio(THREAD_PRIORITY_TIME_CRITICAL);
while (Time::qpcToMs(qpcWaitEnd - qpcNow) > 0)
{
Time::waitForNextTick();
flush();
qpcNow = Time::queryPerformanceCounter();
}
while (qpcWaitEnd - qpcNow > 0)
{
qpcNow = Time::queryPerformanceCounter();
}
g_qpcDelayedFlipEnd = Time::queryPerformanceCounter();
}
}

1
DDrawCompat/DDraw/RealPrimarySurface.h
View File

@ -34,5 +34,6 @@ namespace DDraw
static void setUpdateReady();
static void updateDevicePresentationWindowPos();
static bool waitForFlip(CompatWeakPtr<IDirectDrawSurface7> surface);
static void waitForFlipFpsLimit();
};
}

22
DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp
View File

@ -1,4 +1,5 @@
#include <Common/CompatPtr.h>
#include <Config/Config.h>
#include <D3dDdi/KernelModeThunks.h>
#include <D3dDdi/ScopedCriticalSection.h>
#include <DDraw/DirectDrawClipper.h>
@ -127,6 +128,12 @@ namespace DDraw
RealPrimarySurface::setUpdateReady();
RealPrimarySurface::flush();
RealPrimarySurface::waitForFlip(m_data->getDDS());
if (Config::Settings::FpsLimiter::FLIPSTART == Config::fpsLimiter.get())
{
RealPrimarySurface::waitForFlipFpsLimit();
}
auto surfaceTargetOverride(CompatPtr<TSurface>::from(lpDDSurfaceTargetOverride));
const bool isFlipEmulated = 0 != (PrimarySurface::getOrigCaps() & DDSCAPS_SYSTEMMEMORY);
if (isFlipEmulated)
@ -137,7 +144,12 @@ namespace DDraw
caps.dwCaps = DDSCAPS_BACKBUFFER;
getOrigVtable(This).GetAttachedSurface(This, &caps, &surfaceTargetOverride.getRef());
}
return Blt(This, nullptr, surfaceTargetOverride.get(), nullptr, DDBLT_WAIT, nullptr);
HRESULT result = Blt(This, nullptr, surfaceTargetOverride.get(), nullptr, DDBLT_WAIT, nullptr);
if (SUCCEEDED(result) && Config::Settings::FpsLimiter::FLIPEND == Config::fpsLimiter.get())
{
RealPrimarySurface::waitForFlipFpsLimit();
}
return result;
}
HRESULT result = SurfaceImpl::Flip(This, surfaceTargetOverride, DDFLIP_WAIT);
@ -147,7 +159,13 @@ namespace DDraw
}
PrimarySurface::updateFrontResource();
return RealPrimarySurface::flip(surfaceTargetOverride, dwFlags);
result = RealPrimarySurface::flip(surfaceTargetOverride, dwFlags);
if (SUCCEEDED(result) && Config::Settings::FpsLimiter::FLIPEND == Config::fpsLimiter.get())
{
DDraw::RealPrimarySurface::waitForFlip(m_data->getDDS());
RealPrimarySurface::waitForFlipFpsLimit();
}
return result;
}
template <typename TSurface>

5
DDrawCompat/DDraw/Surfaces/SurfaceImpl.cpp
View File

@ -14,6 +14,7 @@
#include <DDraw/Surfaces/Surface.h>
#include <DDraw/Surfaces/SurfaceImpl.h>
#include <Dll/Dll.h>
#include <Gdi/WinProc.h>
namespace
{
@ -110,6 +111,7 @@ namespace DDraw
TSurface* This, LPRECT lpDestRect, TSurface* lpDDSrcSurface, LPRECT lpSrcRect,
DWORD dwFlags, LPDDBLTFX lpDDBltFx)
{
Gdi::WinProc::startFrame();
RealPrimarySurface::waitForFlip(m_data->getDDS());
DirectDrawClipper::update();
return blt(This, lpDDSrcSurface, lpSrcRect, [=](TSurface* This, TSurface* lpDDSrcSurface, LPRECT lpSrcRect)
@ -120,6 +122,7 @@ namespace DDraw
HRESULT SurfaceImpl<TSurface>::BltFast(
TSurface* This, DWORD dwX, DWORD dwY, TSurface* lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans)
{
Gdi::WinProc::startFrame();
RealPrimarySurface::waitForFlip(m_data->getDDS());
return blt(This, lpDDSrcSurface, lpSrcRect, [=](TSurface* This, TSurface* lpDDSrcSurface, LPRECT lpSrcRect)
{ return getOrigVtable(This).BltFast(This, dwX, dwY, lpDDSrcSurface, lpSrcRect, dwTrans); });
@ -145,6 +148,7 @@ namespace DDraw
template <typename TSurface>
HRESULT SurfaceImpl<TSurface>::GetDC(TSurface* This, HDC* lphDC)
{
Gdi::WinProc::startFrame();
RealPrimarySurface::waitForFlip(m_data->getDDS());
HRESULT result = getOrigVtable(This).GetDC(This, lphDC);
if (SUCCEEDED(result))
@ -182,6 +186,7 @@ namespace DDraw
TSurface* This, LPRECT lpDestRect, TSurfaceDesc* lpDDSurfaceDesc,
DWORD dwFlags, HANDLE hEvent)
{
Gdi::WinProc::startFrame();
RealPrimarySurface::waitForFlip(m_data->getDDS());
HRESULT result = getOrigVtable(This).Lock(This, lpDestRect, lpDDSurfaceDesc, dwFlags, hEvent);
if (SUCCEEDED(result))

3
DDrawCompat/DDrawCompat.vcxproj
View File

@ -145,6 +145,7 @@
<ClInclude Include="Common\Path.h" />
<ClInclude Include="Common\Rect.h" />
<ClInclude Include="Common\ScopedSrwLock.h" />
<ClInclude Include="Common\ScopedThreadPriority.h" />
<ClInclude Include="Common\VtableHookVisitor.h" />
<ClInclude Include="Common\VtableSizeVisitor.h" />
<ClInclude Include="Common\VtableVisitor.h" />
@ -171,6 +172,7 @@
<ClInclude Include="Config\Settings\DisplayResolution.h" />
<ClInclude Include="Config\Settings\DpiAwareness.h" />
<ClInclude Include="Config\Settings\ForceD3D9On12.h" />
<ClInclude Include="Config\Settings\FpsLimiter.h" />
<ClInclude Include="Config\Settings\FullscreenMode.h" />
<ClInclude Include="Config\Settings\LogLevel.h" />
<ClInclude Include="Config\Settings\RemoveBorders.h" />
@ -307,6 +309,7 @@
<ClCompile Include="Config\Settings\DisplayFilter.cpp" />
<ClCompile Include="Config\Settings\DisplayRefreshRate.cpp" />
<ClCompile Include="Config\Settings\DisplayResolution.cpp" />
<ClCompile Include="Config\Settings\FpsLimiter.cpp" />
<ClCompile Include="Config\Settings\ResolutionScale.cpp" />
<ClCompile Include="Config\Settings\SpriteDetection.cpp" />
<ClCompile Include="Config\Settings\SpriteFilter.cpp" />

9
DDrawCompat/DDrawCompat.vcxproj.filters
View File

@ -576,6 +576,12 @@
<ClInclude Include="Config\Settings\DpiAwareness.h">
<Filter>Header Files\Config\Settings</Filter>
</ClInclude>
<ClInclude Include="Config\Settings\FpsLimiter.h">
<Filter>Header Files\Config\Settings</Filter>
</ClInclude>
<ClInclude Include="Common\ScopedThreadPriority.h">
<Filter>Header Files\Common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Gdi\Gdi.cpp">
@ -905,6 +911,9 @@
<ClCompile Include="Overlay\ButtonControl.cpp">
<Filter>Source Files\Overlay</Filter>
</ClCompile>
<ClCompile Include="Config\Settings\FpsLimiter.cpp">
<Filter>Source Files\Config\Settings</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="DDrawCompat.rc">

113
DDrawCompat/Gdi/WinProc.cpp
View File

@ -6,6 +6,8 @@
#include <Common/Hook.h>
#include <Common/Log.h>
#include <Common/ScopedSrwLock.h>
#include <Common/ScopedThreadPriority.h>
#include <Common/Time.h>
#include <Config/Config.h>
#include <Dll/Dll.h>
#include <DDraw/DirectDraw.h>
@ -28,6 +30,16 @@
namespace
{
class ScopedIncrement
{
public:
ScopedIncrement(unsigned& num) : m_num(num) { ++m_num; }
~ScopedIncrement() { --m_num; }
private:
unsigned& m_num;
};
struct WindowProc
{
WNDPROC wndProcA;
@ -42,6 +54,10 @@ namespace
thread_local unsigned g_inCreateDialog = 0;
thread_local unsigned g_inMessageBox = 0;
thread_local unsigned g_inWindowProc = 0;
thread_local long long g_qpcWaitEnd = 0;
thread_local bool g_isFrameStarted = false;
thread_local bool g_waiting = false;
WindowProc getWindowProc(HWND hwnd);
bool isUser32ScrollBar(HWND hwnd);
@ -68,6 +84,7 @@ namespace
decltype(&CallWindowProcA) callWindowProc, WNDPROC wndProc)
{
LOG_FUNC("ddcWindowProc", Compat::WindowMessageStruct(hwnd, uMsg, wParam, lParam));
ScopedIncrement inc(g_inWindowProc);
switch (uMsg)
{
@ -388,7 +405,53 @@ namespace
decltype(&PeekMessageA) origPeekMessage)
{
DDraw::RealPrimarySurface::setUpdateReady();
return origPeekMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
BOOL result = origPeekMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
if (!g_isFrameStarted || Config::Settings::FpsLimiter::MSGLOOP != Config::fpsLimiter.get())
{
return result;
}
auto qpcNow = Time::queryPerformanceCounter();
if (qpcNow - g_qpcWaitEnd >= 0)
{
if (!g_waiting)
{
g_qpcWaitEnd = qpcNow;
}
g_isFrameStarted = false;
g_waiting = false;
return result;
}
g_waiting = true;
if (result)
{
return result;
}
Compat::ScopedThreadPriority prio(THREAD_PRIORITY_TIME_CRITICAL);
while (Time::qpcToMs(g_qpcWaitEnd - qpcNow) > 0)
{
Time::waitForNextTick();
if (origPeekMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg))
{
return TRUE;
}
qpcNow = Time::queryPerformanceCounter();
}
while (g_qpcWaitEnd - qpcNow > 0)
{
if (origPeekMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg))
{
return TRUE;
}
qpcNow = Time::queryPerformanceCounter();
}
g_isFrameStarted = false;
g_waiting = false;
return result;
}
BOOL WINAPI peekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg)
@ -654,6 +717,54 @@ namespace Gdi
Gdi::Window::updateAll();
}
void startFrame()
{
if (Config::Settings::FpsLimiter::MSGLOOP != Config::fpsLimiter.get() || g_inWindowProc)
{
return;
}
auto fps = Config::fpsLimiter.getParam();
if (0 == fps)
{
fps = 1000;
}
if (!g_isFrameStarted)
{
g_qpcWaitEnd += Time::g_qpcFrequency / fps;
g_isFrameStarted = true;
return;
}
if (!g_waiting)
{
return;
}
g_qpcWaitEnd += Time::g_qpcFrequency / fps;
g_waiting = false;
auto qpcNow = Time::queryPerformanceCounter();
if (qpcNow - g_qpcWaitEnd >= 0)
{
return;
}
Compat::ScopedThreadPriority prio(THREAD_PRIORITY_TIME_CRITICAL);
while (Time::qpcToMs(g_qpcWaitEnd - qpcNow) > 0)
{
Time::waitForNextTick();
DDraw::RealPrimarySurface::flush();
qpcNow = Time::queryPerformanceCounter();
}
while (g_qpcWaitEnd - qpcNow > 0)
{
qpcNow = Time::queryPerformanceCounter();
}
}
void watchWindowPosChanges(WindowPosChangeNotifyFunc notifyFunc)
{

1
DDrawCompat/Gdi/WinProc.h
View File

@ -9,6 +9,7 @@ namespace Gdi
void dllThreadDetach();
void installHooks();
void onCreateWindow(HWND hwnd);
void startFrame();
void watchWindowPosChanges(WindowPosChangeNotifyFunc notifyFunc);
}
}

3
DDrawCompat/Overlay/ConfigWindow.cpp
View File

@ -17,7 +17,7 @@ namespace
namespace Overlay
{
ConfigWindow::ConfigWindow()
: Window(nullptr, { 0, 0, SettingControl::TOTAL_WIDTH, 350 }, Config::configHotKey.get())
: Window(nullptr, { 0, 0, SettingControl::TOTAL_WIDTH, 380 }, Config::configHotKey.get())
, m_buttonCount(0)
, m_focus(nullptr)
{
@ -31,6 +31,7 @@ namespace Overlay
addControl(Config::bltFilter);
addControl(Config::antialiasing);
addControl(Config::displayFilter);
addControl(Config::fpsLimiter);
addControl(Config::renderColorDepth);
addControl(Config::resolutionScale);
addControl(Config::spriteDetection);

2
DDrawCompat/Overlay/SettingControl.h
View File

@ -19,7 +19,7 @@ namespace Overlay
{
public:
static const int PARAM_LABEL_WIDTH = 70;
static const int PARAM_CONTROL_WIDTH = 151;
static const int PARAM_CONTROL_WIDTH = 241;
static const int SETTING_LABEL_WIDTH = 120;
static const int SETTING_CONTROL_WIDTH = 151;
static const int TOTAL_WIDTH =