Fix COM initialization.

Load settings when initialized via COM. git-svn-id: https://www.williamfeely.info/svn/dxgl@48 8a90861a-4eca-46d5-b744-240ff16d0c4d
dxgldotorg · Dec 25, 2011 · a7abe45 · a7abe45
1 parent 297eea9
commit a7abe45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ddraw/ddraw.cpp b/ddraw/ddraw.cpp
@@ -237,6 +237,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
 	if((rclsid != CLSID_DirectDraw) && (rclsid != CLSID_DirectDraw7) &&
 		(rclsid != CLSID_DirectDrawClipper)) return CLASS_E_CLASSNOTAVAILABLE;
+	GetCurrentConfig(&dxglcfg);
 	glClassFactory *factory = new glClassFactory;
 	if(factory == NULL) return E_OUTOFMEMORY;
 	HRESULT result = factory->QueryInterface(riid,ppv);

diff --git a/ddraw/glClassFactory.cpp b/ddraw/glClassFactory.cpp
@@ -41,6 +41,7 @@ HRESULT WINAPI glClassFactory::QueryInterface(REFIID riid, void** ppvObj)
 	if((riid == IID_IUnknown) || (riid == IID_IClassFactory))
 	{
 		*ppvObj = this;
+		this->AddRef();
 	}
 	else
 	{
-Original file line number
+Diff line change
@@ Expand Up @@
     	if((riid == IID_IUnknown) || (riid == IID_IClassFactory))
     	{
     		*ppvObj = this;
+    		this->AddRef();
     	}
     	else
     	{
@@ Expand Down @@