[ros-diffs] [gedmurphy] 26973: - Don't return directly from PSEH. Same error, same dev, different day. - Thanks to pigglesworth for noticing

[gedmurphy at svn.reactos.org]

Author: gedmurphy
Date: Sun Jun  3 17:06:32 2007
New Revision: 26973

URL: http://svn.reactos.org/svn/reactos?rev=26973&view=rev
Log:
- Don't return directly from PSEH. Same error, same dev, different day.
- Thanks to pigglesworth for noticing

Modified:
    trunk/reactos/dll/directx/ddraw/main.c

Modified: trunk/reactos/dll/directx/ddraw/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?rev=26973&r1=26972&r2=26973&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main.c Sun Jun  3 17:06:32 2007
@@ -71,16 +71,16 @@
         if (pUnkOuter)
         {
             /* we are using same error code as MS*/
-            return CLASS_E_NOAGGREGATION; 
+            retVal = CLASS_E_NOAGGREGATION; 
+        }/* Is it a DirectDraw 7 Request or not */
+        else if (!IsEqualGUID(id, &IID_IDirectDraw7)) 
+        {
+            retVal = DDERR_INVALIDPARAMS;
         }
-
-        /* Is it a DirectDraw 7 Request or not */
-        if (!IsEqualGUID(id, &IID_IDirectDraw7)) 
+        else
         {
-            return DDERR_INVALIDPARAMS;
+            retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE);
         }
-
-        retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE);
 
         /* Create our DirectDraw interface */
     }