commit 10c1532b4121d22fa46201e682020f1622753acd
author Peter Hunnisett <hunnise@nortelnetworks.com> Wed Jan 12 04:56:13 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 12 04:56:13 2000 +0000
tree f9bdfaa45d5a2eb9edb8a069ee6cccbced21321e
parent 504cfe51d377e6d8f605a72097afaf27054cf3c9

Fix problem with initialization (reported by Andreas Mohr).

dlls/dplayx/dplay.c

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index ab424d8..4809ec3 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -2055,16 +2055,6 @@
     return CLASS_E_NOAGGREGATION;
   }
 
-  /* One possibility is that they want an exact dplay interface */  
-  if( IsEqualGUID( &IID_IDirectPlay2A, lpGUID ) )
-  {
-    return directPlay_QueryInterface( lpGUID, (LPVOID*)lplpDP );
-  }
-  else if( IsEqualGUID( &IID_IDirectPlay2, lpGUID ) )
-  {
-    return directPlay_QueryInterface( lpGUID, (LPVOID*)lplpDP );
-  }
-
 
   /* Create an IDirectPlay object. We don't support that so we'll cheat and
      give them an IDirectPlay2A object and hope that doesn't cause problems */
@@ -2073,22 +2063,28 @@
     return DPERR_UNAVAILABLE;
   } 
 
+  if( IsEqualGUID( &GUID_NULL, lpGUID ) )
+  {
+    /* The GUID_NULL means don't bind a service provider. Just return the
+       interface */ 
+    return DP_OK;
+  }
+
 
   /* Bind the desired service provider */
-  if( IsEqualGUID( lpGUID, &DPSPGUID_MODEM ) )
+  if( ( IsEqualGUID( lpGUID, &DPSPGUID_MODEM ) ) ||
+      ( IsEqualGUID( lpGUID, &DPSPGUID_SERIAL ) ) ||
+      ( IsEqualGUID( lpGUID, &DPSPGUID_TCPIP ) ) ||
+      ( IsEqualGUID( lpGUID, &DPSPGUID_IPX ) ) 
+    )
   {
-     FIXME( "Modem binding not supported yet\n" );
+     FIXME( "Service provider binding not supported yet\n" );
      IDirectPlayX_Release( *lplpDP );
      *lplpDP = NULL;
      return DPERR_INVALIDPARAMS; 
   }
 
-  /* The GUID_NULL means don't bind a service provider. Just return the
-     interface. However, if it isn't we were given a bogus GUID, return an ERROR */
-  if( !IsEqualGUID( lpGUID, &GUID_NULL ) )
-  {
-    WARN( "unknown GUID %s\n", &lpGUIDString[0] );
-  }
+  ERR( "unknown Service Provider %s\n", &lpGUIDString[0] );
 
   IDirectPlayX_Release( *lplpDP );
   *lplpDP = NULL;