[ros-diffs] [greatlrd] 25142: small cleanup for unlock

Author: greatlrd
Date: Wed Dec 13 11:31:02 2006
New Revision: 25142

URL: http://svn.reactos.org/svn/reactos?rev=25142&view=rev
Log:
small cleanup for unlock

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

Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original)
+++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Dec 13 11:31:02 2006
@@ -290,7 +290,7 @@
 HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect)
 {    
 	LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface;
-	DDHAL_UNLOCKDATA unLock;   
+	DDHAL_UNLOCKDATA mdUnLock;   
 
 	DX_WINDBG_trace();
           	
@@ -300,32 +300,24 @@
 	   return DDERR_UNSUPPORTED;
 	}
 
-    unLock.ddRVal = DDERR_NOTPALETTIZED;
-    unLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl;
-	unLock.lpDDSurface =  This->lpLcl->lpSurfMore->slist[0];
-	unLock.Unlock =
This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Unlock;
-
-
-
-    if (!DdResetVisrgn( unLock.lpDDSurface, NULL)) 
+    mdUnLock.ddRVal = DDERR_NOTPALETTIZED;
+    mdUnLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl;
+	mdUnLock.lpDDSurface =  This->lpLcl->lpSurfMore->slist[0];
+	mdUnLock.Unlock =
This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Unlock;
+
+    if (!DdResetVisrgn( mdUnLock.lpDDSurface, NULL)) 
     {   
         DX_STUB_str("DDERR_UNSUPPORTED");
 		return DDERR_UNSUPPORTED;
     }
 
-    if (unLock.Unlock(&unLock)!= DDHAL_DRIVER_HANDLED)
+    if (mdUnLock.Unlock(&mdUnLock)!= DDHAL_DRIVER_HANDLED)
     {
 		DX_STUB_str("unLock fail");
         return DDERR_UNSUPPORTED;
     }
 
-    if (unLock.ddRVal!= DD_OK)
-    {     
-		DX_STUB_str("ddRVal errror");
-        return unLock.ddRVal;
-    } 
-   
-    return DD_OK;
+    return mdUnLock.ddRVal;
 }
 
 HRESULT WINAPI