Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-02 01:21:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing smaller bugs in NtGdiDdQueryDirectDrawObject,

Browse source 
like some return value are right

svn path=/trunk/; revision=26111
This commit is contained in:
Magnus Olsen 2007-03-16 09:01:40 +00:00
parent df2510eefd
commit c837850451
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/subsystems/win32/win32k/ntddraw/ddraw.c
View file

@ -300,7 +300,7 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("NtGdiDdQueryDirectDrawObject\n"); DPRINT1("NtGdiDdQueryDirectDrawObject\n");
if (hDirectDrawLocal == NULL) if (hDirectDrawLocal == NULL)
{ {
return Ret; return FALSE;
} }
pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal,
@ -308,7 +308,7 @@ NtGdiDdQueryDirectDrawObject(
if (!pDirectDraw) if (!pDirectDraw)
{ {
return Ret; return FALSE;
} }
/* /*
@ -332,14 +332,14 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n");
SetLastNtError(Status); SetLastNtError(Status);
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
} }
else else
{ {
DPRINT1("GDIOBJ_UnlockObjByPtr\n"); DPRINT1("GDIOBJ_UnlockObjByPtr\n");
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
@ -366,14 +366,14 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n");
SetLastNtError(Status); SetLastNtError(Status);
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
} }
else else
{ {
DPRINT1("GDIOBJ_UnlockObjByPtr\n"); DPRINT1("GDIOBJ_UnlockObjByPtr\n");
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
/* /*
@ -400,7 +400,7 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n");
SetLastNtError(Status); SetLastNtError(Status);
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
} }
} }
@ -408,7 +408,7 @@ NtGdiDdQueryDirectDrawObject(
{ {
DPRINT1("GDIOBJ_UnlockObjByPtr\n"); DPRINT1("GDIOBJ_UnlockObjByPtr\n");
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
/* /*
@ -451,7 +451,7 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n");
SetLastNtError(Status); SetLastNtError(Status);
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
} }
} }
@ -459,7 +459,7 @@ NtGdiDdQueryDirectDrawObject(
{ {
DPRINT1("GDIOBJ_UnlockObjByPtr\n"); DPRINT1("GDIOBJ_UnlockObjByPtr\n");
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
/* /*
@ -487,7 +487,7 @@ NtGdiDdQueryDirectDrawObject(
DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n"); DPRINT1("GDIOBJ_UnlockObjByPtr and SetLastNtError\n");
SetLastNtError(Status); SetLastNtError(Status);
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
} }
} }
@ -495,11 +495,9 @@ NtGdiDdQueryDirectDrawObject(
{ {
DPRINT1("GDIOBJ_UnlockObjByPtr\n"); DPRINT1("GDIOBJ_UnlockObjByPtr\n");
GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw);
return Ret; return FALSE;
} }
DPRINT1("next\n");
_SEH_TRY _SEH_TRY
{ {
ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); ProbeForWrite(puNumHeaps, sizeof(DWORD), 1);