Переименование m_bIsFullscreen в m_bExclusiveScreen, потому что это именно "эксклюзивный" полный экран, а не растянутое на весь рабочий стол окно.

Author: v0lt

Source/DX11VideoProcessor.cpp

@@ -548,7 +548,7 @@ HRESULT CDX11VideoProcessor::Init(const HWND hwnd, const bool displayHdrChanged,
 
 	FillDisplayParams();
 
-	if (m_bIsFullscreen != m_pFilter->m_bIsFullscreen) {
+	if (m_bExclusiveScreen != m_pFilter->m_bExclusiveScreen) {
 		m_srcVideoTransferFunction = 0;
 	}
 
@@ -560,7 +560,7 @@ HRESULT CDX11VideoProcessor::Init(const HWND hwnd, const bool displayHdrChanged,
 
 		SetCallbackDevice();
 
-		if (!m_pDXGISwapChain1 || m_bIsFullscreen != m_pFilter->m_bIsFullscreen || bWindowChanged) {
+		if (!m_pDXGISwapChain1 || m_bExclusiveScreen != m_pFilter->m_bExclusiveScreen || bWindowChanged) {
 			InitSwapChain(bWindowChanged);
 			UpdateStatsStatic();
 			m_pFilter->OnDisplayModeChange();
@@ -1351,13 +1351,13 @@ HRESULT CDX11VideoProcessor::SetDevice(ID3D11Device *pDevice, ID3D11DeviceContex
 
 HRESULT CDX11VideoProcessor::InitSwapChain(bool bWindowChanged)
 {
-	DLog(L"CDX11VideoProcessor::InitSwapChain() - {}", m_pFilter->m_bIsFullscreen ? L"fullscreen" : L"window");
+	DLog(L"CDX11VideoProcessor::InitSwapChain() - {}", m_pFilter->m_bExclusiveScreen ? L"fullscreen" : L"window");
 	CheckPointer(m_pDXGIFactory2, E_FAIL);
 
 	ReleaseSwapChain();
 
-	auto bFullscreenChange = m_bIsFullscreen != m_pFilter->m_bIsFullscreen;
-	m_bIsFullscreen = m_pFilter->m_bIsFullscreen;
+	auto bFullscreenChange = m_bExclusiveScreen != m_pFilter->m_bExclusiveScreen;
+	m_bExclusiveScreen = m_pFilter->m_bExclusiveScreen;
 
 	if (bFullscreenChange || bWindowChanged) {
 		HandleHDRToggle();
@@ -1382,7 +1382,7 @@ HRESULT CDX11VideoProcessor::InitSwapChain(bool bWindowChanged)
 	HRESULT hr = S_OK;
 	DXGI_SWAP_CHAIN_DESC1 desc1 = {};
 
-	if (m_bIsFullscreen) {
+	if (m_bExclusiveScreen) {
 		MONITORINFOEXW mi = { sizeof(mi) };
 		GetMonitorInfoW(MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST), &mi);
 		const CRect rc(mi.rcMonitor);
@@ -1499,9 +1499,9 @@ bool CDX11VideoProcessor::HandleHDRToggle()
 
 					const bool bNeedToggleOn = !displayConfig.HDREnabled() &&
 											   (m_iHdrToggleDisplay == HDRTD_On || m_iHdrToggleDisplay == HDRTD_OnOff
-											   || m_bIsFullscreen && (m_iHdrToggleDisplay == HDRTD_On_Fullscreen || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen));
+											   || m_bExclusiveScreen && (m_iHdrToggleDisplay == HDRTD_On_Fullscreen || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen));
 					const bool bNeedToggleOff = displayConfig.HDREnabled() &&
-												!bHDREnabled && !m_bIsFullscreen && m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen;
+												!bHDREnabled && !m_bExclusiveScreen && m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen;
 					DLog(L"HandleHDRToggle() : {}, {}", bNeedToggleOn, bNeedToggleOff);
 					if (bNeedToggleOn) {
 						bRet = ToggleHDR(displayConfig, true);
@@ -1535,7 +1535,7 @@ bool CDX11VideoProcessor::HandleHDRToggle()
 				}
 
 				if (displayConfig.HDRSupported() && displayConfig.HDREnabled() &&
-						(!bWindowsHDREnabled || (m_iHdrToggleDisplay == HDRTD_OnOff || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen && m_bIsFullscreen))) {
+						(!bWindowsHDREnabled || (m_iHdrToggleDisplay == HDRTD_OnOff || m_iHdrToggleDisplay == HDRTD_OnOff_Fullscreen && m_bExclusiveScreen))) {
 					bRet = ToggleHDR(displayConfig, false);
 					DLogIf(!bRet, L"CDX11VideoProcessor::HandleHDRToggle() : Toggle HDR OFF failed");
 
@@ -3123,7 +3123,7 @@ HRESULT CDX11VideoProcessor::SetWindowRect(const CRect& windowRect)
 	const UINT w = m_windowRect.Width();
 	const UINT h = m_windowRect.Height();
 
-	if (m_pDXGISwapChain1 && !m_bIsFullscreen) {
+	if (m_pDXGISwapChain1 && !m_bExclusiveScreen) {
 		hr = m_pDXGISwapChain1->ResizeBuffers(0, w, h, DXGI_FORMAT_UNKNOWN, 0);
 	}
 
@@ -3559,7 +3559,7 @@ void CDX11VideoProcessor::Configure(const Settings_t& config)
 
 	if (config.iSwapEffect != m_iSwapEffect) {
 		m_iSwapEffect = config.iSwapEffect;
-		changeWindow = !m_pFilter->m_bIsFullscreen;
+		changeWindow = !m_pFilter->m_bExclusiveScreen;
 	}
 
 	if (config.bHdrPreferDoVi != m_bHdrPreferDoVi) {

Source/DX11VideoProcessor.h

@@ -151,7 +151,7 @@ class CDX11VideoProcessor
 	CD3D11Lines     m_Lines;
 	CD3D11Polyline  m_SyncLine;
 
-	bool m_bIsFullscreen = false;
+	bool m_bExclusiveScreen = false;
 
 	int m_iVPSuperRes = SUPERRES_Disable;
 	bool m_bVPUseSuperRes = false; // but it is not exactly

Source/DX9VideoProcessor.cpp

@@ -437,7 +437,7 @@ HRESULT CDX9VideoProcessor::InitInternal(bool* pChangeDevice/* = nullptr*/)
 #endif
 
 	ZeroMemory(&m_d3dpp, sizeof(m_d3dpp));
-	if (m_pFilter->m_bIsFullscreen) {
+	if (m_pFilter->m_bExclusiveScreen) {
 		m_d3dpp.Windowed = FALSE;
 		m_d3dpp.hDeviceWindow = m_hWnd;
 		m_d3dpp.SwapEffect = D3DSWAPEFFECT_FLIP;
@@ -624,7 +624,7 @@ HRESULT CDX9VideoProcessor::ResetInternal()
 
 	g_bInitVP = true;
 
-	if (m_pFilter->m_bIsFullscreen) {
+	if (m_pFilter->m_bExclusiveScreen) {
 		ZeroMemory(&m_DisplayMode, sizeof(D3DDISPLAYMODEEX));
 		m_DisplayMode.Size = sizeof(D3DDISPLAYMODEEX);
 		HRESULT hr = m_pD3DEx->GetAdapterDisplayModeEx(m_nCurrentAdapter, &m_DisplayMode, nullptr);
@@ -1682,7 +1682,7 @@ HRESULT CDX9VideoProcessor::SetWindowRect(const CRect& windowRect)
 	UpdateRenderRect();
 
 	if (m_pD3DDevEx && !m_windowRect.IsRectEmpty()) {
-		if (!m_pFilter->m_bIsFullscreen) {
+		if (!m_pFilter->m_bExclusiveScreen) {
 			UINT backBufW = m_windowRect.Width();
 			UINT backBufH = m_windowRect.Height();
 			if (m_d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD && m_d3dpp.Windowed) {
@@ -1976,7 +1976,7 @@ void CDX9VideoProcessor::Configure(const Settings_t& config)
 
 	if (config.iSwapEffect != m_iSwapEffect) {
 		m_iSwapEffect = config.iSwapEffect;
-		changeWindow = !m_pFilter->m_bIsFullscreen;
+		changeWindow = !m_pFilter->m_bExclusiveScreen;
 	}
 
 	if (config.bHdrPreferDoVi != m_bHdrPreferDoVi) {

Source/VideoRenderer.cpp

@@ -98,7 +98,7 @@ static LRESULT CALLBACK ParentWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM
 			pThis->OnDisplayModeChange(true);
 			break;
 		case WM_MOVE:
-			if (pThis->m_bIsFullscreen) {
+			if (pThis->m_bExclusiveScreen) {
 				// I don't know why, but without this, the filter freezes when switching from fullscreen to window in DX9 mode.
 				SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)pfnOldProc);
 				SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)ParentWndProc);
@@ -107,19 +107,19 @@ static LRESULT CALLBACK ParentWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM
 			}
 			break;
 		case WM_NCACTIVATE:
-			if (!wParam && pThis->m_bIsFullscreen && !pThis->m_bIsD3DFullscreen) {
+			if (!wParam && pThis->m_bExclusiveScreen && !pThis->m_bIsD3DFullscreen) {
 				return 0;
 			}
 			break;
 		case WM_RBUTTONUP:
-			if (pThis->m_bIsFullscreen) {
+			if (pThis->m_bExclusiveScreen) {
 				// block context menu in exclusive fullscreen
 				return 0;
 			}
 			break;
 /*
 		case WM_SYSCOMMAND:
-			if (pThis->m_bIsFullscreen && wParam == SC_MINIMIZE) {
+			if (pThis->m_bExclusiveScreen && wParam == SC_MINIMIZE) {
 				// block minimize in exclusive fullscreen
 				return 0;
 			}
@@ -302,7 +302,7 @@ CMpcVideoRenderer::~CMpcVideoRenderer()
 		RemoveParentWndProc(m_hWndParentMain);
 	}
 
-	if (m_bIsFullscreen && !m_bIsD3DFullscreen && m_hWndParentMain) {
+	if (m_bExclusiveScreen && !m_bIsD3DFullscreen && m_hWndParentMain) {
 		PostMessageW(m_hWndParentMain, WM_SWITCH_FULLSCREEN, 0, 0);
 	}
 
@@ -596,7 +596,7 @@ void CMpcVideoRenderer::UpdateDisplayInfo()
 		m_bPrimaryDisplay = false;
 	}
 
-	m_VideoProcessor->SetDisplayInfo(m_DisplayConfig, m_bPrimaryDisplay, m_bIsFullscreen);
+	m_VideoProcessor->SetDisplayInfo(m_DisplayConfig, m_bPrimaryDisplay, m_bExclusiveScreen);
 }
 
 void CMpcVideoRenderer::OnDisplayModeChange(const bool bReset/* = false*/)
@@ -964,7 +964,7 @@ STDMETHODIMP CMpcVideoRenderer::GetPreferredAspectRatio(long *plAspectX, long *p
 void CMpcVideoRenderer::SwitchFullScreen()
 {
 	DLog(L"CMpcVideoRenderer::SwitchFullScreen() : Switch to fullscreen");
-	m_bIsFullscreen = true;
+	m_bExclusiveScreen = true;
 
 	if (m_hWnd) {
 		Init(m_VideoProcessor->Type() == VP_DX9 ? false : true);
@@ -1059,7 +1059,7 @@ HRESULT CMpcVideoRenderer::Init(const bool bCreateWindow/* = false*/)
 		}
 	}
 
-	m_hWnd = m_bIsFullscreen && m_VideoProcessor->Type() == VP_DX9 ? m_hWndParentMain : m_hWndWindow;
+	m_hWnd = m_bExclusiveScreen && m_VideoProcessor->Type() == VP_DX9 ? m_hWndParentMain : m_hWndWindow;
 	if (m_bIsD3DFullscreen) {
 		m_hWnd = m_hWndParent;
 	}
@@ -1122,17 +1122,17 @@ STDMETHODIMP CMpcVideoRenderer::SetWindowPosition(long Left, long Top, long Widt
 
 	CAutoLock cRendererLock(&m_RendererLock);
 
-	if (!m_bIsD3DFullscreen && (m_Sets.bExclusiveFS || m_bIsFullscreen)) {
+	if (!m_bIsD3DFullscreen && (m_Sets.bExclusiveFS || m_bExclusiveScreen)) {
 		const HMONITOR hMon = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
 		MONITORINFO mi = { mi.cbSize = sizeof(mi) };
 		::GetMonitorInfoW(hMon, &mi);
 		const CRect rcMonitor(mi.rcMonitor);
 
-		if (!m_bIsFullscreen && m_windowRect.Width() == rcMonitor.Width() && m_windowRect.Height() == rcMonitor.Height()) {
+		if (!m_bExclusiveScreen && m_windowRect.Width() == rcMonitor.Width() && m_windowRect.Height() == rcMonitor.Height()) {
 			SwitchFullScreen();
-		} else if (m_bIsFullscreen && (m_windowRect.Width() != rcMonitor.Width() || m_windowRect.Height() != rcMonitor.Height())) {
+		} else if (m_bExclusiveScreen && (m_windowRect.Width() != rcMonitor.Width() || m_windowRect.Height() != rcMonitor.Height())) {
 			DLog(L"CMpcVideoRenderer::SetWindowPosition() : Switch from fullscreen");
-			m_bIsFullscreen = false;
+			m_bExclusiveScreen = false;
 
 			if (m_hWnd) {
 				Init(m_VideoProcessor->Type() == VP_DX9 ? false : true);
@@ -1145,7 +1145,7 @@ STDMETHODIMP CMpcVideoRenderer::SetWindowPosition(long Left, long Top, long Widt
 		}
 	}
 
-	if (m_hWndWindow && !m_bIsFullscreen) {
+	if (m_hWndWindow && !m_bExclusiveScreen) {
 		SetWindowPos(m_hWndWindow, nullptr, Left, Top, Width, Height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
 		if (Left < 0) {
 			m_windowRect.OffsetRect(-Left, 0);
@@ -1509,7 +1509,7 @@ STDMETHODIMP CMpcVideoRenderer::Flt_SetBin(LPCSTR field, LPVOID value, int size)
 
 STDMETHODIMP CMpcVideoRenderer::SetD3DFullscreen(bool bEnabled)
 {
-	m_bIsFullscreen = m_bIsD3DFullscreen = bEnabled;
+	m_bExclusiveScreen = m_bIsD3DFullscreen = bEnabled;
 	return S_OK;
 }
 
@@ -1742,7 +1742,7 @@ void CMpcVideoRenderer::DoAfterChangingDevice()
 
 LRESULT CMpcVideoRenderer::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	if (m_hWndDrain && !InSendMessage() && !m_bIsFullscreen) {
+	if (m_hWndDrain && !InSendMessage() && !m_bExclusiveScreen) {
 		switch (uMsg) {
 			case WM_CHAR:
 			case WM_DEADCHAR:

Source/VideoRenderer.h

@@ -323,7 +323,7 @@ class __declspec(uuid("71F080AA-8661-4093-B15E-4F6903E77D0A"))
 
 	void SwitchFullScreen();
 
-	bool m_bIsFullscreen = false;
+	bool m_bExclusiveScreen = false;
 	bool m_bIsD3DFullscreen = false;
 
 private: