Fix some concurrency issues

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 6297 
+#define BUILD_NUMBER 6298 

ddraw/IDirect3DDeviceX.h

@@ -161,6 +161,7 @@ class m_IDirect3DDeviceX : public IUnknown
 			ddrawParent->SetD3DDevice(this);
 		}
 	}
+	void ClearDdraw() { ddrawParent = nullptr; }
 
 	// Release interface
 	void ReleaseInterface();

ddraw/IDirect3DX.h

@@ -87,6 +87,7 @@ class m_IDirect3DX : public IUnknown
 
 	// Functions handling the ddraw parent interface
 	void SetDdrawParent(m_IDirectDrawX *ddraw) { ddrawParent = ddraw; }
+	void ClearDdraw() { ddrawParent = nullptr; }
 
 	// Resolution hack
 	void ResolutionHack();

ddraw/IDirectDrawPalette.h

@@ -121,6 +121,7 @@ class m_IDirectDrawPalette : public IDirectDrawPalette, public AddressLookupTabl
 
 	// Functions handling the ddraw parent interface
 	void SetDdrawParent(m_IDirectDrawX *ddraw) { ddrawParent = ddraw; }
+	void ClearDdraw() { ddrawParent = nullptr; }
 
 	// Release interface
 	void ReleaseInterface();

ddraw/IDirectDrawSurfaceX.h

@@ -242,6 +242,7 @@ class m_IDirectDrawSurfaceX : public IUnknown
 
 	// Functions handling the ddraw parent interface
 	void SetDdrawParent(m_IDirectDrawX *ddraw) { ddrawParent = ddraw; }
+	void ClearDdraw() { ddrawParent = nullptr; }
 
 	// Direct3D9 interfaces
 	LPDIRECT3DTEXTURE9 *GetSurfaceTexture() { return &surfaceTexture; }

ddraw/IDirectDrawX.cpp

@@ -1582,36 +1582,37 @@ void m_IDirectDrawX::ReleaseDdraw()
 {
 	InterlockedDecrement(&ddrawRefCount);
 
+	SetCriticalSection();
+
 	// Release Direct3DDevice interfaces
 	if (D3DDeviceInterface)
 	{
-		while (D3DDeviceInterface->Release() != 0) {}
+		D3DDeviceInterface->ClearDdraw();
 		D3DDeviceInterface = nullptr;
 	}
 
 	// Release Direct3D interfaces
 	if (D3DInterface)
 	{
-		while (D3DInterface->Release() != 0) {}
+		D3DInterface->ClearDdraw();
 		D3DInterface = nullptr;
 	}
 
 	// Release surfaces
 	for (m_IDirectDrawSurfaceX *pSurface : SurfaceVector)
 	{
-		while (pSurface->CanSurfaceBeDeleted() && pSurface->Release() != 0) {}
+		pSurface->ReleaseD9Surface();
+		pSurface->ClearDdraw();
 	}
 	SurfaceVector.clear();
 
 	// Release palettes
 	for (m_IDirectDrawPalette *pPalette : PaletteVector)
 	{
-		while (pPalette->Release() != 0) {}
+		pPalette->ClearDdraw();
 	}
 	PaletteVector.clear();
 
-	// ToDo: Release ColorControl and GammaControl
-
 	// Release shared d3d9device
 	ReleaseD3d9Device();
 
@@ -1623,6 +1624,8 @@ void m_IDirectDrawX::ReleaseDdraw()
 			d3d9Object = nullptr;
 		}
 	}
+
+	ReleaseCriticalSection();
 }
 
 HWND m_IDirectDrawX::GetHwnd()
@@ -1880,7 +1883,7 @@ void m_IDirectDrawX::ReleaseD3d9Device()
 // Add surface wrapper to vector
 void m_IDirectDrawX::AddSurfaceToVector(m_IDirectDrawSurfaceX* lpSurfaceX)
 {
-	if (!lpSurfaceX)
+	if (!lpSurfaceX || DoesSurfaceExist(lpSurfaceX))
 	{
 		return;
 	}
@@ -1961,7 +1964,7 @@ void m_IDirectDrawX::EvictManagedTextures()
 // Add palette wrapper to vector
 void m_IDirectDrawX::AddPaletteToVector(m_IDirectDrawPalette* lpPalette)
 {
-	if (!lpPalette)
+	if (!lpPalette || DoesPaletteExist(lpPalette))
 	{
 		return;
 	}
@@ -1987,6 +1990,25 @@ void m_IDirectDrawX::RemovePaletteFromVector(m_IDirectDrawPalette* lpPalette)
 	}
 }
 
+// Check if palette wrapper exists
+bool m_IDirectDrawX::DoesPaletteExist(m_IDirectDrawPalette* lpPalette)
+{
+	if (!lpPalette)
+	{
+		return false;
+	}
+
+	auto it = std::find_if(PaletteVector.begin(), PaletteVector.end(),
+		[=](auto pSurface) -> bool { return pSurface == lpPalette; });
+
+	if (it == std::end(PaletteVector))
+	{
+		return false;
+	}
+
+	return true;
+}
+
 void m_IDirectDrawX::SetVidMemory(LPDWORD lpdwTotal, LPDWORD lpdwFree)
 {
 	// Set available memory, some games have issues if this is set to high

ddraw/IDirectDrawX.h

@@ -171,6 +171,7 @@ class m_IDirectDrawX : public IUnknown
 	// Palette vector functions
 	void AddPaletteToVector(m_IDirectDrawPalette* lpPalette);
 	void RemovePaletteFromVector(m_IDirectDrawPalette* lpPalette);
+	bool DoesPaletteExist(m_IDirectDrawPalette* lpPalette);
 
 	// Video memory size
 	static void SetVidMemory(LPDWORD lpdwTotal, LPDWORD lpdwFree);