Synchronize changes from 1.6 branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 28353aaccc49 · 2025-10-01T13:52:01.000Z
5a3494c Fix UB in CProxyDirect3D9
diff --git a/Client/core/DXHook/CProxyDirect3D9.cpp b/Client/core/DXHook/CProxyDirect3D9.cpp
@@ -963,6 +963,7 @@ bool CreateDeviceSecondCallCheck(HRESULT& hOutResult, IDirect3D9* pDirect3D, UIN
     if (pPresentationParameters->BackBufferWidth == 0)
     {
         WriteDebugEvent(SString(" Passing through call #%d to CreateDevice because size is invalid", uiCreateCount));
+        hOutResult = pDirect3D->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
         return true;
     }
 
@@ -972,6 +973,7 @@ bool CreateDeviceSecondCallCheck(HRESULT& hOutResult, IDirect3D9* pDirect3D, UIN
         SString strMessage(" Passing through call #%d to CreateDevice because not main thread", uiCreateCount);
         WriteDebugEvent(strMessage);
         AddReportLog(8627, strMessage);
+        hOutResult = pDirect3D->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
         return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -963,6 +963,7 @@ bool CreateDeviceSecondCallCheck(HRESULT& hOutResult, IDirect3D9* pDirect3D, UIN`
`963`	`963`	`if (pPresentationParameters->BackBufferWidth == 0)`
`964`	`964`	`{`
`965`	`965`	`WriteDebugEvent(SString(" Passing through call #%d to CreateDevice because size is invalid", uiCreateCount));`
	`966`	`+ hOutResult = pDirect3D->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);`
`966`	`967`	`return true;`
`967`	`968`	`}`
`968`	`969`
`@@ -972,6 +973,7 @@ bool CreateDeviceSecondCallCheck(HRESULT& hOutResult, IDirect3D9* pDirect3D, UIN`
`972`	`973`	`SString strMessage(" Passing through call #%d to CreateDevice because not main thread", uiCreateCount);`
`973`	`974`	`WriteDebugEvent(strMessage);`
`974`	`975`	`AddReportLog(8627, strMessage);`
	`976`	`+ hOutResult = pDirect3D->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);`
`975`	`977`	`return true;`
`976`	`978`	`}`
`977`	`979`