[FORMATTING]

Apply consistent 4 space indentation
No code change

svn path=/trunk/; revision=42441
This commit is contained in:
Timo Kreuzer 2009-08-06 23:09:13 +00:00
parent 2e74dd3e76
commit 6c2f42c953

View file

@ -108,7 +108,7 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor,
return Ret; return Ret;
} }
if(!(Screen = IntGetScreenDC())) if (!(Screen = IntGetScreenDC()))
{ {
return (HCURSOR)0; return (HCURSOR)0;
} }
@ -178,7 +178,7 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor,
} }
else else
{ {
if(NewCursor->IconInfo.hbmColor if (NewCursor->IconInfo.hbmColor
&& COLORCURSORS_ALLOWED) && COLORCURSORS_ALLOWED)
{ {
/* FIXME - Create a color pointer, create only one 32bit bitmap! /* FIXME - Create a color pointer, create only one 32bit bitmap!
@ -190,7 +190,7 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor,
else else
{ {
MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask);
if(MaskBmpObj) if (MaskBmpObj)
{ {
RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy};
POINTL SourcePoint = {0, 0}; POINTL SourcePoint = {0, 0};
@ -204,7 +204,7 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor,
MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta),
MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN,
NULL); NULL);
if ( !hMask ) if (!hMask)
{ {
SURFACE_UnlockSurface(MaskBmpObj); SURFACE_UnlockSurface(MaskBmpObj);
DC_UnlockDc(dc); DC_UnlockDc(dc);
@ -249,12 +249,12 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor,
DPRINT1("IntEngSetPointerShape returned %lx\n", Status); DPRINT1("IntEngSetPointerShape returned %lx\n", Status);
} }
if(hMask) if (hMask)
{ {
EngUnlockSurface(soMask); EngUnlockSurface(soMask);
EngDeleteSurface((HSURF)hMask); EngDeleteSurface((HSURF)hMask);
} }
if(XlateObj) if (XlateObj)
{ {
EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj);
} }
@ -328,9 +328,9 @@ IntFindExistingCurIconObject(PWINSTATION_OBJECT WinSta, HMODULE hModule,
// if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) //<- huh???? // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) //<- huh????
// UserReferenceObject( CurIcon); // UserReferenceObject( CurIcon);
// { // {
if((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc)) if ((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc))
{ {
if(cx && ((cx != CurIcon->Size.cx) || (cy != CurIcon->Size.cy))) if (cx && ((cx != CurIcon->Size.cx) || (cy != CurIcon->Size.cy)))
{ {
// UserDereferenceObject(CurIcon); // UserDereferenceObject(CurIcon);
continue; continue;
@ -358,7 +358,7 @@ IntCreateCurIconHandle(PWINSTATION_OBJECT WinSta)
CurIcon = UserCreateObject(gHandleTable, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); CurIcon = UserCreateObject(gHandleTable, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT));
if(!CurIcon) if (!CurIcon)
{ {
SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
return FALSE; return FALSE;
@ -443,13 +443,13 @@ IntDestroyCurIconObject(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT CurIcon, BOOL
bmpColor = CurIcon->IconInfo.hbmColor; bmpColor = CurIcon->IconInfo.hbmColor;
/* delete bitmaps */ /* delete bitmaps */
if(bmpMask) if (bmpMask)
{ {
GDIOBJ_SetOwnership(bmpMask, PsGetCurrentProcess()); GDIOBJ_SetOwnership(bmpMask, PsGetCurrentProcess());
GreDeleteObject(bmpMask); GreDeleteObject(bmpMask);
CurIcon->IconInfo.hbmMask = NULL; CurIcon->IconInfo.hbmMask = NULL;
} }
if(bmpColor) if (bmpColor)
{ {
GDIOBJ_SetOwnership(bmpColor, PsGetCurrentProcess()); GDIOBJ_SetOwnership(bmpColor, PsGetCurrentProcess());
GreDeleteObject(bmpColor); GreDeleteObject(bmpColor);
@ -471,7 +471,7 @@ IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process)
PCURICON_PROCESS ProcessData; PCURICON_PROCESS ProcessData;
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
return; return;
} }
@ -522,32 +522,32 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect)
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( (HANDLE)0); RETURN((HANDLE)0);
} }
if (!(CurIcon = IntCreateCurIconHandle(WinSta))) if (!(CurIcon = IntCreateCurIconHandle(WinSta)))
{ {
SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( (HANDLE)0); RETURN((HANDLE)0);
} }
Ret = CurIcon->Self; Ret = CurIcon->Self;
if(IconInfo) if (IconInfo)
{ {
Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO));
if(NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
/* Copy bitmaps and size info */ /* Copy bitmaps and size info */
if(Indirect) if (Indirect)
{ {
CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask);
CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor);
} }
if(CurIcon->IconInfo.hbmColor && if (CurIcon->IconInfo.hbmColor &&
(psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor)))
{ {
CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
@ -555,7 +555,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect)
SURFACE_UnlockSurface(psurfBmp); SURFACE_UnlockSurface(psurfBmp);
GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL);
} }
if(CurIcon->IconInfo.hbmMask && if (CurIcon->IconInfo.hbmMask &&
(psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask)))
{ {
if (CurIcon->IconInfo.hbmColor == NULL) if (CurIcon->IconInfo.hbmColor == NULL)
@ -583,7 +583,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect)
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_); DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_);
@ -614,22 +614,22 @@ NtUserGetIconInfo(
DPRINT("Enter NtUserGetIconInfo\n"); DPRINT("Enter NtUserGetIconInfo\n");
UserEnterExclusive(); UserEnterExclusive();
if(!IconInfo) if (!IconInfo)
{ {
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
RETURN(FALSE); RETURN(FALSE);
} }
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if (!(CurIcon = UserGetCurIconObject(hCurIcon))) if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( FALSE); RETURN(FALSE);
} }
RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO));
@ -675,7 +675,7 @@ NtUserGetIconInfo(
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_);
@ -720,7 +720,7 @@ NtUserGetIconSize(
} }
_SEH2_END _SEH2_END
if(NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
bRet = TRUE; bRet = TRUE;
else else
SetLastNtError(Status); // maybe not, test this SetLastNtError(Status); // maybe not, test this
@ -773,7 +773,7 @@ NtUserGetCursorInfo(
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if (WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
CurInfo = IntGetSysCursorInfo(WinSta); CurInfo = IntGetSysCursorInfo(WinSta);
@ -841,23 +841,23 @@ NtUserClipCursor(
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if (WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if (NULL != UnsafeRect && ! NT_SUCCESS(MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)))) if (NULL != UnsafeRect && ! NT_SUCCESS(MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT))))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
RETURN( FALSE); RETURN(FALSE);
} }
CurInfo = IntGetSysCursorInfo(WinSta); CurInfo = IntGetSysCursorInfo(WinSta);
IntGetCursorLocation(WinSta, &MousePos); IntGetCursorLocation(WinSta, &MousePos);
if(WinSta->ActiveDesktop) if (WinSta->ActiveDesktop)
DesktopWindow = UserGetWindowObject(WinSta->ActiveDesktop->DesktopWindow); DesktopWindow = UserGetWindowObject(WinSta->ActiveDesktop->DesktopWindow);
if((Rect.right > Rect.left) && (Rect.bottom > Rect.top) if ((Rect.right > Rect.left) && (Rect.bottom > Rect.top)
&& DesktopWindow && UnsafeRect != NULL) && DesktopWindow && UnsafeRect != NULL)
{ {
MOUSEINPUT mi; MOUSEINPUT mi;
@ -876,13 +876,13 @@ NtUserClipCursor(
mi.dwExtraInfo = 0; mi.dwExtraInfo = 0;
IntMouseInput(&mi); IntMouseInput(&mi);
RETURN( TRUE); RETURN(TRUE);
} }
CurInfo->CursorClipInfo.IsClipped = FALSE; CurInfo->CursorClipInfo.IsClipped = FALSE;
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( TRUE); RETURN(TRUE);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserClipCursor, ret=%i\n",_ret_); DPRINT("Leave NtUserClipCursor, ret=%i\n",_ret_);
@ -909,9 +909,9 @@ NtUserDestroyCursor(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if (!(CurIcon = UserGetCurIconObject(hCurIcon))) if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
@ -953,24 +953,24 @@ NtUserFindExistingCursorIcon(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( Ret); RETURN(Ret);
} }
CurIcon = IntFindExistingCurIconObject(WinSta, hModule, hRsrc, cx, cy); CurIcon = IntFindExistingCurIconObject(WinSta, hModule, hRsrc, cx, cy);
if(CurIcon) if (CurIcon)
{ {
Ret = CurIcon->Self; Ret = CurIcon->Self;
// IntReleaseCurIconObject(CurIcon);//faxme: is this correct? does IntFindExistingCurIconObject add a ref? // IntReleaseCurIconObject(CurIcon);//faxme: is this correct? does IntFindExistingCurIconObject add a ref?
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
} }
SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( (HANDLE)0); RETURN((HANDLE)0);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserFindExistingCursorIcon, ret=%i\n",_ret_); DPRINT("Leave NtUserFindExistingCursorIcon, ret=%i\n",_ret_);
@ -997,17 +997,17 @@ NtUserGetClipCursor(
DPRINT("Enter NtUserGetClipCursor\n"); DPRINT("Enter NtUserGetClipCursor\n");
UserEnterExclusive(); UserEnterExclusive();
if(!lpRect) if (!lpRect)
RETURN( FALSE); RETURN(FALSE);
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if (WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
CurInfo = IntGetSysCursorInfo(WinSta); CurInfo = IntGetSysCursorInfo(WinSta);
if(CurInfo->CursorClipInfo.IsClipped) if (CurInfo->CursorClipInfo.IsClipped)
{ {
Rect.left = CurInfo->CursorClipInfo.Left; Rect.left = CurInfo->CursorClipInfo.Left;
Rect.top = CurInfo->CursorClipInfo.Top; Rect.top = CurInfo->CursorClipInfo.Top;
@ -1023,16 +1023,16 @@ NtUserGetClipCursor(
} }
Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT)); Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT));
if(!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
SetLastNtError(Status); SetLastNtError(Status);
RETURN( FALSE); RETURN(FALSE);
} }
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( TRUE); RETURN(TRUE);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserGetClipCursor, ret=%i\n",_ret_); DPRINT("Leave NtUserGetClipCursor, ret=%i\n",_ret_);
@ -1058,14 +1058,14 @@ NtUserSetCursor(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN(NULL); RETURN(NULL);
} }
if(hCursor) if (hCursor)
{ {
if(!(CurIcon = UserGetCurIconObject(hCursor))) if (!(CurIcon = UserGetCurIconObject(hCursor)))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN(NULL); RETURN(NULL);
@ -1078,7 +1078,7 @@ NtUserSetCursor(
OldCursor = IntSetCursor(WinSta, CurIcon, FALSE); OldCursor = IntSetCursor(WinSta, CurIcon, FALSE);
if(CurIcon) if (CurIcon)
{ {
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
} }
@ -1114,9 +1114,9 @@ NtUserSetCursorContents(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if (!(CurIcon = UserGetCurIconObject(hCurIcon))) if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
@ -1127,7 +1127,7 @@ NtUserSetCursorContents(
/* Copy fields */ /* Copy fields */
Status = MmCopyFromCaller(&IconInfo, UnsafeIconInfo, sizeof(ICONINFO)); Status = MmCopyFromCaller(&IconInfo, UnsafeIconInfo, sizeof(ICONINFO));
if(!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
goto done; goto done;
@ -1147,7 +1147,7 @@ NtUserSetCursorContents(
CurIcon->IconInfo = IconInfo; CurIcon->IconInfo = IconInfo;
psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor);
if(psurfBmp) if (psurfBmp)
{ {
CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy;
@ -1157,7 +1157,7 @@ NtUserSetCursorContents(
else else
{ {
psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask); psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask);
if(!psurfBmp) if (!psurfBmp)
goto done; goto done;
CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
@ -1176,7 +1176,7 @@ done:
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
} }
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_); DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_);
@ -1208,12 +1208,12 @@ NtUserSetCursorIconData(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if(!(CurIcon = UserGetCurIconObject(Handle))) if (!(CurIcon = UserGetCurIconObject(Handle)))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN(FALSE); RETURN(FALSE);
@ -1261,14 +1261,14 @@ NtUserSetCursorIconData(
} }
_SEH2_END _SEH2_END
if(!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
SetLastNtError(Status); SetLastNtError(Status);
else else
Ret = TRUE; Ret = TRUE;
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
CLEANUP: CLEANUP:
DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_);
@ -1297,12 +1297,12 @@ NtUserSetCursorIconData(
UserEnterExclusive(); UserEnterExclusive();
WinSta = IntGetWinStaObj(); WinSta = IntGetWinStaObj();
if(WinSta == NULL) if (WinSta == NULL)
{ {
RETURN( FALSE); RETURN(FALSE);
} }
if(!(CurIcon = UserGetCurIconObject(hCurIcon))) if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
{ {
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN(FALSE); RETURN(FALSE);
@ -1313,10 +1313,10 @@ NtUserSetCursorIconData(
CurIcon->hGroupRsrc = hGroupRsrc; CurIcon->hGroupRsrc = hGroupRsrc;
/* Copy fields */ /* Copy fields */
if(fIcon) if (fIcon)
{ {
Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL));
if(!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
goto done; goto done;
@ -1324,14 +1324,14 @@ NtUserSetCursorIconData(
} }
else else
{ {
if(!Hotspot) if (!Hotspot)
Ret = TRUE; Ret = TRUE;
} }
if(Hotspot) if (Hotspot)
{ {
Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT));
if(NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
CurIcon->IconInfo.xHotspot = SafeHotspot.x; CurIcon->IconInfo.xHotspot = SafeHotspot.x;
CurIcon->IconInfo.yHotspot = SafeHotspot.y; CurIcon->IconInfo.yHotspot = SafeHotspot.y;
@ -1342,7 +1342,7 @@ NtUserSetCursorIconData(
SetLastNtError(Status); SetLastNtError(Status);
} }
if(!fIcon && !Hotspot) if (!fIcon && !Hotspot)
{ {
Ret = TRUE; Ret = TRUE;
} }
@ -1350,7 +1350,7 @@ NtUserSetCursorIconData(
done: done:
UserDereferenceObject(CurIcon); UserDereferenceObject(CurIcon);
ObDereferenceObject(WinSta); ObDereferenceObject(WinSta);
RETURN( Ret); RETURN(Ret);
CLEANUP: CLEANUP:
@ -1635,7 +1635,7 @@ UserDrawIconEx(
*(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24));
Count += sizeof (DWORD); Count += sizeof(DWORD);
} }
} }
@ -1662,12 +1662,12 @@ UserDrawIconEx(
Ret = TRUE; Ret = TRUE;
cleanup: cleanup:
if(DoFlickerFree || bAlpha) if (DoFlickerFree || bAlpha)
{ {
if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); if (hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp);
if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); if (hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush);
if(hbmOff) GreDeleteObject(hbmOff); if (hbmOff) GreDeleteObject(hbmOff);
if(hdcOff) NtGdiDeleteObjectApp(hdcOff); if (hdcOff) NtGdiDeleteObjectApp(hdcOff);
} }
return Ret; return Ret;
@ -1697,7 +1697,7 @@ NtUserDrawIconEx(
DPRINT("Enter NtUserDrawIconEx\n"); DPRINT("Enter NtUserDrawIconEx\n");
UserEnterExclusive(); UserEnterExclusive();
if(!(pIcon = UserGetCurIconObject(hIcon))) if (!(pIcon = UserGetCurIconObject(hIcon)))
{ {
DPRINT1("UserGetCurIconObject() failed!\n"); DPRINT1("UserGetCurIconObject() failed!\n");
UserLeave(); UserLeave();
@ -1738,7 +1738,7 @@ UserShowCursor(BOOL bShow)
GDIPOINTER *pgp; GDIPOINTER *pgp;
int showpointer=0; int showpointer=0;
if(!(Screen = IntGetScreenDC())) if (!(Screen = IntGetScreenDC()))
{ {
return showpointer; /* No mouse */ return showpointer; /* No mouse */
} }
@ -1752,7 +1752,7 @@ UserShowCursor(BOOL bShow)
psurfDc = dc->dclevel.pSurface; psurfDc = dc->dclevel.pSurface;
if ( !psurfDc ) if (!psurfDc)
{ {
DC_UnlockDc(dc); DC_UnlockDc(dc);
return showpointer; /* No Mouse */ return showpointer; /* No Mouse */
@ -1767,7 +1767,7 @@ UserShowCursor(BOOL bShow)
ppdev = GDIDEV(SurfObj); ppdev = GDIDEV(SurfObj);
if(ppdev == NULL) if (ppdev == NULL)
{ {
DC_UnlockDc(dc); DC_UnlockDc(dc);
return showpointer; /* No mouse */ return showpointer; /* No mouse */