From c837850451016e530fda446e6ca5d7668d84e907 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Fri, 16 Mar 2007 09:01:40 +0000 Subject: [PATCH] fixing smaller bugs in NtGdiDdQueryDirectDrawObject, like some return value are right svn path=/trunk/; revision=26111 --- .../subsystems/win32/win32k/ntddraw/ddraw.c | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 675a5753526..cc7d56cefc9 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -300,7 +300,7 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("NtGdiDdQueryDirectDrawObject\n"); if (hDirectDrawLocal == NULL) { - return Ret; + return FALSE; } pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, @@ -308,7 +308,7 @@ NtGdiDdQueryDirectDrawObject( if (!pDirectDraw) { - return Ret; + return FALSE; } /* @@ -332,14 +332,14 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } else { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } @@ -366,14 +366,14 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } else { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -400,7 +400,7 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -408,7 +408,7 @@ NtGdiDdQueryDirectDrawObject( { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -451,7 +451,7 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -459,7 +459,7 @@ NtGdiDdQueryDirectDrawObject( { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } /* @@ -487,7 +487,7 @@ NtGdiDdQueryDirectDrawObject( DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); SetLastNtError(Status); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } } } @@ -495,11 +495,9 @@ NtGdiDdQueryDirectDrawObject( { DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return Ret; + return FALSE; } - DPRINT1("next\n"); - _SEH_TRY { ProbeForWrite(puNumHeaps, sizeof(DWORD), 1);