Fix up COM initialization.

Add troubleshooting document. Add DLL paths registry file to installer. Update version to 0.2.1 git-svn-id: https://www.williamfeely.info/svn/dxgl@169 8a90861a-4eca-46d5-b744-240ff16d0c4d
dxgldotorg · Jun 8, 2012 · 6c1061e · 6c1061e
1 parent 7847d85
commit 6c1061e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 5 deletions.
diff --git a/Help/Help.vcxproj b/Help/Help.vcxproj
@@ -71,6 +71,9 @@
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="toc.hhc" />
+    <None Include="troubleshooting.htm">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Help/Help.vcxproj.filters b/Help/Help.vcxproj.filters
@@ -27,5 +27,8 @@
     <None Include="dxgl.css">
       <Filter>Help files</Filter>
     </None>
+    <None Include="troubleshooting.htm">
+      <Filter>Help files</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/Help/toc.hhc b/Help/toc.hhc
@@ -16,5 +16,9 @@
 		<param name="Name" value="Configuration">
 		<param name="Local" value="configuration.htm">
 		</OBJECT>
+  <LI> <OBJECT type="text/sitemap">
+    <param name="Name" value="Troubleshooting">
+    <param name="Local" value="troubleshooting.htm">
+    </OBJECT>
 </UL>
 </BODY></HTML>
diff --git a/Installer/dxgl.nsi b/Installer/dxgl.nsi
@@ -83,6 +83,7 @@ Section "MainSection" SEC01
   File "..\ReadMe.txt"
   File "..\COPYING.txt"
   File "..\Help\dxgl.chm"
+  File "dllpaths.reg"
   CreateShortCut "$SMPROGRAMS\DXGL\DXGL Help.lnk" "$INSTDIR\dxgl.chm"
 
   StrCpy $8 0

diff --git a/ReadMe.txt b/ReadMe.txt
@@ -1,4 +1,4 @@
-DXGL 0.2.0
+DXGL 0.2.1
 http://www.williamfeely.info/wiki/DXGL
 
 == Introduction ==

diff --git a/common/version.h b/common/version.h
@@ -4,12 +4,12 @@
 
 #define DXGLMAJOR 0
 #define DXGLMINOR 2
-#define DXGLPOINT 0
+#define DXGLPOINT 1
 #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.2.0.0"
+#define DXGLVERSTRING "0.2.1.0"
 
 
 #endif //__VERSION_H
diff --git a/common/version.nsh b/common/version.nsh
@@ -1 +1 @@
-!define PRODUCT_VERSION "0.2.0"
+!define PRODUCT_VERSION "0.2.1"
diff --git a/ddraw/ddraw.cpp b/ddraw/ddraw.cpp
@@ -472,7 +472,17 @@ DDRAW_API void WINAPI SetAppCompatData()
 	FIXME("SetAppCompatData: stub\n");
 }
 
-/// Stub for function found in system ddraw.dll
+/**
+  * Test if the ddraw.dll file is DXGL.  Do not link to this entry point.
+  * Use LoadLibrary and GetProcAddress instead.
+  * @return
+  *  Returns TRUE
+  * @remark
+  *  Test for DXGL by testing if this function exists.  Please do not use
+  *  this function to test whether your program should run or not.  This
+  *  function may be changed or removed in case of abuse.
+  */
+
 DDRAW_API BOOL IsDXGLDDraw()
 {
 	return TRUE;

diff --git a/ddraw/glClassFactory.cpp b/ddraw/glClassFactory.cpp
@@ -63,18 +63,21 @@ HRESULT WINAPI glClassFactory::CreateInstance(IUnknown *pUnkOuter, REFIID riid,
 	{
 		glDD7 = new glDirectDraw7;
 		*ppvObject = new glDirectDraw1(glDD7);
+		glDD7->Release();
 		return S_OK;
 	}
 	if(riid == IID_IDirectDraw2)
 	{
 		glDD7 = new glDirectDraw7;
 		*ppvObject = new glDirectDraw2(glDD7);
+		glDD7->Release();
 		return S_OK;
 	}
 	if(riid == IID_IDirectDraw4)
 	{
 		glDD7 = new glDirectDraw7;
 		*ppvObject = new glDirectDraw4(glDD7);
+		glDD7->Release();
 		return S_OK;
 	}
 	if(riid == IID_IDirectDraw7)