Move a few checks and add device creation warning

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 7364 
+#define BUILD_NUMBER 7365 

ddraw/IDirect3DX.cpp

@@ -644,12 +644,6 @@ HRESULT m_IDirect3DX::CreateDevice(REFCLSID rclsid, LPDIRECTDRAWSURFACE7 lpDDS,
 			return DDERR_INVALIDOBJECT;
 		}
 
-		// Check if a device is already created
-		if (*ddrawParent->GetCurrentD3DDevice())
-		{
-			LOG_LIMIT(100, __FUNCTION__ << " Warning: Direct3D Device has already been created!");
-		}
-
 		// Get surfaceX
 		m_IDirectDrawSurfaceX *DdrawSurface3D = nullptr;
 		lpDDS->QueryInterface(IID_GetInterfaceX, (LPVOID*)&DdrawSurface3D);

ddraw/IDirectDrawSurfaceX.cpp

@@ -5758,7 +5758,7 @@ inline bool m_IDirectDrawSurfaceX::CheckCoordinates(RECT& OutRect, LPRECT lpInRe
 void m_IDirectDrawSurfaceX::LockEmuLock(LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc)
 {
 	// Only works if entire surface is locked
-	if (!lpDDSurfaceDesc || !lpDDSurfaceDesc->lPitch || lpDestRect)
+	if (!lpDDSurfaceDesc || !lpDDSurfaceDesc->lPitch || (lpDestRect && lpDestRect->top != 0 && lpDestRect->left != 0))
 	{
 		return;
 	}

ddraw/IDirectDrawX.cpp

@@ -2839,14 +2839,37 @@ HRESULT m_IDirectDrawX::CheckInterface(char *FunctionName, bool CheckD3DDevice)
 
 void m_IDirectDrawX::SetD3D(m_IDirect3DX* D3D)
 {
+	// Check if a device is already created
+	if (D3DInterface && D3DInterface != D3D)
+	{
+		LOG_LIMIT(100, __FUNCTION__ << " Warning: Direct3D interface has already been created!");
+	}
+
 	D3DInterface = D3D;
 }
 
 void m_IDirectDrawX::SetD3DDevice(m_IDirect3DDeviceX* D3DDevice)
 {
+	// Check if a device is already created
+	if (D3DDeviceInterface && D3DDeviceInterface != D3DDevice)
+	{
+		LOG_LIMIT(100, __FUNCTION__ << " Warning: Direct3D Device has already been created!");
+	}
+
 	D3DDeviceInterface = D3DDevice;
 }
 
+void m_IDirectDrawX::ClearD3DDevice()
+{
+	Using3D = false;
+
+	D3DDeviceInterface = nullptr;
+
+	SetRenderTargetSurface(nullptr);
+
+	Clear3DFlagForAllSurfaces();
+}
+
 bool m_IDirectDrawX::IsInScene()
 {
 	return (D3DDeviceInterface && D3DDeviceInterface->IsDeviceInScene());

ddraw/IDirectDrawX.h

@@ -178,7 +178,7 @@ class m_IDirectDrawX : public IUnknown, public AddressLookupTableDdrawObject
 	inline void ClearD3D() { D3DInterface = nullptr; }
 	void SetD3DDevice(m_IDirect3DDeviceX* D3DDevice);
 	inline m_IDirect3DDeviceX** GetCurrentD3DDevice() { return &D3DDeviceInterface; }
-	inline void ClearD3DDevice() { Using3D = false; D3DDeviceInterface = nullptr; SetRenderTargetSurface(nullptr); Clear3DFlagForAllSurfaces(); }
+	void ClearD3DDevice();
 	inline void Enable3D() { Using3D = true; }
 	inline bool IsUsing3D() { return Using3D; }
 	inline bool IsPrimaryRenderTarget() { return PrimarySurface ? PrimarySurface->IsRenderTarget() : false; }