[Dd7To9] Remove D3DLOCK_DONOTWAIT flag from textures before locking them (#403)

RibShark · web-flow · commit 5a80bc9103a1 · 2025-07-13T19:32:27.000-07:00
# D3D9 does not allow the D3DLOCK_DONOTWAIT flag to be used when locking textures. This caused textures to fail to lock when d3d9to9ex was enabled.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 7845 
+#define BUILD_NUMBER 7846 
diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
@@ -8262,6 +8262,7 @@ HRESULT m_IDirectDrawSurfaceX::LockD3d9Surface(D3DLOCKED_RECT* pLockedRect, RECT
 	// Lock surface texture
 	else if (surface.Texture)
 	{
+		Flags &= ~D3DLOCK_DONOTWAIT;
 		HRESULT hr = surface.Texture->LockRect(GetD3d9MipMapLevel(MipMapLevel), pLockedRect, pRect, Flags);
 		if (FAILED(hr) && (Flags & D3DLOCK_NOSYSLOCK))
 		{

Original file line number	Diff line number	Diff line change
`@@ -8262,6 +8262,7 @@ HRESULT m_IDirectDrawSurfaceX::LockD3d9Surface(D3DLOCKED_RECT* pLockedRect, RECT`
`8262`	`8262`	`// Lock surface texture`
`8263`	`8263`	`else if (surface.Texture)`
`8264`	`8264`	`{`
	`8265`	`+ Flags &= ~D3DLOCK_DONOTWAIT;`
`8265`	`8266`	`HRESULT hr = surface.Texture->LockRect(GetD3d9MipMapLevel(MipMapLevel), pLockedRect, pRect, Flags);`
`8266`	`8267`	`if (FAILED(hr) && (Flags & D3DLOCK_NOSYSLOCK))`
`8267`	`8268`	`{`