Update Lock() and Clear()

elishacloud · Aug 22, 2023 · d6c42f0 · d6c42f0
1 parent 79427b8
commit d6c42f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc
@@ -1 +1 @@
-#define BUILD_NUMBER 6776 
+#define BUILD_NUMBER 6777 
diff --git a/ddraw/IDirect3DDeviceX.cpp b/ddraw/IDirect3DDeviceX.cpp
@@ -1774,7 +1774,7 @@ HRESULT m_IDirect3DDeviceX::Clear(DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlag
 		}
 
 		// Clear primary surface
-		if (dwFlags & D3DCLEAR_TARGET)
+		/*if (dwFlags & D3DCLEAR_TARGET)
 		{
 			m_IDirectDrawSurfaceX* PrimarySurface = ddrawParent->GetPrimarySurface();
 			if (PrimarySurface)
@@ -1791,7 +1791,7 @@ HRESULT m_IDirect3DDeviceX::Clear(DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlag
 					PrimarySurface->ColorFill(nullptr, dwColor);
 				}
 			}
-		}
+		}*/
 
 		return (*d3d9Device)->Clear(dwCount, lpRects, dwFlags, dwColor, dvZ, dwStencil);
 	}

diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp
@@ -2176,9 +2176,12 @@ HRESULT m_IDirectDrawSurfaceX::Lock2(LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSur
 			{
 				// Lock surface
 				HRESULT ret = LockD39Surface(&LockedRect, &DestRect, Flags);
-				if (FAILED(ret) && IsSurfaceLocked() && !IsLockedFromOtherThread())
+				if (FAILED(ret))
 				{
-					LOG_LIMIT(100, __FUNCTION__ << " Warning: attempting to lock surface twice!");
+					if (IsSurfaceLocked())
+					{
+						LOG_LIMIT(100, __FUNCTION__ << " Warning: attempting to lock surface twice!");
+					}
 					UnlockD39Surface();
 					ret = LockD39Surface(&LockedRect, &DestRect, Flags);
 				}