Send WM_ACTIVATEAPP for DirectDraw v1 to v3

#487

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8094 
+#define BUILD_NUMBER 8095 

GDI/WndProc.cpp

@@ -384,15 +384,15 @@ LRESULT CALLBACK WndProc::Handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
 		// Some games don't properly handle app activate in exclusive mode
 		if (pDataStruct->IsDirectDraw)
 		{
-			static WPARAM IsActive = FALSE;
-			const bool IsDuplicateMessage = (wParam == IsActive);
-			IsActive = wParam;
-
-			if (IsDuplicateMessage || (pDataStruct->IsCreatingDevice && pDataStruct->IsExclusiveMode) || IsForcingWindowedMode)
+			static WPARAM IsActive = 0xFFFF;
+			Logging::Log() << __FUNCTION__ << " WM_ACTIVATEAPP IsExclusiveMode: " << pDataStruct->IsExclusiveMode << " IsCreatingDevice: " << pDataStruct->IsCreatingDevice << " " << IsActive << " -> " << wParam;
+			const bool IsDuplicateMessage = (IsActive == wParam);
+			if (IsDuplicateMessage || IsForcingWindowedMode)
 			{
-				LOG_LIMIT(3, __FUNCTION__ << " Warning: filtering " << (IsDuplicateMessage ? "duplicate " : "") << "'WM_ACTIVATEAPP': " << wParam);
-				return CallWndProc(nullptr, hWnd, Msg, wParam, lParam);
+				LOG_LIMIT(3, __FUNCTION__ << " Warning: filtering " << (IsDuplicateMessage ? "duplicate " : "") << "WM_ACTIVATEAPP: " << wParam);
+				return NULL;
 			}
+			IsActive = wParam;
 		}
 		break;
 
@@ -407,7 +407,7 @@ LRESULT CALLBACK WndProc::Handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
 		{
 			if (pDataStruct->IsActive == LOWORD(wParam))
 			{
-				LOG_LIMIT(3, __FUNCTION__ << " Warning: filtering duplicate 'WM_ACTIVATE': " << LOWORD(wParam));
+				LOG_LIMIT(3, __FUNCTION__ << " Warning: filtering duplicate WM_ACTIVATE: " << LOWORD(wParam));
 				return CallWndProc(nullptr, hWnd, Msg, wParam, lParam);
 			}
 			pDataStruct->IsActive = LOWORD(wParam);

d3d9/IDirect3D9Ex.cpp

@@ -537,7 +537,7 @@ HRESULT m_IDirect3D9Ex::CreateDeviceT(DEVICEDETAILS& DeviceDetails, UINT Adapter
 	WndProc::DATASTRUCT* WndDataStruct = WndProc::AddWndProc(hWnd);
 
 	bool tmpFlag = false;
-	ScopedFlagSet SetCreatingDevice(WndDataStruct ? WndDataStruct->IsCreatingDevice : tmpFlag, (WndDataStruct && !WndDataStruct->IsDirectDraw));
+	ScopedFlagSet SetCreatingDevice(WndDataStruct && !WndDataStruct->IsDirectDraw ? WndDataStruct->IsCreatingDevice : tmpFlag);
 
 	if (WndDataStruct)
 	{

d3d9/IDirect3DDevice9Ex.cpp

@@ -3401,7 +3401,7 @@ HRESULT m_IDirect3DDevice9Ex::ResetT(T func, D3DPRESENT_PARAMETERS* pPresentatio
 	WndProc::DATASTRUCT* WndDataStruct = WndProc::AddWndProc(hWnd);
 
 	bool tmpFlag = false;
-	ScopedFlagSet SetCreatingDevice(WndDataStruct ? WndDataStruct->IsCreatingDevice : tmpFlag, (WndDataStruct && !WndDataStruct->IsDirectDraw));
+	ScopedFlagSet SetCreatingDevice(WndDataStruct && !WndDataStruct->IsDirectDraw ? WndDataStruct->IsCreatingDevice : tmpFlag);
 
 	if (WndDataStruct && !WndDataStruct->IsDirectDraw)
 	{

ddraw/IDirectDrawX.cpp

@@ -1726,6 +1726,14 @@ HRESULT m_IDirectDrawX::SetCooperativeLevel(HWND hWnd, DWORD dwFlags, DWORD Dire
 		// Check window handle
 		if (IsWindow(DisplayMode.hWnd) && ((!hWnd && Config.DdrawIntroVideoFix) || DisplayMode.hWnd == hWnd))
 		{
+			// Hook WndProc
+			WndProc::DATASTRUCT* WndDataStruct = WndProc::AddWndProc(hWnd);
+			if (WndDataStruct)
+			{
+				WndDataStruct->IsDirectDraw = true;
+				WndDataStruct->DirectXVersion = ClientDirectXVersion;
+			}
+
 			// Set exclusive mode resolution
 			if (ExclusiveMode && DisplayMode.Width && DisplayMode.Height && DisplayMode.BPP)
 			{
@@ -3247,6 +3255,13 @@ HRESULT m_IDirectDrawX::ResetD9Device()
 		return DDERR_WRONGMODE;
 	}
 
+	// Hook WndProc before creating device
+	WndProc::DATASTRUCT* WndDataStruct = WndProc::AddWndProc(GetHwnd());
+
+	// Mark as creating device
+	bool tmpFlag = false;
+	ScopedFlagSet SetCreatingDevice(WndDataStruct ? WndDataStruct->IsCreatingDevice : tmpFlag);
+
 	// Reset device if current thread matches creation thread
 	if (IsWindow(hFocusWindow) && FocusWindowThreadID == GetCurrentThreadId())
 	{
@@ -3644,7 +3659,6 @@ HRESULT m_IDirectDrawX::CreateD9Device(char* FunctionName)
 	}
 	CopyGDISurface = false;
 
-
 	// Create default state block
 	GetDefaultStates();
 
@@ -3719,6 +3733,12 @@ HRESULT m_IDirectDrawX::CreateD9Device(char* FunctionName)
 			PostMessage(hWnd, WM_SETFOCUS, NULL, NULL);
 			PostMessage(hWnd, WM_SYNCPAINT, (WPARAM)32, NULL);
 		}
+
+		// Activate app
+		if (ExclusiveMode && ClientDirectXVersion < 4 && LasthWnd != hFocusWindow)
+		{
+			PostMessage(hWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)GetWindowThreadProcessId(LastActiveWindow, nullptr));
+		}
 	}
 
 	// Store display frequency