Release 0.1.6

Re-add debug-only restriction on Direct3D

git-svn-id: https://www.williamfeely.info/svn/dxgl@109 8a90861a-4eca-46d5-b744-240ff16d0c4d

ReadMe.txt

@@ -1,3 +1,6 @@
+DXGL 0.1.6
+http://www.williamfeely.info/wiki/DXGL
+
 == Introduction ==
 
 DXGL is a project to create a DirectDraw/Direct3D version 1 to 7 implementation that runs on OpenGL 2.0. It is intended to alleviate some of the graphics glitches inherent with using legacy DirectX interfaces on modern video cards. The API will be 100% binary compatible with the system ddraw.dll file.
@@ -6,15 +9,15 @@ DXGL is currently in an alpha stage of development and very little works at this
 
 == System Requirements ==
 
-* Windows operating system (currently XP or above)
-* OpenGL 2.0 or higher compatible video card, with hardware accelerated non-power-of-two size textures.
-  Geforce FX series graphics cards are NOT supported because non-power-of-two textures are emulated in software.
+* Windows XP, Vista, 7, or 8 (May work under recent builds of Wine)
+* OpenGL 2.0 or higher compatible video card, with hardware accelerated non-power-of-two size textures
+* Visual C++ 2010 x86 runtime, available at http://www.microsoft.com/download/en/details.aspx?id=5555 (will be installed if not present)
 
 == Build Requirements ==
 * Visual Studio 2010 or Visual C++ 2010 Express
-* Latest version of Windows SDK
+* Latest version of Windows SDK may be required
 
-== Build instructions ==
+== Build Instructions ==
 These instructions assume that you do not have any of the required software installed.  If you already have any or all of this software installed and set up, skip those steps.
 * Install Visual C++ 2010 Express at http://www.microsoft.com/express/downloads/#2010-Visual-CPP
 * Install the Windows SDK at:
@@ -24,13 +27,13 @@ http://www.microsoft.com/downloads/en/details.aspx?FamilyID=689655B4-C55D-4F9B-9
 * Open the dxgl.sln file, select your build configuration (Debug or Release) in the toolbar, and press F5.
 
 == Progress ==
-For detailed progress information, please check https://www.williamfeely.info/wiki/DXGL_Features
+For detailed progress information, please check http://www.williamfeely.info/wiki/DXGL_Features
 What works:
 * DirectDraw object creation and destruction (versions 1 to 7)
 * Display mode enumeration and switching (with emulated mode switching)
 * Fullscreen and windowed modes.
 * Basic Blt() functionality
-* 8-bit color
+* 8-bit color with GLSL shader
 
 What partially works:
 * SetCooperativeLevel (destroys the GL context if switching between windowed and fullscreen modes)
@@ -50,7 +53,7 @@ SVN readonly access is available at:
 https://www.williamfeely.info/svn/dxgl
 
 There is a Mediawiki-based SVN log at:
-https://www.williamfeely.info/wiki/Special:Code/DXGL
+http://www.williamfeely.info/wiki/Special:Code/DXGL
 
 == AppDB ==
 

common/version.h

@@ -4,12 +4,12 @@
 
 #define DXGLMAJOR 0
 #define DXGLMINOR 1
-#define DXGLPOINT 5
+#define DXGLPOINT 6
 #define DXGLBUILD 0
 
 #define DXGLVERNUMBER DXGLMAJOR,DXGLMINOR,DXGLPOINT,DXGLBUILD
 #define DXGLVERQWORD (((unsigned __int64)DXGLMAJOR<<48)+((unsigned __int64)DXGLMINOR<<32)+((unsigned __int64)DXGLPOINT<<16)+(unsigned __int64)DXGLBUILD)
-#define DXGLVERSTRING "0.1.5.0"
+#define DXGLVERSTRING "0.1.6.0"
 
 
 #endif //__VERSION_H

ddraw/glDirectDraw.cpp

@@ -649,9 +649,14 @@ HRESULT WINAPI glDirectDraw7::QueryInterface(REFIID riid, void** ppvObj)
 	}
 	if(riid == IID_IDirect3D7)
 	{
+		#ifdef _DEBUG
 		this->AddRef();
 		*ppvObj = new glDirect3D7(this);
 		return DD_OK;
+		#else
+		FIXME("Add IDirect3D Interfaces\n");
+		ERR(DDERR_GENERIC);
+		#endif
 	}
 	if(riid == IID_IDirectDrawGammaControl)
 	{

dxgltest/dxgltest.cpp

@@ -713,11 +713,15 @@ INT_PTR CALLBACK DXGLTestCallback(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
         tab.pszText = _T("2D Graphics");
 		hTab = GetDlgItem(hWnd,IDC_TABS);
         SendDlgItemMessage(hWnd,IDC_TABS,TCM_INSERTITEM,1,(LPARAM)&tab);
+		#ifdef _DEBUG
         tab.pszText = _T("3D Graphics");
         SendDlgItemMessage(hWnd,IDC_TABS,TCM_INSERTITEM,2,(LPARAM)&tab);
+		#endif
 		tabwnd[0] = CreateDialog(hinstance,MAKEINTRESOURCE(IDD_SYSINFO),hTab,SysTabCallback);
         tabwnd[1] = CreateDialog(hinstance,MAKEINTRESOURCE(IDD_TESTGFX),hTab,Test2DCallback);
+		#ifdef _DEBUG
         tabwnd[2] = CreateDialog(hinstance,MAKEINTRESOURCE(IDD_TESTGFX),hTab,Test3DCallback);
+		#endif
 		SendDlgItemMessage(hWnd,IDC_TABS,TCM_GETITEMRECT,0,(LPARAM)&tabrect);
 		SetWindowPos(tabwnd[0],NULL,tabrect.left,tabrect.bottom+3,0,0,SWP_SHOWWINDOW|SWP_NOSIZE);
 		ShowWindow(tabwnd[1],SW_HIDE);