Fix adding WndProc and get structure return

elishacloud · Oct 1, 2024 · 68a9385 · 68a9385
1 parent 277679d
commit 68a9385
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7225 
+#define BUILD_NUMBER 7226 
diff --git a/GDI/WndProc.cpp b/GDI/WndProc.cpp
@@ -222,6 +222,7 @@ WndProc::DATASTRUCT* WndProc::GetWndProctStruct(HWND hWnd)
 			return entry->GetDataStruct();
 		}
 	}
+	return nullptr;
 }
 
 LRESULT CALLBACK WndProc::Handler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROCSTRUCT* AppWndProcInstance)

diff --git a/ddraw/IDirectDrawX.cpp b/ddraw/IDirectDrawX.cpp
@@ -1701,9 +1701,6 @@ HRESULT m_IDirectDrawX::SetCooperativeLevel(HWND hWnd, DWORD dwFlags, DWORD Dire
 				Utils::WaitForWindowActions(DisplayMode.hWnd, 100);
 			}
 
-			// Hook WndProc before creating device
-			WndProc::AddWndProc(hWnd, true);
-
 			// Set exclusive mode resolution
 			if (ExclusiveMode && DisplayMode.Width && DisplayMode.Height && DisplayMode.BPP)
 			{
@@ -2973,6 +2970,9 @@ HRESULT m_IDirectDrawX::CreateD9Device(char* FunctionName)
 		// Store new focus window
 		hFocusWindow = hWnd;
 
+		// Hook WndProc before creating device
+		WndProc::AddWndProc(hWnd, true);
+
 		// Get current resolution and rect
 		bool SetResolution = true;
 		DWORD CurrentWidth = 0, CurrentHeight = 0;