From 24f23718b74a7042fe14b1da1b928b8da39eb27c Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 14 May 2010 04:06:30 +0000
Subject: [PATCH] - Added GetHR support to D3DFB for querying the error code
 when device creation fails. - Should still check for a NULL device when
 CreateDevice() returns D3DERR_DEVICELOST.

SVN r2328 (trunk)
---
 src/win32/fb_d3d9.cpp  | 13 ++++++++-----
 src/win32/win32iface.h |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp
index 58ad92455..c5b66870b 100644
--- a/src/win32/fb_d3d9.cpp
+++ b/src/win32/fb_d3d9.cpp
@@ -242,6 +242,8 @@ D3DFB::D3DFB (int width, int height, bool fullscreen)
 {
 	D3DPRESENT_PARAMETERS d3dpp;
 
+	LastHR = 0;
+
 	D3DDevice = NULL;
 	VertexBuffer = NULL;
 	IndexBuffer = NULL;
@@ -323,18 +325,18 @@ D3DFB::D3DFB (int width, int height, bool fullscreen)
 
 	if (FAILED(hr = D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
 		D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)) &&
-		hr != D3DERR_DEVICELOST)
+		(hr != D3DERR_DEVICELOST || D3DDevice == NULL))
 	{
 		if (FAILED(D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
 			D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)) &&
-			hr != D3DERR_DEVICELOST)
+			(hr != D3DERR_DEVICELOST || D3DDevice == NULL))
 		{
 			if (d3dpp.FullScreen_RefreshRateInHz != 0)
 			{
 				d3dpp.FullScreen_RefreshRateInHz = 0;
 				if (FAILED(hr = D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
 					D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)) &&
-					hr != D3DERR_DEVICELOST)
+					(hr != D3DERR_DEVICELOST || D3DDevice == NULL))
 				{
 					if (FAILED(D3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, Window,
 						D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &d3dpp, &D3DDevice)) &&
@@ -346,6 +348,7 @@ D3DFB::D3DFB (int width, int height, bool fullscreen)
 			}
 		}
 	}
+	LastHR = hr;
 	if (D3DDevice != NULL)
 	{
 		D3DADAPTER_IDENTIFIER9 adapter_id;
@@ -364,7 +367,7 @@ D3DFB::D3DFB (int width, int height, bool fullscreen)
 			{
 				DeviceCaps.LineCaps |= D3DLINECAPS_ANTIALIAS;
 			}
-			// ATI's drivers apparently also lie, so screw this cap.
+			// ATI's drivers apparently also lie, so screw this caps bit.
 		}
 		CreateResources();
 		SetInitialState();
@@ -1000,7 +1003,7 @@ bool D3DFB::IsValid ()
 
 HRESULT D3DFB::GetHR ()
 {
-	return 0;
+	return LastHR;
 }
 
 //==========================================================================
diff --git a/src/win32/win32iface.h b/src/win32/win32iface.h
index 9bdfd1072..d8e6af6a3 100644
--- a/src/win32/win32iface.h
+++ b/src/win32/win32iface.h
@@ -414,6 +414,7 @@ private:
 	D3DPal *Palettes;
 	D3DTex *Textures;
 	PackingTexture *Packs;
+	HRESULT LastHR;
 
 	IDirect3DDevice9 *D3DDevice;
 	IDirect3DTexture9 *FBTexture;