[PATCH] dmband: Simplify DllGetClassObject

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Fri Oct 25 23:56:58 CDT 2019


Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/dmband/dmband_main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index f72b41570b..41dee7e4f5 100644
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -143,18 +143,18 @@ HRESULT WINAPI DllCanUnloadNow(void)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
+    IClassFactory *cf = NULL;
+
     TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
 
-	if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) {
-                *ppv = &Band_CF;
-		IClassFactory_AddRef((IClassFactory*)*ppv);
-		return S_OK;
-	} else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack) && IsEqualIID (riid, &IID_IClassFactory)) {
-                *ppv = &BandTrack_CF;
-		IClassFactory_AddRef((IClassFactory*)*ppv);
-		return S_OK;	
-	}
-	
+    if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand))
+        cf = &Band_CF.IClassFactory_iface;
+    else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack))
+        cf = &BandTrack_CF.IClassFactory_iface;
+
+    if (cf)
+        return IClassFactory_QueryInterface(cf, riid, ppv);
+
     WARN("(%s, %s, %p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
     return CLASS_E_CLASSNOTAVAILABLE;
 }
-- 
2.23.0




More information about the wine-devel mailing list