Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[hyperion] 42445: modified dll/win32/advapi32/advapi32.h For some reason, <limits.h> was included for gcc, but not Visual C++: include it explicitly just in case And we welcome advapi32 to the club of modules that compile with Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 03:15:48 2009 New Revision: 42445 URL: http://svn.reactos.org/svn/reactos?rev=42445&view=rev Log: modified dll/win32/advapi32/advapi32.h For some reason, <limits.h> was included for gcc, but not Visual C++: include it explicitly just in case And we welcome advapi32 to the club of modules that compile with Visual C++ Modified: trunk/reactos/dll/win32/advapi32/advapi32.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Fri Aug 7 03:15:48 2009 @@ -11,6 +11,7 @@ /* INCLUDES ******************************************************************/ /* C Headers */ +#include <limits.h> #include <stdio.h> /* PSDK/NDK Headers */

15 years, 1 month

[hyperion] 42444: modified lib/3rdparty/libxml2/libxml2.rbuild libxml2 wants __MINGW32__, let's give it __MINGW32__. This should probably defined globally, because our Visual C++ environment is kind of MinGW, after all And libxml2 compiles with Visual C++, too

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 03:06:18 2009 New Revision: 42444 URL: http://svn.reactos.org/svn/reactos?rev=42444&view=rev Log: modified lib/3rdparty/libxml2/libxml2.rbuild libxml2 wants __MINGW32__, let's give it __MINGW32__. This should probably defined globally, because our Visual C++ environment is kind of MinGW, after all And libxml2 compiles with Visual C++, too Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] Fri Aug 7 03:06:18 2009 @@ -8,6 +8,7 @@ <define name="HAVE_WIN32_THREADS" /> <define name="_REENTRANT" /> <define name="LIBXML_STATIC" /> + <define name="__MINGW32__" /> <include base="libxml2">include</include> <include base="libxml2">.</include> <file>c14n.c</file>

15 years, 1 month

[hyperion] 42443: modified include/crt/float.h added include/crt/msc/msc_float.h Implement <float.h> for Visual C++

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 03:03:09 2009 New Revision: 42443 URL: http://svn.reactos.org/svn/reactos?rev=42443&view=rev Log: modified include/crt/float.h added include/crt/msc/msc_float.h Implement <float.h> for Visual C++ Added: trunk/reactos/include/crt/msc/msc_float.h (with props) Modified: trunk/reactos/include/crt/float.h Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=42… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Fri Aug 7 03:03:09 2009 @@ -1,4 +1,4 @@ -/* +/* * float.h * This file has no copyright assigned and is placed in the Public Domain. * This file is a part of the mingw-runtime package. @@ -12,12 +12,16 @@ * NOTE: GCC provides float.h, but it doesn't include the non-standard * stuff for accessing the fp controller. We include_next the * GCC-supplied header and just define the MS-specific extensions - * here. + * here. * */ #ifdef __GNUC__ #include_next<float.h> +#endif + +#ifdef _MSC_VER +#include <msc_float.h> #endif #ifndef _MINGW_FLOAT_H_ @@ -117,7 +121,7 @@ word to 0x37f (64 bit mantissa precison rather than 53 bit). By default, the mingw version of _fpreset sets fp control as per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when - building your application. + building your application. */ void __cdecl __attribute__ ((__nothrow__)) _fpreset (void); void __cdecl __attribute__ ((__nothrow__)) fpreset (void); Added: trunk/reactos/include/crt/msc/msc_float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/msc_float.… ============================================================================== --- trunk/reactos/include/crt/msc/msc_float.h (added) +++ trunk/reactos/include/crt/msc/msc_float.h [iso-8859-1] Fri Aug 7 03:03:09 2009 @@ -1,0 +1,44 @@ +#ifndef _FLOAT_H___ +#define _FLOAT_H___ + +#define FLT_RADIX 2 + +#define FLT_MANT_DIG 24 +#define DBL_MANT_DIG 53 +#define LDBL_MANT_DIG DBL_MANT_DIG + +#define FLT_DIG 6 +#define DBL_DIG 15 +#define LDBL_DIG 15 + +#define FLT_MIN_EXP (-125) +#define DBL_MIN_EXP (-1021) +#define LDBL_MIN_EXP (-1021) + +#define FLT_MIN_10_EXP (-37) +#define DBL_MIN_10_EXP (-307) +#define LDBL_MIN_10_EXP (-307) + +#define FLT_MAX_EXP 128 +#define DBL_MAX_EXP 1024 +#define LDBL_MAX_EXP 1024 + +#define FLT_MAX_10_EXP 38 +#define DBL_MAX_10_EXP 308 +#define LDBL_MAX_10_EXP 308 + +#define FLT_MAX 3.402823466e+38F +#define DBL_MAX 1.7976931348623158e+308 +#define LDBL_MAX 1.7976931348623158e+308 + +#define FLT_EPSILON 1.192092896e-07F +#define DBL_EPSILON 2.2204460492503131e-016 +#define LDBL_EPSILON 2.2204460492503131e-016 + +#define FLT_MIN 1.175494351e-38F +#define DBL_MIN 2.2250738585072014e-308 +#define LDBL_MIN 2.2250738585072014e-308 + +#define FLT_ROUNDS 1 + +#endif Propchange: trunk/reactos/include/crt/msc/msc_float.h ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 1 month

[hyperion] 42442: modified jmorecfg.h Arch Blackmann confuses compiler with build environment in libjpeg too. No project is safe modified libjpeg.rbuild HAVE_CONFIG_H is only used in ansi2knr.c, which we don't build added libjpeg.reactos.diff Added patch files with changes from vendor drop Yes, libjpeg now compiles with Visual C++, in case you were wondering

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Aug 7 02:37:45 2009 New Revision: 42442 URL: http://svn.reactos.org/svn/reactos?rev=42442&view=rev Log: modified jmorecfg.h Arch Blackmann confuses compiler with build environment in libjpeg too. No project is safe modified libjpeg.rbuild HAVE_CONFIG_H is only used in ansi2knr.c, which we don't build added libjpeg.reactos.diff Added patch files with changes from vendor drop Yes, libjpeg now compiles with Visual C++, in case you were wondering Added: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff (with props) Modified: trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild Modified: trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/jmore… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/jmorecfg.h [iso-8859-1] Fri Aug 7 02:37:45 2009 @@ -24,7 +24,6 @@ #if (defined (_MSC_VER) && (_MSC_VER >= 800)) #define HAVE_UNSIGNED_CHAR -#define HAVE_ALL_INTS #define EXTERN(type) extern type __cdecl #endif @@ -240,7 +239,7 @@ /* a function referenced thru EXTERNs: */ #define GLOBAL(type) type JPEG_API /* a reference to a GLOBAL function: */ -#ifndef EXTERN +#ifndef EXTERN # define EXTERN(type) extern JPEG_IMPEXP type JPEG_API /* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */ #endif /* EXTERN */ Modified: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjp… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Fri Aug 7 02:37:45 2009 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libjpeg" type="win32dll" entrypoint="0" installbase="system32" installname="libjpeg.dll" allowwarnings="true" crt="msvcrt"> - <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" /> <define name="_MBCS" /> Added: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libjpeg/libjp… ============================================================================== --- trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff (added) +++ trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff [iso-8859-1] Fri Aug 7 02:37:45 2009 @@ -1,0 +1,12 @@ +Index: jmorecfg.h +=================================================================== +--- jmorecfg.h (revision 42441) ++++ jmorecfg.h (working copy) +@@ -24,7 +24,6 @@ + + #if (defined (_MSC_VER) && (_MSC_VER >= 800)) + #define HAVE_UNSIGNED_CHAR +-#define HAVE_ALL_INTS + #define EXTERN(type) extern type __cdecl + #endif + Propchange: trunk/reactos/dll/3rdparty/libjpeg/libjpeg.reactos.diff ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 1 month

[tkreuzer] 42441: [FORMATTING] Apply consistent 4 space indentation No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 7 01:09:13 2009 New Revision: 42441 URL: http://svn.reactos.org/svn/reactos?rev=42441&view=rev Log: [FORMATTING] Apply consistent 4 space indentation No code change Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Aug 7 01:09:13 2009 @@ -47,33 +47,33 @@ BOOL FASTCALL IntGetCursorLocation(PWINSTATION_OBJECT WinSta, POINT *loc) { - loc->x = gpsi->ptCursor.x; - loc->y = gpsi->ptCursor.y; - - return TRUE; + loc->x = gpsi->ptCursor.x; + loc->y = gpsi->ptCursor.y; + + return TRUE; } /* This function creates a reference for the object! */ PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon) { - PCURICON_OBJECT CurIcon; - - if (!hCurIcon) - { - SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); - return NULL; - } - - CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, otCursorIcon); - if (!CurIcon) - { - /* we never set ERROR_INVALID_ICON_HANDLE. lets hope noone ever checks for it */ - SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); - return NULL; - } - - ASSERT(USER_BODY_TO_HEADER(CurIcon)->RefCount >= 1); - return CurIcon; + PCURICON_OBJECT CurIcon; + + if (!hCurIcon) + { + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); + return NULL; + } + + CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, otCursorIcon); + if (!CurIcon) + { + /* we never set ERROR_INVALID_ICON_HANDLE. lets hope noone ever checks for it */ + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); + return NULL; + } + + ASSERT(USER_BODY_TO_HEADER(CurIcon)->RefCount >= 1); + return CurIcon; } @@ -82,200 +82,200 @@ IntSetCursor(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT NewCursor, BOOL ForceChange) { - SURFACE *psurf; - SURFOBJ *pso; - PDEVINFO DevInfo; - PSURFACE MaskBmpObj = NULL; - PSYSTEM_CURSORINFO CurInfo; - PCURICON_OBJECT OldCursor; - HCURSOR Ret = (HCURSOR)0; - HBITMAP hMask = 0; - SURFOBJ *soMask = NULL, *soColor = NULL; - XLATEOBJ *XlateObj = NULL; - HDC Screen; - PDC dc; - ULONG Status; - - CurInfo = IntGetSysCursorInfo(WinSta); - OldCursor = CurInfo->CurrentCursorObject; - if (OldCursor) - { - Ret = (HCURSOR)OldCursor->Self; - } - - if (!ForceChange && OldCursor == NewCursor) - { - return Ret; - } - - if(!(Screen = IntGetScreenDC())) - { - return (HCURSOR)0; - } - /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ - dc = DC_LockDc(Screen); - - if (!dc) - { - return Ret; - } - DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; - - psurf = dc->dclevel.pSurface; - if (!psurf) - { - DC_UnlockDc(dc); - return (HCURSOR)0; - } - pso = &psurf->SurfObj; - - if (!NewCursor) - { - if (CurInfo->CurrentCursorObject || ForceChange) - { - if (CurInfo->CurrentCursorObject) - { - UserDereferenceObject(CurInfo->CurrentCursorObject); - if (CurInfo->ShowingCursor) + SURFACE *psurf; + SURFOBJ *pso; + PDEVINFO DevInfo; + PSURFACE MaskBmpObj = NULL; + PSYSTEM_CURSORINFO CurInfo; + PCURICON_OBJECT OldCursor; + HCURSOR Ret = (HCURSOR)0; + HBITMAP hMask = 0; + SURFOBJ *soMask = NULL, *soColor = NULL; + XLATEOBJ *XlateObj = NULL; + HDC Screen; + PDC dc; + ULONG Status; + + CurInfo = IntGetSysCursorInfo(WinSta); + OldCursor = CurInfo->CurrentCursorObject; + if (OldCursor) + { + Ret = (HCURSOR)OldCursor->Self; + } + + if (!ForceChange && OldCursor == NewCursor) + { + return Ret; + } + + if (!(Screen = IntGetScreenDC())) + { + return (HCURSOR)0; + } + /* FIXME use the desktop's HDC instead of using ScreenDeviceContext */ + dc = DC_LockDc(Screen); + + if (!dc) + { + return Ret; + } + DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; + + psurf = dc->dclevel.pSurface; + if (!psurf) + { + DC_UnlockDc(dc); + return (HCURSOR)0; + } + pso = &psurf->SurfObj; + + if (!NewCursor) + { + if (CurInfo->CurrentCursorObject || ForceChange) + { + if (CurInfo->CurrentCursorObject) { - DPRINT("Removing pointer!\n"); - /* Remove the cursor if it was displayed */ - IntEngMovePointer(pso, -1, -1, &GDIDEV(pso)->Pointer.Exclude); + UserDereferenceObject(CurInfo->CurrentCursorObject); + if (CurInfo->ShowingCursor) + { + DPRINT("Removing pointer!\n"); + /* Remove the cursor if it was displayed */ + IntEngMovePointer(pso, -1, -1, &GDIDEV(pso)->Pointer.Exclude); + } } - } - - CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ - CurInfo->ShowingCursor = 0; - } - - DC_UnlockDc(dc); - return Ret; - } - - /* TODO: Fixme. Logic is screwed above */ - - MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); - if (MaskBmpObj) - { - const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); - SURFACE_UnlockSurface(MaskBmpObj); - if (maskBpp != 1) - { - DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - DC_UnlockDc(dc); - return Ret; - } - - if ((DevInfo->flGraphicsCaps2 & GCAPS2_ALPHACURSOR) && - pso->iBitmapFormat >= BMF_16BPP && - pso->iBitmapFormat <= BMF_32BPP && - NewCursor->Shadow && COLORCURSORS_ALLOWED) - { - /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits! - Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. */ - DPRINT1("SetCursor: (Colored) alpha cursors are not supported!\n"); - } - else - { - if(NewCursor->IconInfo.hbmColor - && COLORCURSORS_ALLOWED) - { - /* FIXME - Create a color pointer, create only one 32bit bitmap! + + CurInfo->CurrentCursorObject = NewCursor; /* i.e. CurrentCursorObject = NULL */ + CurInfo->ShowingCursor = 0; + } + + DC_UnlockDc(dc); + return Ret; + } + + /* TODO: Fixme. Logic is screwed above */ + + MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); + if (MaskBmpObj) + { + const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); + SURFACE_UnlockSurface(MaskBmpObj); + if (maskBpp != 1) + { + DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); + DC_UnlockDc(dc); + return Ret; + } + + if ((DevInfo->flGraphicsCaps2 & GCAPS2_ALPHACURSOR) && + pso->iBitmapFormat >= BMF_16BPP && + pso->iBitmapFormat <= BMF_32BPP && + NewCursor->Shadow && COLORCURSORS_ALLOWED) + { + /* FIXME - Create a color pointer, only 32bit bitmap, set alpha bits! Do not pass a mask bitmap to DrvSetPointerShape()! - Create a XLATEOBJ that describes the colors of the bitmap. - (16bit bitmaps are propably allowed) */ - DPRINT1("SetCursor: Cursors with colors are not supported!\n"); - } - else - { - MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); - if(MaskBmpObj) + Create a XLATEOBJ that describes the colors of the bitmap. */ + DPRINT1("SetCursor: (Colored) alpha cursors are not supported!\n"); + } + else + { + if (NewCursor->IconInfo.hbmColor + && COLORCURSORS_ALLOWED) { - RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; - POINTL SourcePoint = {0, 0}; - - /* - * NOTE: For now we create the cursor in top-down bitmap, - * because VMware driver rejects it otherwise. This should - * be fixed later. - */ - hMask = EngCreateBitmap( - MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), - MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, - NULL); - if ( !hMask ) - { - SURFACE_UnlockSurface(MaskBmpObj); - DC_UnlockDc(dc); - return (HCURSOR)0; - } - soMask = EngLockSurface((HSURF)hMask); - IntEngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, - &DestRect, &SourcePoint); - SURFACE_UnlockSurface(MaskBmpObj); + /* FIXME - Create a color pointer, create only one 32bit bitmap! + Do not pass a mask bitmap to DrvSetPointerShape()! + Create a XLATEOBJ that describes the colors of the bitmap. + (16bit bitmaps are propably allowed) */ + DPRINT1("SetCursor: Cursors with colors are not supported!\n"); } - } - } - CurInfo->ShowingCursor = CURSOR_SHOWING; - CurInfo->CurrentCursorObject = NewCursor; - UserReferenceObject(NewCursor); - } - else - { - CurInfo->ShowingCursor = 0; - CurInfo->CurrentCursorObject = NULL; - } - - /* OldCursor is not in use anymore */ - if (OldCursor) - { - UserDereferenceObject(OldCursor); - } - - Status = IntEngSetPointerShape(pso, - soMask, - soColor, - XlateObj, - NewCursor->IconInfo.xHotspot, - NewCursor->IconInfo.yHotspot, - gpsi->ptCursor.x, - gpsi->ptCursor.y, - &(GDIDEV(pso)->Pointer.Exclude), - SPS_CHANGE); - - if (Status != SPS_ACCEPT_NOEXCLUDE) - { - DPRINT1("IntEngSetPointerShape returned %lx\n", Status); - } - - if(hMask) - { - EngUnlockSurface(soMask); - EngDeleteSurface((HSURF)hMask); - } - if(XlateObj) - { - EngDeleteXlate(XlateObj); - } - - DC_UnlockDc(dc); - return Ret; + else + { + MaskBmpObj = SURFACE_LockSurface(NewCursor->IconInfo.hbmMask); + if (MaskBmpObj) + { + RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; + POINTL SourcePoint = {0, 0}; + + /* + * NOTE: For now we create the cursor in top-down bitmap, + * because VMware driver rejects it otherwise. This should + * be fixed later. + */ + hMask = EngCreateBitmap( + MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), + MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, + NULL); + if (!hMask) + { + SURFACE_UnlockSurface(MaskBmpObj); + DC_UnlockDc(dc); + return (HCURSOR)0; + } + soMask = EngLockSurface((HSURF)hMask); + IntEngCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, + &DestRect, &SourcePoint); + SURFACE_UnlockSurface(MaskBmpObj); + } + } + } + CurInfo->ShowingCursor = CURSOR_SHOWING; + CurInfo->CurrentCursorObject = NewCursor; + UserReferenceObject(NewCursor); + } + else + { + CurInfo->ShowingCursor = 0; + CurInfo->CurrentCursorObject = NULL; + } + + /* OldCursor is not in use anymore */ + if (OldCursor) + { + UserDereferenceObject(OldCursor); + } + + Status = IntEngSetPointerShape(pso, + soMask, + soColor, + XlateObj, + NewCursor->IconInfo.xHotspot, + NewCursor->IconInfo.yHotspot, + gpsi->ptCursor.x, + gpsi->ptCursor.y, + &(GDIDEV(pso)->Pointer.Exclude), + SPS_CHANGE); + + if (Status != SPS_ACCEPT_NOEXCLUDE) + { + DPRINT1("IntEngSetPointerShape returned %lx\n", Status); + } + + if (hMask) + { + EngUnlockSurface(soMask); + EngDeleteSurface((HSURF)hMask); + } + if (XlateObj) + { + EngDeleteXlate(XlateObj); + } + + DC_UnlockDc(dc); + return Ret; } BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinSta) { - ExInitializePagedLookasideList(&gProcessLookasideList, - NULL, - NULL, - 0, - sizeof(CURICON_PROCESS), - TAG_DIB, - 128); - InitializeListHead(&gCurIconList); - - return TRUE; + ExInitializePagedLookasideList(&gProcessLookasideList, + NULL, + NULL, + 0, + sizeof(CURICON_PROCESS), + TAG_DIB, + 128); + InitializeListHead(&gCurIconList); + + return TRUE; } /* @@ -290,218 +290,218 @@ static BOOLEAN FASTCALL ReferenceCurIconByProcess(PCURICON_OBJECT CurIcon) { - PPROCESSINFO Win32Process; - PCURICON_PROCESS Current; - - Win32Process = PsGetCurrentProcessWin32Process(); - - LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { - if (Current->Process == Win32Process) - { - /* Already registered for this process */ - return TRUE; - } - } - - /* Not registered yet */ - Current = ExAllocateFromPagedLookasideList(&gProcessLookasideList); - if (NULL == Current) - { - return FALSE; - } - InsertHeadList(&CurIcon->ProcessList, &Current->ListEntry); - Current->Process = Win32Process; - - return TRUE; + PPROCESSINFO Win32Process; + PCURICON_PROCESS Current; + + Win32Process = PsGetCurrentProcessWin32Process(); + + LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) + { + if (Current->Process == Win32Process) + { + /* Already registered for this process */ + return TRUE; + } + } + + /* Not registered yet */ + Current = ExAllocateFromPagedLookasideList(&gProcessLookasideList); + if (NULL == Current) + { + return FALSE; + } + InsertHeadList(&CurIcon->ProcessList, &Current->ListEntry); + Current->Process = Win32Process; + + return TRUE; } PCURICON_OBJECT FASTCALL IntFindExistingCurIconObject(PWINSTATION_OBJECT WinSta, HMODULE hModule, HRSRC hRsrc, LONG cx, LONG cy) { - PCURICON_OBJECT CurIcon; - - LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) - { - - // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) //<- huh???? + PCURICON_OBJECT CurIcon; + + LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) + { + + // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) //<- huh???? // UserReferenceObject( CurIcon); // { - if((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc)) - { - if(cx && ((cx != CurIcon->Size.cx) || (cy != CurIcon->Size.cy))) - { + if ((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc)) + { + if (cx && ((cx != CurIcon->Size.cx) || (cy != CurIcon->Size.cy))) + { // UserDereferenceObject(CurIcon); - continue; - } - if (! ReferenceCurIconByProcess(CurIcon)) - { - return NULL; - } - - return CurIcon; - } + continue; + } + if (! ReferenceCurIconByProcess(CurIcon)) + { + return NULL; + } + + return CurIcon; + } // } // UserDereferenceObject(CurIcon); - } - - return NULL; + } + + return NULL; } PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinSta) { - PCURICON_OBJECT CurIcon; - HANDLE hCurIcon; - - CurIcon = UserCreateObject(gHandleTable, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); - - if(!CurIcon) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - CurIcon->Self = hCurIcon; - InitializeListHead(&CurIcon->ProcessList); - - if (! ReferenceCurIconByProcess(CurIcon)) - { - DPRINT1("Failed to add process\n"); - UserDeleteObject(hCurIcon, otCursorIcon); - UserDereferenceObject(CurIcon); - return NULL; - } - - InsertHeadList(&gCurIconList, &CurIcon->ListEntry); - - return CurIcon; + PCURICON_OBJECT CurIcon; + HANDLE hCurIcon; + + CurIcon = UserCreateObject(gHandleTable, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + + if (!CurIcon) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + CurIcon->Self = hCurIcon; + InitializeListHead(&CurIcon->ProcessList); + + if (! ReferenceCurIconByProcess(CurIcon)) + { + DPRINT1("Failed to add process\n"); + UserDeleteObject(hCurIcon, otCursorIcon); + UserDereferenceObject(CurIcon); + return NULL; + } + + InsertHeadList(&gCurIconList, &CurIcon->ListEntry); + + return CurIcon; } BOOLEAN FASTCALL IntDestroyCurIconObject(PWINSTATION_OBJECT WinSta, PCURICON_OBJECT CurIcon, BOOL ProcessCleanup) { - PSYSTEM_CURSORINFO CurInfo; - HBITMAP bmpMask, bmpColor; - BOOLEAN Ret; - PCURICON_PROCESS Current = NULL; - PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); - - /* Private objects can only be destroyed by their own process */ - if (NULL == CurIcon->hModule) - { - ASSERT(CurIcon->ProcessList.Flink->Flink == &CurIcon->ProcessList); - Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); - if (Current->Process != W32Process) - { - DPRINT1("Trying to destroy private icon/cursor of another process\n"); - return FALSE; - } - } - else if (! ProcessCleanup) - { - DPRINT("Trying to destroy shared icon/cursor\n"); - return FALSE; - } - - /* Now find this process in the list of processes referencing this object and - remove it from that list */ - LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { - if (Current->Process == W32Process) - { - RemoveEntryList(&Current->ListEntry); - break; - } - } - - ExFreeToPagedLookasideList(&gProcessLookasideList, Current); - - /* If there are still processes referencing this object we can't destroy it yet */ - if (! IsListEmpty(&CurIcon->ProcessList)) - { - return TRUE; - } - - - if (! ProcessCleanup) - { - RemoveEntryList(&CurIcon->ListEntry); - } - - CurInfo = IntGetSysCursorInfo(WinSta); - - if (CurInfo->CurrentCursorObject == CurIcon) - { - /* Hide the cursor if we're destroying the current cursor */ - IntSetCursor(WinSta, NULL, TRUE); - } - - bmpMask = CurIcon->IconInfo.hbmMask; - bmpColor = CurIcon->IconInfo.hbmColor; - - /* delete bitmaps */ - if(bmpMask) - { - GDIOBJ_SetOwnership(bmpMask, PsGetCurrentProcess()); - GreDeleteObject(bmpMask); - CurIcon->IconInfo.hbmMask = NULL; - } - if(bmpColor) - { - GDIOBJ_SetOwnership(bmpColor, PsGetCurrentProcess()); - GreDeleteObject(bmpColor); - CurIcon->IconInfo.hbmColor = NULL; - } - - /* We were given a pointer, no need to keep the reference anylonger! */ - UserDereferenceObject(CurIcon); - Ret = UserDeleteObject(CurIcon->Self, otCursorIcon); - - return Ret; + PSYSTEM_CURSORINFO CurInfo; + HBITMAP bmpMask, bmpColor; + BOOLEAN Ret; + PCURICON_PROCESS Current = NULL; + PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process(); + + /* Private objects can only be destroyed by their own process */ + if (NULL == CurIcon->hModule) + { + ASSERT(CurIcon->ProcessList.Flink->Flink == &CurIcon->ProcessList); + Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); + if (Current->Process != W32Process) + { + DPRINT1("Trying to destroy private icon/cursor of another process\n"); + return FALSE; + } + } + else if (! ProcessCleanup) + { + DPRINT("Trying to destroy shared icon/cursor\n"); + return FALSE; + } + + /* Now find this process in the list of processes referencing this object and + remove it from that list */ + LIST_FOR_EACH(Current, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) + { + if (Current->Process == W32Process) + { + RemoveEntryList(&Current->ListEntry); + break; + } + } + + ExFreeToPagedLookasideList(&gProcessLookasideList, Current); + + /* If there are still processes referencing this object we can't destroy it yet */ + if (! IsListEmpty(&CurIcon->ProcessList)) + { + return TRUE; + } + + + if (! ProcessCleanup) + { + RemoveEntryList(&CurIcon->ListEntry); + } + + CurInfo = IntGetSysCursorInfo(WinSta); + + if (CurInfo->CurrentCursorObject == CurIcon) + { + /* Hide the cursor if we're destroying the current cursor */ + IntSetCursor(WinSta, NULL, TRUE); + } + + bmpMask = CurIcon->IconInfo.hbmMask; + bmpColor = CurIcon->IconInfo.hbmColor; + + /* delete bitmaps */ + if (bmpMask) + { + GDIOBJ_SetOwnership(bmpMask, PsGetCurrentProcess()); + GreDeleteObject(bmpMask); + CurIcon->IconInfo.hbmMask = NULL; + } + if (bmpColor) + { + GDIOBJ_SetOwnership(bmpColor, PsGetCurrentProcess()); + GreDeleteObject(bmpColor); + CurIcon->IconInfo.hbmColor = NULL; + } + + /* We were given a pointer, no need to keep the reference anylonger! */ + UserDereferenceObject(CurIcon); + Ret = UserDeleteObject(CurIcon->Self, otCursorIcon); + + return Ret; } VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { - PWINSTATION_OBJECT WinSta; - PCURICON_OBJECT CurIcon, tmp; - PCURICON_PROCESS ProcessData; - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - return; - } - - LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) - { - UserReferenceObject(CurIcon); - // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) - { - LIST_FOR_EACH(ProcessData, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) - { - if (Win32Process == ProcessData->Process) + PWINSTATION_OBJECT WinSta; + PCURICON_OBJECT CurIcon, tmp; + PCURICON_PROCESS ProcessData; + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + return; + } + + LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) + { + UserReferenceObject(CurIcon); + // if(NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) + { + LIST_FOR_EACH(ProcessData, &CurIcon->ProcessList, CURICON_PROCESS, ListEntry) { - RemoveEntryList(&CurIcon->ListEntry); - IntDestroyCurIconObject(WinSta, CurIcon, TRUE); - CurIcon = NULL; - break; + if (Win32Process == ProcessData->Process) + { + RemoveEntryList(&CurIcon->ListEntry); + IntDestroyCurIconObject(WinSta, CurIcon, TRUE); + CurIcon = NULL; + break; + } } - } // UserDereferenceObject(Object); - } - - if (CurIcon) - { - UserDereferenceObject(CurIcon); - } - } - - ObDereferenceObject(WinSta); + } + + if (CurIcon) + { + UserDereferenceObject(CurIcon); + } + } + + ObDereferenceObject(WinSta); } /* @@ -511,84 +511,84 @@ APIENTRY NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect) { - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - PSURFACE psurfBmp; - NTSTATUS Status; - HANDLE Ret; - DECLARE_RETURN(HANDLE); - - DPRINT("Enter NtUserCreateCursorIconHandle\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( (HANDLE)0); - } - - if (!(CurIcon = IntCreateCurIconHandle(WinSta))) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - ObDereferenceObject(WinSta); - RETURN( (HANDLE)0); - } - - Ret = CurIcon->Self; - - if(IconInfo) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); - if(NT_SUCCESS(Status)) - { - /* Copy bitmaps and size info */ - if(Indirect) - { - CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); - CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); - } - if(CurIcon->IconInfo.hbmColor && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - if(CurIcon->IconInfo.hbmMask && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - if (CurIcon->IconInfo.hbmColor == NULL) + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + PSURFACE psurfBmp; + NTSTATUS Status; + HANDLE Ret; + DECLARE_RETURN(HANDLE); + + DPRINT("Enter NtUserCreateCursorIconHandle\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN((HANDLE)0); + } + + if (!(CurIcon = IntCreateCurIconHandle(WinSta))) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + ObDereferenceObject(WinSta); + RETURN((HANDLE)0); + } + + Ret = CurIcon->Self; + + if (IconInfo) + { + Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); + if (NT_SUCCESS(Status)) + { + /* Copy bitmaps and size info */ + if (Indirect) { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1; + CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); + CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); } - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } - - /* Calculate icon hotspot */ - if (CurIcon->IconInfo.fIcon == TRUE) - { - CurIcon->IconInfo.xHotspot = CurIcon->Size.cx >> 1; - CurIcon->IconInfo.yHotspot = CurIcon->Size.cy >> 1; - } - } - else - { - SetLastNtError(Status); - /* FIXME - Don't exit here */ - } - } - - UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN( Ret); + if (CurIcon->IconInfo.hbmColor && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } + if (CurIcon->IconInfo.hbmMask && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) + { + if (CurIcon->IconInfo.hbmColor == NULL) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1; + } + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + } + + /* Calculate icon hotspot */ + if (CurIcon->IconInfo.fIcon == TRUE) + { + CurIcon->IconInfo.xHotspot = CurIcon->Size.cx >> 1; + CurIcon->IconInfo.yHotspot = CurIcon->Size.cy >> 1; + } + } + else + { + SetLastNtError(Status); + /* FIXME - Don't exit here */ + } + } + + UserDereferenceObject(CurIcon); + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } /* @@ -597,90 +597,90 @@ BOOL APIENTRY NtUserGetIconInfo( - HANDLE hCurIcon, - PICONINFO IconInfo, - PUNICODE_STRING lpInstName, // optional - PUNICODE_STRING lpResName, // optional - LPDWORD pbpp, // optional - BOOL bInternal) -{ - ICONINFO ii; - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetIconInfo\n"); - UserEnterExclusive(); - - if(!IconInfo) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(FALSE); - } - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - ObDereferenceObject(WinSta); - RETURN( FALSE); - } - - RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); - - /* Copy bitmaps */ - ii.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); - ii.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); - - /* Copy fields */ - _SEH2_TRY - { - ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); - RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); - - if (pbpp) - { - PSURFACE psurfBmp; - int colorBpp = 0; - - ProbeForWrite(pbpp, sizeof(DWORD), 1); - - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); - if (psurfBmp) - { - colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); - SURFACE_UnlockSurface(psurfBmp); - } - - RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (NT_SUCCESS(Status)) - Ret = TRUE; - else - SetLastNtError(Status); - - UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN( Ret); + HANDLE hCurIcon, + PICONINFO IconInfo, + PUNICODE_STRING lpInstName, // optional + PUNICODE_STRING lpResName, // optional + LPDWORD pbpp, // optional + BOOL bInternal) +{ + ICONINFO ii; + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status = STATUS_SUCCESS; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetIconInfo\n"); + UserEnterExclusive(); + + if (!IconInfo) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); + + /* Copy bitmaps */ + ii.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); + ii.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); + + /* Copy fields */ + _SEH2_TRY + { + ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + + if (pbpp) + { + PSURFACE psurfBmp; + int colorBpp = 0; + + ProbeForWrite(pbpp, sizeof(DWORD), 1); + + psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); + if (psurfBmp) + { + colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); + SURFACE_UnlockSurface(psurfBmp); + } + + RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (NT_SUCCESS(Status)) + Ret = TRUE; + else + SetLastNtError(Status); + + UserDereferenceObject(CurIcon); + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -695,42 +695,42 @@ PLONG plcx, // &size.cx PLONG plcy) // &size.cy { - PCURICON_OBJECT CurIcon; - NTSTATUS Status = STATUS_SUCCESS; - BOOL bRet = FALSE; - - DPRINT("Enter NtUserGetIconSize\n"); - UserEnterExclusive(); - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - goto cleanup; - } - - _SEH2_TRY - { - ProbeForWrite(plcx, sizeof(LONG), 1); - RtlCopyMemory(plcx, &CurIcon->Size.cx, sizeof(LONG)); - ProbeForWrite(plcy, sizeof(LONG), 1); - RtlCopyMemory(plcy, &CurIcon->Size.cy, sizeof(LONG)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if(NT_SUCCESS(Status)) - bRet = TRUE; - else - SetLastNtError(Status); // maybe not, test this - - UserDereferenceObject(CurIcon); + PCURICON_OBJECT CurIcon; + NTSTATUS Status = STATUS_SUCCESS; + BOOL bRet = FALSE; + + DPRINT("Enter NtUserGetIconSize\n"); + UserEnterExclusive(); + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + goto cleanup; + } + + _SEH2_TRY + { + ProbeForWrite(plcx, sizeof(LONG), 1); + RtlCopyMemory(plcx, &CurIcon->Size.cx, sizeof(LONG)); + ProbeForWrite(plcy, sizeof(LONG), 1); + RtlCopyMemory(plcy, &CurIcon->Size.cy, sizeof(LONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (NT_SUCCESS(Status)) + bRet = TRUE; + else + SetLastNtError(Status); // maybe not, test this + + UserDereferenceObject(CurIcon); cleanup: - DPRINT("Leave NtUserGetIconSize, ret=%i\n", bRet); - UserLeave(); - return bRet; + DPRINT("Leave NtUserGetIconSize, ret=%i\n", bRet); + UserLeave(); + return bRet; } @@ -740,14 +740,14 @@ DWORD APIENTRY NtUserGetCursorFrameInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3) +{ + UNIMPLEMENTED + + return 0; } @@ -757,64 +757,64 @@ BOOL APIENTRY NtUserGetCursorInfo( - PCURSORINFO pci) -{ - CURSORINFO SafeCi; - PSYSTEM_CURSORINFO CurInfo; - PWINSTATION_OBJECT WinSta; - NTSTATUS Status = STATUS_SUCCESS; - PCURICON_OBJECT CurIcon; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetCursorInfo\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN( FALSE); - } - - CurInfo = IntGetSysCursorInfo(WinSta); - CurIcon = (PCURICON_OBJECT)CurInfo->CurrentCursorObject; - - SafeCi.cbSize = sizeof(CURSORINFO); - SafeCi.flags = ((CurInfo->ShowingCursor && CurIcon) ? CURSOR_SHOWING : 0); - SafeCi.hCursor = (CurIcon ? (HCURSOR)CurIcon->Self : (HCURSOR)0); - - IntGetCursorLocation(WinSta, &SafeCi.ptScreenPos); - - _SEH2_TRY - { - if (pci->cbSize == sizeof(CURSORINFO)) - { - ProbeForWrite(pci, sizeof(CURSORINFO), 1); - RtlCopyMemory(pci, &SafeCi, sizeof(CURSORINFO)); - Ret = TRUE; - } - else - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - } - - ObDereferenceObject(WinSta); - RETURN(Ret); + PCURSORINFO pci) +{ + CURSORINFO SafeCi; + PSYSTEM_CURSORINFO CurInfo; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status = STATUS_SUCCESS; + PCURICON_OBJECT CurIcon; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetCursorInfo\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + CurInfo = IntGetSysCursorInfo(WinSta); + CurIcon = (PCURICON_OBJECT)CurInfo->CurrentCursorObject; + + SafeCi.cbSize = sizeof(CURSORINFO); + SafeCi.flags = ((CurInfo->ShowingCursor && CurIcon) ? CURSOR_SHOWING : 0); + SafeCi.hCursor = (CurIcon ? (HCURSOR)CurIcon->Self : (HCURSOR)0); + + IntGetCursorLocation(WinSta, &SafeCi.ptScreenPos); + + _SEH2_TRY + { + if (pci->cbSize == sizeof(CURSORINFO)) + { + ProbeForWrite(pci, sizeof(CURSORINFO), 1); + RtlCopyMemory(pci, &SafeCi, sizeof(CURSORINFO)); + Ret = TRUE; + } + else + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + } + + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserGetCursorInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserGetCursorInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -824,70 +824,70 @@ BOOL APIENTRY NtUserClipCursor( - RECTL *UnsafeRect) -{ - /* FIXME - check if process has WINSTA_WRITEATTRIBUTES */ - - PWINSTATION_OBJECT WinSta; - PSYSTEM_CURSORINFO CurInfo; - RECTL Rect; - PWINDOW_OBJECT DesktopWindow = NULL; - POINT MousePos = {0}; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserClipCursor\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN( FALSE); - } - - if (NULL != UnsafeRect && ! NT_SUCCESS(MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)))) - { - ObDereferenceObject(WinSta); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - - CurInfo = IntGetSysCursorInfo(WinSta); - IntGetCursorLocation(WinSta, &MousePos); - - if(WinSta->ActiveDesktop) - DesktopWindow = UserGetWindowObject(WinSta->ActiveDesktop->DesktopWindow); - - if((Rect.right > Rect.left) && (Rect.bottom > Rect.top) - && DesktopWindow && UnsafeRect != NULL) - { - MOUSEINPUT mi; - - CurInfo->CursorClipInfo.IsClipped = TRUE; - CurInfo->CursorClipInfo.Left = max(Rect.left, DesktopWindow->Wnd->rcWindow.left); - CurInfo->CursorClipInfo.Top = max(Rect.top, DesktopWindow->Wnd->rcWindow.top); - CurInfo->CursorClipInfo.Right = min(Rect.right - 1, DesktopWindow->Wnd->rcWindow.right - 1); - CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->Wnd->rcWindow.bottom - 1); - - mi.dx = MousePos.x; - mi.dy = MousePos.y; - mi.mouseData = 0; - mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; - mi.time = 0; - mi.dwExtraInfo = 0; - IntMouseInput(&mi); - - RETURN( TRUE); - } - - CurInfo->CursorClipInfo.IsClipped = FALSE; - ObDereferenceObject(WinSta); - - RETURN( TRUE); + RECTL *UnsafeRect) +{ + /* FIXME - check if process has WINSTA_WRITEATTRIBUTES */ + + PWINSTATION_OBJECT WinSta; + PSYSTEM_CURSORINFO CurInfo; + RECTL Rect; + PWINDOW_OBJECT DesktopWindow = NULL; + POINT MousePos = {0}; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserClipCursor\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (NULL != UnsafeRect && ! NT_SUCCESS(MmCopyFromCaller(&Rect, UnsafeRect, sizeof(RECT)))) + { + ObDereferenceObject(WinSta); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + CurInfo = IntGetSysCursorInfo(WinSta); + IntGetCursorLocation(WinSta, &MousePos); + + if (WinSta->ActiveDesktop) + DesktopWindow = UserGetWindowObject(WinSta->ActiveDesktop->DesktopWindow); + + if ((Rect.right > Rect.left) && (Rect.bottom > Rect.top) + && DesktopWindow && UnsafeRect != NULL) + { + MOUSEINPUT mi; + + CurInfo->CursorClipInfo.IsClipped = TRUE; + CurInfo->CursorClipInfo.Left = max(Rect.left, DesktopWindow->Wnd->rcWindow.left); + CurInfo->CursorClipInfo.Top = max(Rect.top, DesktopWindow->Wnd->rcWindow.top); + CurInfo->CursorClipInfo.Right = min(Rect.right - 1, DesktopWindow->Wnd->rcWindow.right - 1); + CurInfo->CursorClipInfo.Bottom = min(Rect.bottom - 1, DesktopWindow->Wnd->rcWindow.bottom - 1); + + mi.dx = MousePos.x; + mi.dy = MousePos.y; + mi.mouseData = 0; + mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + mi.time = 0; + mi.dwExtraInfo = 0; + IntMouseInput(&mi); + + RETURN(TRUE); + } + + CurInfo->CursorClipInfo.IsClipped = FALSE; + ObDereferenceObject(WinSta); + + RETURN(TRUE); CLEANUP: - DPRINT("Leave NtUserClipCursor, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserClipCursor, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -897,39 +897,39 @@ BOOL APIENTRY NtUserDestroyCursor( - HANDLE hCurIcon, - DWORD Unknown) -{ - PWINSTATION_OBJECT WinSta; - PCURICON_OBJECT CurIcon; - BOOL ret; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserDestroyCursorIcon\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - ret = IntDestroyCurIconObject(WinSta, CurIcon, FALSE); - /* Note: IntDestroyCurIconObject will remove our reference for us! */ - - ObDereferenceObject(WinSta); - RETURN(ret); + HANDLE hCurIcon, + DWORD Unknown) +{ + PWINSTATION_OBJECT WinSta; + PCURICON_OBJECT CurIcon; + BOOL ret; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserDestroyCursorIcon\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + ret = IntDestroyCurIconObject(WinSta, CurIcon, FALSE); + /* Note: IntDestroyCurIconObject will remove our reference for us! */ + + ObDereferenceObject(WinSta); + RETURN(ret); CLEANUP: - DPRINT("Leave NtUserDestroyCursorIcon, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserDestroyCursorIcon, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -939,43 +939,43 @@ HICON APIENTRY NtUserFindExistingCursorIcon( - HMODULE hModule, - HRSRC hRsrc, - LONG cx, - LONG cy) -{ - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - HANDLE Ret = (HANDLE)0; - DECLARE_RETURN(HICON); - - DPRINT("Enter NtUserFindExistingCursorIcon\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( Ret); - } - - CurIcon = IntFindExistingCurIconObject(WinSta, hModule, hRsrc, cx, cy); - if(CurIcon) - { - Ret = CurIcon->Self; + HMODULE hModule, + HRSRC hRsrc, + LONG cx, + LONG cy) +{ + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + HANDLE Ret = (HANDLE)0; + DECLARE_RETURN(HICON); + + DPRINT("Enter NtUserFindExistingCursorIcon\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(Ret); + } + + CurIcon = IntFindExistingCurIconObject(WinSta, hModule, hRsrc, cx, cy); + if (CurIcon) + { + Ret = CurIcon->Self; // IntReleaseCurIconObject(CurIcon);//faxme: is this correct? does IntFindExistingCurIconObject add a ref? - ObDereferenceObject(WinSta); - RETURN( Ret); - } - - SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); - ObDereferenceObject(WinSta); - RETURN( (HANDLE)0); + ObDereferenceObject(WinSta); + RETURN(Ret); + } + + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); + ObDereferenceObject(WinSta); + RETURN((HANDLE)0); CLEANUP: - DPRINT("Leave NtUserFindExistingCursorIcon, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserFindExistingCursorIcon, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -985,59 +985,59 @@ BOOL APIENTRY NtUserGetClipCursor( - RECTL *lpRect) -{ - /* FIXME - check if process has WINSTA_READATTRIBUTES */ - PSYSTEM_CURSORINFO CurInfo; - PWINSTATION_OBJECT WinSta; - RECTL Rect; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserGetClipCursor\n"); - UserEnterExclusive(); - - if(!lpRect) - RETURN( FALSE); - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN( FALSE); - } - - CurInfo = IntGetSysCursorInfo(WinSta); - if(CurInfo->CursorClipInfo.IsClipped) - { - Rect.left = CurInfo->CursorClipInfo.Left; - Rect.top = CurInfo->CursorClipInfo.Top; - Rect.right = CurInfo->CursorClipInfo.Right; - Rect.bottom = CurInfo->CursorClipInfo.Bottom; - } - else - { - Rect.left = 0; - Rect.top = 0; - Rect.right = UserGetSystemMetrics(SM_CXSCREEN); - Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); - } - - Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT)); - if(!NT_SUCCESS(Status)) - { - ObDereferenceObject(WinSta); - SetLastNtError(Status); - RETURN( FALSE); - } - - ObDereferenceObject(WinSta); - - RETURN( TRUE); + RECTL *lpRect) +{ + /* FIXME - check if process has WINSTA_READATTRIBUTES */ + PSYSTEM_CURSORINFO CurInfo; + PWINSTATION_OBJECT WinSta; + RECTL Rect; + NTSTATUS Status; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetClipCursor\n"); + UserEnterExclusive(); + + if (!lpRect) + RETURN(FALSE); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + CurInfo = IntGetSysCursorInfo(WinSta); + if (CurInfo->CursorClipInfo.IsClipped) + { + Rect.left = CurInfo->CursorClipInfo.Left; + Rect.top = CurInfo->CursorClipInfo.Top; + Rect.right = CurInfo->CursorClipInfo.Right; + Rect.bottom = CurInfo->CursorClipInfo.Bottom; + } + else + { + Rect.left = 0; + Rect.top = 0; + Rect.right = UserGetSystemMetrics(SM_CXSCREEN); + Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + + Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT)); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(WinSta); + SetLastNtError(Status); + RETURN(FALSE); + } + + ObDereferenceObject(WinSta); + + RETURN(TRUE); CLEANUP: - DPRINT("Leave NtUserGetClipCursor, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserGetClipCursor, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -1047,49 +1047,49 @@ HCURSOR APIENTRY NtUserSetCursor( - HCURSOR hCursor) -{ - PCURICON_OBJECT CurIcon; - HICON OldCursor; - PWINSTATION_OBJECT WinSta; - DECLARE_RETURN(HCURSOR); - - DPRINT("Enter NtUserSetCursor\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN(NULL); - } - - if(hCursor) - { - if(!(CurIcon = UserGetCurIconObject(hCursor))) - { - ObDereferenceObject(WinSta); - RETURN(NULL); - } - } - else - { - CurIcon = NULL; - } - - OldCursor = IntSetCursor(WinSta, CurIcon, FALSE); - - if(CurIcon) - { - UserDereferenceObject(CurIcon); - } - ObDereferenceObject(WinSta); - - RETURN(OldCursor); + HCURSOR hCursor) +{ + PCURICON_OBJECT CurIcon; + HICON OldCursor; + PWINSTATION_OBJECT WinSta; + DECLARE_RETURN(HCURSOR); + + DPRINT("Enter NtUserSetCursor\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(NULL); + } + + if (hCursor) + { + if (!(CurIcon = UserGetCurIconObject(hCursor))) + { + ObDereferenceObject(WinSta); + RETURN(NULL); + } + } + else + { + CurIcon = NULL; + } + + OldCursor = IntSetCursor(WinSta, CurIcon, FALSE); + + if (CurIcon) + { + UserDereferenceObject(CurIcon); + } + ObDereferenceObject(WinSta); + + RETURN(OldCursor); CLEANUP: - DPRINT("Leave NtUserSetCursor, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserSetCursor, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -1099,89 +1099,89 @@ BOOL APIENTRY NtUserSetCursorContents( - HANDLE hCurIcon, - PICONINFO UnsafeIconInfo) -{ - PCURICON_OBJECT CurIcon; - ICONINFO IconInfo; - PSURFACE psurfBmp; - PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSetCursorContents\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if (!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - /* Copy fields */ - Status = MmCopyFromCaller(&IconInfo, UnsafeIconInfo, sizeof(ICONINFO)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - - /* Delete old bitmaps */ - if (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor) - { - GreDeleteObject(CurIcon->IconInfo.hbmColor); - } - if (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask) - { - GreDeleteObject(CurIcon->IconInfo.hbmMask); - } - - /* Copy new IconInfo field */ - CurIcon->IconInfo = IconInfo; - - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); - if(psurfBmp) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - else - { - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask); - if(!psurfBmp) - goto done; - - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy / 2; - - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } - - Ret = TRUE; + HANDLE hCurIcon, + PICONINFO UnsafeIconInfo) +{ + PCURICON_OBJECT CurIcon; + ICONINFO IconInfo; + PSURFACE psurfBmp; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetCursorContents\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + /* Copy fields */ + Status = MmCopyFromCaller(&IconInfo, UnsafeIconInfo, sizeof(ICONINFO)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto done; + } + + /* Delete old bitmaps */ + if (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor) + { + GreDeleteObject(CurIcon->IconInfo.hbmColor); + } + if (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask) + { + GreDeleteObject(CurIcon->IconInfo.hbmMask); + } + + /* Copy new IconInfo field */ + CurIcon->IconInfo = IconInfo; + + psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); + if (psurfBmp) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } + else + { + psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask); + if (!psurfBmp) + goto done; + + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy / 2; + + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + } + + Ret = TRUE; done: - if (CurIcon) - { - UserDereferenceObject(CurIcon); - } - ObDereferenceObject(WinSta); - RETURN( Ret); + if (CurIcon) + { + UserDereferenceObject(CurIcon); + } + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } @@ -1192,171 +1192,171 @@ BOOL APIENTRY NtUserSetCursorIconData( - HANDLE Handle, - HMODULE hModule, - PUNICODE_STRING pstrResName, - PICONINFO pIconInfo) -{ - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - PSURFACE psurfBmp; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSetCursorIconData\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if(!(CurIcon = UserGetCurIconObject(Handle))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - CurIcon->hModule = hModule; - CurIcon->hRsrc = NULL; //hRsrc; - CurIcon->hGroupRsrc = NULL; //hGroupRsrc; - - _SEH2_TRY - { - ProbeForRead(pIconInfo, sizeof(ICONINFO), 1); - RtlCopyMemory(&CurIcon->IconInfo, pIconInfo, sizeof(ICONINFO)); - - CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(pIconInfo->hbmMask); - CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(pIconInfo->hbmColor); - - if (CurIcon->IconInfo.hbmColor) - { - if ((psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); - } - } - if (CurIcon->IconInfo.hbmMask) - { - if (CurIcon->IconInfo.hbmColor == NULL) - { - if ((psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - } - } - GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { + HANDLE Handle, + HMODULE hModule, + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo) +{ + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + PSURFACE psurfBmp; + NTSTATUS Status = STATUS_SUCCESS; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetCursorIconData\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (!(CurIcon = UserGetCurIconObject(Handle))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + CurIcon->hModule = hModule; + CurIcon->hRsrc = NULL; //hRsrc; + CurIcon->hGroupRsrc = NULL; //hGroupRsrc; + + _SEH2_TRY + { + ProbeForRead(pIconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(&CurIcon->IconInfo, pIconInfo, sizeof(ICONINFO)); + + CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(pIconInfo->hbmMask); + CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(pIconInfo->hbmColor); + + if (CurIcon->IconInfo.hbmColor) + { + if ((psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + if (CurIcon->IconInfo.hbmMask) + { + if (CurIcon->IconInfo.hbmColor == NULL) + { + if ((psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) + { + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + } + } + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if(!NT_SUCCESS(Status)) - SetLastNtError(Status); - else - Ret = TRUE; - - UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN( Ret); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + SetLastNtError(Status); + else + Ret = TRUE; + + UserDereferenceObject(CurIcon); + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } #else BOOL APIENTRY NtUserSetCursorIconData( - HANDLE hCurIcon, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) -{ - PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - POINT SafeHotspot; - BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); - - DPRINT("Enter NtUserSetCursorIconData\n"); - UserEnterExclusive(); - - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) - { - RETURN( FALSE); - } - - if(!(CurIcon = UserGetCurIconObject(hCurIcon))) - { - ObDereferenceObject(WinSta); - RETURN(FALSE); - } - - CurIcon->hModule = hModule; - CurIcon->hRsrc = hRsrc; - CurIcon->hGroupRsrc = hGroupRsrc; - - /* Copy fields */ - if(fIcon) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - } - else - { - if(!Hotspot) - Ret = TRUE; - } - - if(Hotspot) - { - Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); - if(NT_SUCCESS(Status)) - { - CurIcon->IconInfo.xHotspot = SafeHotspot.x; - CurIcon->IconInfo.yHotspot = SafeHotspot.y; - - Ret = TRUE; - } - else - SetLastNtError(Status); - } - - if(!fIcon && !Hotspot) - { - Ret = TRUE; - } + HANDLE hCurIcon, + PBOOL fIcon, + POINT *Hotspot, + HMODULE hModule, + HRSRC hRsrc, + HRSRC hGroupRsrc) +{ + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status; + POINT SafeHotspot; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetCursorIconData\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if (WinSta == NULL) + { + RETURN(FALSE); + } + + if (!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + CurIcon->hModule = hModule; + CurIcon->hRsrc = hRsrc; + CurIcon->hGroupRsrc = hGroupRsrc; + + /* Copy fields */ + if (fIcon) + { + Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto done; + } + } + else + { + if (!Hotspot) + Ret = TRUE; + } + + if (Hotspot) + { + Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); + if (NT_SUCCESS(Status)) + { + CurIcon->IconInfo.xHotspot = SafeHotspot.x; + CurIcon->IconInfo.yHotspot = SafeHotspot.y; + + Ret = TRUE; + } + else + SetLastNtError(Status); + } + + if (!fIcon && !Hotspot) + { + Ret = TRUE; + } done: - UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN( Ret); + UserDereferenceObject(CurIcon); + ObDereferenceObject(WinSta); + RETURN(Ret); CLEANUP: - DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } #endif @@ -1366,229 +1366,229 @@ BOOL APIENTRY NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; + HCURSOR hcur, + DWORD id) +{ + return FALSE; } BOOL UserDrawIconEx( - HDC hDc, - INT xLeft, - INT yTop, - PCURICON_OBJECT pIcon, - INT cxWidth, - INT cyHeight, - UINT istepIfAniCur, - HBRUSH hbrFlickerFreeDraw, - UINT diFlags) -{ - BOOL Ret = FALSE; - HBITMAP hbmMask, hbmColor; - BITMAP bmpMask, bmpColor; - BOOL DoFlickerFree; - SIZE IconSize; - - HDC hdcOff; - HGDIOBJ hOldOffBrush = 0; - HGDIOBJ hOldOffBmp = 0; - HBITMAP hbmOff = 0; - HDC hdcMask = 0; - HGDIOBJ hOldMask = NULL; - HDC hdcImage = 0; - HGDIOBJ hOldImage = NULL; - BOOL bAlpha = FALSE; - - hbmMask = pIcon->IconInfo.hbmMask; - hbmColor = pIcon->IconInfo.hbmColor; - - if (istepIfAniCur) - DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - - if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bmpMask)) - { - return FALSE; - } - - if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor)) - { - return FALSE; - } - - if (hbmColor) - { - IconSize.cx = bmpColor.bmWidth; - IconSize.cy = bmpColor.bmHeight; - } - else - { - IconSize.cx = bmpMask.bmWidth; - IconSize.cy = bmpMask.bmHeight / 2; - } - - /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap - when cxWidth or cyHeight is 0 */ - if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) - { - SURFACE *psurfOff = NULL; - PFN_DIB_GetPixel fnSource_GetPixel = NULL; - INT x, y; - - /* In order to correctly display 32 bit icons Windows first scans the image, - because information about transparency is not stored in any image's headers */ - psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); - if (psurfOff) - { - fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; - if (fnSource_GetPixel) - { - for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++) + HDC hDc, + INT xLeft, + INT yTop, + PCURICON_OBJECT pIcon, + INT cxWidth, + INT cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags) +{ + BOOL Ret = FALSE; + HBITMAP hbmMask, hbmColor; + BITMAP bmpMask, bmpColor; + BOOL DoFlickerFree; + SIZE IconSize; + + HDC hdcOff; + HGDIOBJ hOldOffBrush = 0; + HGDIOBJ hOldOffBmp = 0; + HBITMAP hbmOff = 0; + HDC hdcMask = 0; + HGDIOBJ hOldMask = NULL; + HDC hdcImage = 0; + HGDIOBJ hOldImage = NULL; + BOOL bAlpha = FALSE; + + hbmMask = pIcon->IconInfo.hbmMask; + hbmColor = pIcon->IconInfo.hbmColor; + + if (istepIfAniCur) + DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); + + if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bmpMask)) + { + return FALSE; + } + + if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor)) + { + return FALSE; + } + + if (hbmColor) + { + IconSize.cx = bmpColor.bmWidth; + IconSize.cy = bmpColor.bmHeight; + } + else + { + IconSize.cx = bmpMask.bmWidth; + IconSize.cy = bmpMask.bmHeight / 2; + } + + /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap + when cxWidth or cyHeight is 0 */ + if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) + { + SURFACE *psurfOff = NULL; + PFN_DIB_GetPixel fnSource_GetPixel = NULL; + INT x, y; + + /* In order to correctly display 32 bit icons Windows first scans the image, + because information about transparency is not stored in any image's headers */ + psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); + if (psurfOff) + { + fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; + if (fnSource_GetPixel) { - for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++) - { - bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x, y) >> 24) & 0xff); - if (bAlpha) - break; - } - if (bAlpha) - break; + for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++) + { + for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++) + { + bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x, y) >> 24) & 0xff); + if (bAlpha) + break; + } + if (bAlpha) + break; + } } - } - SURFACE_UnlockSurface(psurfOff); - } - } - - if (!diFlags) - diFlags = DI_NORMAL; - - if (!cxWidth) - cxWidth = ((diFlags & DI_DEFAULTSIZE) ? - UserGetSystemMetrics(SM_CXICON) : IconSize.cx); - - if (!cyHeight) - cyHeight = ((diFlags & DI_DEFAULTSIZE) ? - UserGetSystemMetrics(SM_CYICON) : IconSize.cy); - - DoFlickerFree = (hbrFlickerFreeDraw && - (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); - - if (DoFlickerFree || bAlpha) - { - RECTL r; - BITMAP bm; - SURFACE *psurfOff = NULL; - - r.right = cxWidth; - r.bottom = cyHeight; - - hdcOff = NtGdiCreateCompatibleDC(hDc); - if (!hdcOff) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - return FALSE; - } - - hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); - if (!hbmOff) - { - DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); - goto cleanup; - } - - /* make sure we have a 32 bit offscreen bitmap - otherwise we can't do alpha blending */ - psurfOff = SURFACE_LockSurface(hbmOff); - if (psurfOff == NULL) - { - DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); - goto cleanup; - } - BITMAP_GetObject(psurfOff, sizeof(BITMAP), (PVOID)&bm); - - if (bm.bmBitsPixel != 32) - bAlpha = FALSE; - - SURFACE_UnlockSurface(psurfOff); - - hOldOffBmp = NtGdiSelectBitmap(hdcOff, hbmOff); - if (!hOldOffBmp) - { - DPRINT1("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - - if (DoFlickerFree) - { - hOldOffBrush = NtGdiSelectBrush(hdcOff, hbrFlickerFreeDraw); - if (!hOldOffBrush) - { - DPRINT1("NtGdiSelectBrush() failed!\n"); - goto cleanup; - } - - NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); - } - } - else - hdcOff = hDc; - - if (diFlags & DI_IMAGE) - { - hdcImage = NtGdiCreateCompatibleDC(hDc); - if (!hdcImage) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - hOldImage = NtGdiSelectBitmap(hdcImage, (hbmColor ? hbmColor : hbmMask)); - if (!hOldImage) - { - DPRINT("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - } - - /* If DI_IMAGE flag is specified and hbmMask exists, then always use mask for drawing */ - if (diFlags & DI_MASK || (diFlags & DI_IMAGE && hbmMask)) - { - hdcMask = NtGdiCreateCompatibleDC(hDc); - if (!hdcMask) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - - hOldMask = NtGdiSelectBitmap(hdcMask, hbmMask); - if (!hOldMask) - { - DPRINT("NtGdiSelectBitmap() failed!\n"); - goto cleanup; - } - } - - if (hdcMask || hdcImage) - { - GreStretchBltMask(hdcOff, - (DoFlickerFree || bAlpha) ? 0 : xLeft, - (DoFlickerFree || bAlpha) ? 0 : yTop, - cxWidth, - cyHeight, - hdcImage ? hdcImage : hdcMask, - 0, - ((diFlags & DI_MASK && !(diFlags & DI_IMAGE)) || - (diFlags & DI_IMAGE && hbmColor) ? 0 : IconSize.cy), - IconSize.cx, - IconSize.cy, - SRCCOPY, - 0, - hdcImage ? hdcMask : NULL); - } - - if (hOldMask) NtGdiSelectBitmap(hdcMask, hOldMask); - if (hOldImage) NtGdiSelectBitmap(hdcImage, hOldImage); - if (hdcImage) NtGdiDeleteObjectApp(hdcImage); - if (hdcMask) NtGdiDeleteObjectApp(hdcMask); + SURFACE_UnlockSurface(psurfOff); + } + } + + if (!diFlags) + diFlags = DI_NORMAL; + + if (!cxWidth) + cxWidth = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CXICON) : IconSize.cx); + + if (!cyHeight) + cyHeight = ((diFlags & DI_DEFAULTSIZE) ? + UserGetSystemMetrics(SM_CYICON) : IconSize.cy); + + DoFlickerFree = (hbrFlickerFreeDraw && + (GDI_HANDLE_GET_TYPE(hbrFlickerFreeDraw) == GDI_OBJECT_TYPE_BRUSH)); + + if (DoFlickerFree || bAlpha) + { + RECTL r; + BITMAP bm; + SURFACE *psurfOff = NULL; + + r.right = cxWidth; + r.bottom = cyHeight; + + hdcOff = NtGdiCreateCompatibleDC(hDc); + if (!hdcOff) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + return FALSE; + } + + hbmOff = NtGdiCreateCompatibleBitmap(hDc, cxWidth, cyHeight); + if (!hbmOff) + { + DPRINT1("NtGdiCreateCompatibleBitmap() failed!\n"); + goto cleanup; + } + + /* make sure we have a 32 bit offscreen bitmap + otherwise we can't do alpha blending */ + psurfOff = SURFACE_LockSurface(hbmOff); + if (psurfOff == NULL) + { + DPRINT1("BITMAPOBJ_LockBitmap() failed!\n"); + goto cleanup; + } + BITMAP_GetObject(psurfOff, sizeof(BITMAP), (PVOID)&bm); + + if (bm.bmBitsPixel != 32) + bAlpha = FALSE; + + SURFACE_UnlockSurface(psurfOff); + + hOldOffBmp = NtGdiSelectBitmap(hdcOff, hbmOff); + if (!hOldOffBmp) + { + DPRINT1("NtGdiSelectBitmap() failed!\n"); + goto cleanup; + } + + if (DoFlickerFree) + { + hOldOffBrush = NtGdiSelectBrush(hdcOff, hbrFlickerFreeDraw); + if (!hOldOffBrush) + { + DPRINT1("NtGdiSelectBrush() failed!\n"); + goto cleanup; + } + + NtGdiPatBlt(hdcOff, 0, 0, r.right, r.bottom, PATCOPY); + } + } + else + hdcOff = hDc; + + if (diFlags & DI_IMAGE) + { + hdcImage = NtGdiCreateCompatibleDC(hDc); + if (!hdcImage) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + hOldImage = NtGdiSelectBitmap(hdcImage, (hbmColor ? hbmColor : hbmMask)); + if (!hOldImage) + { + DPRINT("NtGdiSelectBitmap() failed!\n"); + goto cleanup; + } + } + + /* If DI_IMAGE flag is specified and hbmMask exists, then always use mask for drawing */ + if (diFlags & DI_MASK || (diFlags & DI_IMAGE && hbmMask)) + { + hdcMask = NtGdiCreateCompatibleDC(hDc); + if (!hdcMask) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + + hOldMask = NtGdiSelectBitmap(hdcMask, hbmMask); + if (!hOldMask) + { + DPRINT("NtGdiSelectBitmap() failed!\n"); + goto cleanup; + } + } + + if (hdcMask || hdcImage) + { + GreStretchBltMask(hdcOff, + (DoFlickerFree || bAlpha) ? 0 : xLeft, + (DoFlickerFree || bAlpha) ? 0 : yTop, + cxWidth, + cyHeight, + hdcImage ? hdcImage : hdcMask, + 0, + ((diFlags & DI_MASK && !(diFlags & DI_IMAGE)) || + (diFlags & DI_IMAGE && hbmColor) ? 0 : IconSize.cy), + IconSize.cx, + IconSize.cy, + SRCCOPY, + 0, + hdcImage ? hdcMask : NULL); + } + + if (hOldMask) NtGdiSelectBitmap(hdcMask, hOldMask); + if (hOldImage) NtGdiSelectBitmap(hdcImage, hOldImage); + if (hdcImage) NtGdiDeleteObjectApp(hdcImage); + if (hdcMask) NtGdiDeleteObjectApp(hdcMask); if (bAlpha) { @@ -1635,7 +1635,7 @@ *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); - Count += sizeof (DWORD); + Count += sizeof(DWORD); } } @@ -1659,18 +1659,18 @@ cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); } - Ret = TRUE; + Ret = TRUE; cleanup: - if(DoFlickerFree || bAlpha) - { - if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); - if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); - if(hbmOff) GreDeleteObject(hbmOff); - if(hdcOff) NtGdiDeleteObjectApp(hdcOff); - } - - return Ret; + if (DoFlickerFree || bAlpha) + { + if (hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); + if (hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); + if (hbmOff) GreDeleteObject(hbmOff); + if (hdcOff) NtGdiDeleteObjectApp(hdcOff); + } + + return Ret; } /* @@ -1679,45 +1679,45 @@ BOOL APIENTRY NtUserDrawIconEx( - HDC hdc, - int xLeft, - int yTop, - HICON hIcon, - int cxWidth, - int cyHeight, - UINT istepIfAniCur, - HBRUSH hbrFlickerFreeDraw, - UINT diFlags, - DWORD Unknown0, - DWORD Unknown1) -{ - PCURICON_OBJECT pIcon; - BOOL Ret; - - DPRINT("Enter NtUserDrawIconEx\n"); - UserEnterExclusive(); - - if(!(pIcon = UserGetCurIconObject(hIcon))) - { - DPRINT1("UserGetCurIconObject() failed!\n"); - UserLeave(); - return FALSE; - } - - Ret = UserDrawIconEx(hdc, - xLeft, - yTop, - pIcon, - cxWidth, - cyHeight, - istepIfAniCur, - hbrFlickerFreeDraw, - diFlags); - - UserDereferenceObject(pIcon); - - UserLeave(); - return Ret; + HDC hdc, + int xLeft, + int yTop, + HICON hIcon, + int cxWidth, + int cyHeight, + UINT istepIfAniCur, + HBRUSH hbrFlickerFreeDraw, + UINT diFlags, + DWORD Unknown0, + DWORD Unknown1) +{ + PCURICON_OBJECT pIcon; + BOOL Ret; + + DPRINT("Enter NtUserDrawIconEx\n"); + UserEnterExclusive(); + + if (!(pIcon = UserGetCurIconObject(hIcon))) + { + DPRINT1("UserGetCurIconObject() failed!\n"); + UserLeave(); + return FALSE; + } + + Ret = UserDrawIconEx(hdc, + xLeft, + yTop, + pIcon, + cxWidth, + cyHeight, + istepIfAniCur, + hbrFlickerFreeDraw, + diFlags); + + UserDereferenceObject(pIcon); + + UserLeave(); + return Ret; } /* Called from NtUserCallOneParam with Routine ONEPARAM_ROUTINE_SHOWCURSOR @@ -1738,7 +1738,7 @@ GDIPOINTER *pgp; int showpointer=0; - if(!(Screen = IntGetScreenDC())) + if (!(Screen = IntGetScreenDC())) { return showpointer; /* No mouse */ } @@ -1752,7 +1752,7 @@ psurfDc = dc->dclevel.pSurface; - if ( !psurfDc ) + if (!psurfDc) { DC_UnlockDc(dc); return showpointer; /* No Mouse */ @@ -1767,7 +1767,7 @@ ppdev = GDIDEV(SurfObj); - if(ppdev == NULL) + if (ppdev == NULL) { DC_UnlockDc(dc); return showpointer; /* No mouse */

15 years, 1 month

[dgorbachev] 42440: Add GetLogicalProcessorInformation() and a stub for ReOpenFile() by Alwyn Tan's request.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Aug 7 00:53:04 2009 New Revision: 42440 URL: http://svn.reactos.org/svn/reactos?rev=42440&view=rev Log: Add GetLogicalProcessorInformation() and a stub for ReOpenFile() by Alwyn Tan's request. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -400,6 +400,7 @@ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives() +@ stdcall GetLogicalProcessorInformation(ptr ptr) @ stdcall GetLongPathNameA (str long long) @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @@ -710,6 +711,7 @@ @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) +@ stub ReOpenFile ;@ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stdcall ReadConsoleInputExA(long ptr long ptr long) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -994,15 +994,6 @@ BOOL WINAPI -GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, - IN OUT PDWORD ReturnLength) -{ - STUB; - return FALSE; -} - -BOOL -WINAPI GetNumaAvailableMemoryNode(IN UCHAR Node, OUT PULONGLONG AvailableBytes) { Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c [iso-8859-1] Fri Aug 7 00:53:04 2009 @@ -232,3 +232,39 @@ // GetNativeSystemInfo should return PROCESSOR_ARCHITECTURE_AMD64 GetSystemInfo(lpSystemInfo); } + +/* + * @implemented + */ +BOOL +WINAPI +GetLogicalProcessorInformation(OUT PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, + IN OUT PDWORD ReturnLength) +{ + NTSTATUS Status; + + if (!ReturnLength) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = NtQuerySystemInformation(SystemLogicalProcessorInformation, + Buffer, + *ReturnLength, + ReturnLength); + + if (!NT_SUCCESS(Status)) + { + /* + * When NtQuerySystemInformation says STATUS_INFO_LENGTH_MISMATCH, + * return ERROR_INSUFFICIENT_BUFFER instead of ERROR_BAD_LENGTH. + */ + SetLastErrorByStatus(Status == STATUS_INFO_LENGTH_MISMATCH + ? STATUS_BUFFER_TOO_SMALL + : Status); + return FALSE; + } + + return TRUE; +}

15 years, 1 month

[janderwald] 42439: - Add a few parameters check - Calculate resource list size with FIELD_OFFSET macro - Fix a big bug in IResourceList_fnAddEntryFromParent which didnt copy the untranslated resource list entry

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 6 23:45:10 2009 New Revision: 42439 URL: http://svn.reactos.org/svn/reactos?rev=42439&view=rev Log: - Add a few parameters check - Calculate resource list size with FIELD_OFFSET macro - Fix a big bug in IResourceList_fnAddEntryFromParent which didnt copy the untranslated resource list entry Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Thu Aug 6 23:45:10 2009 @@ -22,6 +22,7 @@ POOL_TYPE PoolType; PCM_RESOURCE_LIST TranslatedResourceList; PCM_RESOURCE_LIST UntranslatedResourceList; + ULONG NumberOfEntries; } IResourceListImpl; /* @@ -100,7 +101,7 @@ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - return This->TranslatedResourceList->List[0].PartialResourceList.Count; + return This->NumberOfEntries; } ULONG @@ -114,6 +115,12 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!This->TranslatedResourceList) + { + /* no resource list */ + return 0; + } /* I guess the translated and untranslated lists will be same length? */ for (Index = 0; Index < This->TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) @@ -143,6 +150,12 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!This->TranslatedResourceList) + { + /* no resource list */ + return NULL; + } for (DescIndex = 0; DescIndex < This->TranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) { @@ -175,6 +188,12 @@ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + if (!This->UntranslatedResourceList) + { + /* no resource list */ + return NULL; + } + for (DescIndex = 0; DescIndex < This->UntranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) { PartialDescriptor = &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[DescIndex]; @@ -200,17 +219,29 @@ IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated) { PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; - ULONG NewTranslatedSize, NewUntranslatedSize; - IResourceListImpl * This = (IResourceListImpl*)iface; - - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ULONG NewTranslatedSize, NewUntranslatedSize, TranslatedSize, UntranslatedSize, ResourceCount; + IResourceListImpl * This = (IResourceListImpl*)iface; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + /* calculate translated resource list size */ + ResourceCount = This->TranslatedResourceList->List[0].PartialResourceList.Count; + NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); + TranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + NewTranslatedResources = AllocateItem(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); if (!NewTranslatedResources) return STATUS_INSUFFICIENT_RESOURCES; - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + This->UntranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + /* calculate untranslated resouce list size */ + ResourceCount = This->UntranslatedResourceList->List[0].PartialResourceList.Count; + NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount+1]); + UntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + + /* allocate untranslated resource list size */ NewUntranslatedResources = AllocateItem(This->PoolType, NewUntranslatedSize, TAG_PORTCLASS); if (!NewUntranslatedResources) { @@ -218,34 +249,28 @@ return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - - RtlCopyMemory(NewUntranslatedResources, This->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->UntranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->UntranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->UntranslatedResourceList[0].List->PartialResourceList.Count], Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* now copy translated resource list */ + RtlMoveMemory(NewTranslatedResources, This->TranslatedResourceList, TranslatedSize); + RtlMoveMemory((PUCHAR)NewTranslatedResources + TranslatedSize, Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + /* now copy untranslated resource list */ + RtlMoveMemory(NewUntranslatedResources, This->UntranslatedResourceList, UntranslatedSize); + RtlMoveMemory((PUCHAR)NewUntranslatedResources + UntranslatedSize, Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + /* free old lists */ FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); FreeItem(This->UntranslatedResourceList, TAG_PORTCLASS); + /* store new lists */ This->UntranslatedResourceList = NewUntranslatedResources; This->TranslatedResourceList = NewTranslatedResources; + /* increment descriptor count */ NewUntranslatedResources->List[0].PartialResourceList.Count++; NewTranslatedResources->List[0].PartialResourceList.Count++; + + /* add entry count */ + This->NumberOfEntries++; return STATUS_SUCCESS; } @@ -258,37 +283,21 @@ IN CM_RESOURCE_TYPE Type, IN ULONG Index) { - PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated; - PCM_RESOURCE_LIST NewTranslatedResources; - ULONG NewTranslatedSize; - IResourceListImpl * This = (IResourceListImpl*)iface; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, Untranslated; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); Translated = Parent->lpVtbl->FindTranslatedEntry(Parent, Type, Index); - if (!Translated) - return STATUS_INVALID_PARAMETER; - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - NewTranslatedResources = AllocateItem(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); - if (!NewTranslatedResources) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST)); - if (This->TranslatedResourceList[0].List->PartialResourceList.Count > 1) - { - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[0], - &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[0], - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * This->TranslatedResourceList->List[0].PartialResourceList.Count); - } - - RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - - FreeItem(This->TranslatedResourceList, TAG_PORTCLASS); - This->TranslatedResourceList = NewTranslatedResources; - NewTranslatedResources->List[0].PartialResourceList.Count++; - - return STATUS_SUCCESS; + Untranslated = Parent->lpVtbl->FindUntranslatedEntry(Parent, Type, Index); + + if (Translated && Untranslated) + { + /* add entry from parent */ + return iface->lpVtbl->AddEntry(iface, Translated, Untranslated); + } + + /* entry not found */ + return STATUS_INVALID_PARAMETER; } PCM_RESOURCE_LIST @@ -399,6 +408,9 @@ ResourceCount = TranslatedResourceList->List[0].PartialResourceList.Count; NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + /* store resource count */ + NewList->NumberOfEntries = ResourceCount; + /* calculate untranslated resouce list size */ ResourceCount = UntranslatedResourceList->List[0].PartialResourceList.Count; NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]);

15 years, 1 month

[janderwald] 42438: - Check if translated / untranslated resource list is empty - If both are empty, create an empty resource list - May fix a crash with Yamaha XG Pci

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 6 22:44:53 2009 New Revision: 42438 URL: http://svn.reactos.org/svn/reactos?rev=42438&view=rev Log: - Check if translated / untranslated resource list is empty - If both are empty, create an empty resource list - May fix a crash with Yamaha XG Pci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Thu Aug 6 22:44:53 2009 @@ -351,13 +351,31 @@ IN PCM_RESOURCE_LIST UntranslatedResourceList) { PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; - ULONG NewTranslatedSize, NewUntranslatedSize; + ULONG NewTranslatedSize, NewUntranslatedSize, ResourceCount; IResourceListImpl* NewList; - /* TODO: Validate parameters */ - + if (!TranslatedResourceList) + { + /* if the untranslated resource list is also not provided, it becomes an empty resource list */ + if (UntranslatedResourceList) + { + /* invalid parameter mix */ + return STATUS_INVALID_PARAMETER; + } + } + else + { + /* if the translated resource list is also not provided, it becomes an empty resource list */ + if (!UntranslatedResourceList) + { + /* invalid parameter mix */ + return STATUS_INVALID_PARAMETER; + } + } + + /* allocate resource list ctx */ NewList = AllocateItem(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS); - + /* check for success */ if (!NewList) { DPRINT("AllocateItem failed\n"); @@ -365,39 +383,50 @@ } /* Initialize */ - - NewTranslatedSize = sizeof(CM_RESOURCE_LIST); - if (TranslatedResourceList[0].List->PartialResourceList.Count > 1) - NewTranslatedSize += (TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - - NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS); - if (!NewTranslatedResources) - { - FreeItem(NewList, TAG_PORTCLASS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewUntranslatedSize = sizeof(CM_RESOURCE_LIST); - if (UntranslatedResourceList[0].List->PartialResourceList.Count > 1) - NewUntranslatedSize += (UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - - NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS); - if (!NewUntranslatedResources) - { - FreeItem(NewList, TAG_PORTCLASS); - FreeItem(NewTranslatedResources, TAG_PORTCLASS); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize); - RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize); - NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; NewList->ref = 1; NewList->OuterUnknown = OuterUnknown; + NewList->PoolType = PoolType; + + if (!TranslatedResourceList || !UntranslatedResourceList) + { + /* empty resource list */ + *OutResourceList = (IResourceList*)&NewList->lpVtbl; + return STATUS_SUCCESS; + } + + /* calculate translated resource list size */ + ResourceCount = TranslatedResourceList->List[0].PartialResourceList.Count; + NewTranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + /* calculate untranslated resouce list size */ + ResourceCount = UntranslatedResourceList->List[0].PartialResourceList.Count; + NewUntranslatedSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.PartialDescriptors[ResourceCount]); + + /* allocate translated resource list */ + NewTranslatedResources = AllocateItem(PoolType, NewTranslatedSize, TAG_PORTCLASS); + if (!NewTranslatedResources) + { + FreeItem(NewList, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate untranslated resource list */ + NewUntranslatedResources = AllocateItem(PoolType, NewUntranslatedSize, TAG_PORTCLASS); + if (!NewUntranslatedResources) + { + FreeItem(NewList, TAG_PORTCLASS); + FreeItem(NewTranslatedResources, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy resource lists */ + RtlCopyMemory(NewTranslatedResources, TranslatedResourceList, NewTranslatedSize); + RtlCopyMemory(NewUntranslatedResources, UntranslatedResourceList, NewUntranslatedSize); + + /* store resource lists */ NewList->TranslatedResourceList= NewTranslatedResources; NewList->UntranslatedResourceList = NewUntranslatedResources; - NewList->PoolType = PoolType; /* Increment our usage count and set the pointer to this object */ *OutResourceList = (IResourceList*)&NewList->lpVtbl; @@ -405,7 +434,9 @@ return STATUS_SUCCESS; } -PORTCLASSAPI NTSTATUS NTAPI +PORTCLASSAPI +NTSTATUS +NTAPI PcNewResourceSublist( OUT PRESOURCELIST* OutResourceList, IN PUNKNOWN OuterUnknown OPTIONAL,

15 years, 1 month

[fireball] 42437: - Remove unneeded and wrong LPtoDP translation in kernelmode graphics engine.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 6 22:29:46 2009 New Revision: 42437 URL: http://svn.reactos.org/svn/reactos?rev=42437&view=rev Log: - Remove unneeded and wrong LPtoDP translation in kernelmode graphics engine. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Aug 6 22:29:46 2009 @@ -166,8 +166,6 @@ DestRect.top = YDest; DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - // FIXME: LP->DP missing! - //IntLPtoDP(pDest, (LPPOINT)&DestRect, 2); DestRect.left += pDest->rcVport.left + pDest->rcDcRect.left; DestRect.top += pDest->rcVport.top + pDest->rcDcRect.top; @@ -316,7 +314,6 @@ DestRect.top = YOriginDest; DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; - IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); // FIXME: Why? DestRect.left += DCDest->rcVport.left + DCDest->rcDcRect.left; DestRect.top += DCDest->rcVport.top + DCDest->rcDcRect.top; @@ -330,8 +327,6 @@ if (UsesSource) { - IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); - SourceRect.left += DCSrc->rcVport.left + DCSrc->rcDcRect.left; SourceRect.top += DCSrc->rcVport.top + DCSrc->rcDcRect.top; SourceRect.right += DCSrc->rcVport.left + DCSrc->rcDcRect.left;

15 years, 1 month

[fireball] 42436: - Translate coordinates (logical to device) for blitting operations in usermode. - Implement ScrollDC (almost fully based on winex11's implementation). Work in progress.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 6 22:28:46 2009 New Revision: 42436 URL: http://svn.reactos.org/svn/reactos?rev=42436&view=rev Log: - Translate coordinates (logical to device) for blitting operations in usermode. - Implement ScrollDC (almost fully based on winex11's implementation). Work in progress. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Aug 6 22:28:46 2009 @@ -44,6 +44,30 @@ INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) { + POINT pts[2]; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + width; + pts[1].y = ySrc + height; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + LPtoDP(physDevDst->hUserDC, pts, 1); + xDst = pts[0].x; + yDst = pts[0].y; + return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); } @@ -357,6 +381,20 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) { + POINT pts[2]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); } @@ -667,6 +705,34 @@ NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { + POINT pts[2]; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Aug 6 22:28:46 2009 @@ -559,11 +559,142 @@ ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } -BOOL CDECL RosDrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, - HRGN hrgn, LPRECT update ) -{ - UNIMPLEMENTED; - return FALSE; +/* + * Scroll windows and DCs + * + * Copyright 1993 David W. Metcalfe + * Copyright 1995, 1996 Alex Korobka + * Copyright 2001 Alexandre Julliard + */ +BOOL CDECL RosDrv_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll, + const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate ) +{ + RECT rcSrc, rcClip, offset; + INT dxdev, dydev, res; + HRGN DstRgn, clipRgn, visrgn; + //INT code = X11DRV_START_EXPOSURES; + + TRACE("dx,dy %d,%d rcScroll %s rcClip %s hrgnUpdate %p lprcUpdate %p\n", + dx, dy, wine_dbgstr_rect(lprcScroll), wine_dbgstr_rect(lprcClip), + hrgnUpdate, lprcUpdate); + /* enable X-exposure events */ + //if (hrgnUpdate || lprcUpdate) + // ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + /* get the visible region */ + visrgn=CreateRectRgn( 0, 0, 0, 0); + GetRandomRgn( hdc, visrgn, SYSRGN); + if( !(GetVersion() & 0x80000000)) { + /* Window NT/2k/XP */ + POINT org; + GetDCOrgEx(hdc, &org); + OffsetRgn( visrgn, -org.x, -org.y); + } + /* intersect with the clipping Region if the DC has one */ + clipRgn = CreateRectRgn( 0, 0, 0, 0); + if (GetClipRgn( hdc, clipRgn) != 1) { + DeleteObject(clipRgn); + clipRgn=NULL; + } else + CombineRgn( visrgn, visrgn, clipRgn, RGN_AND); + /* only those pixels in the scroll rectangle that remain in the clipping + * rect are scrolled. */ + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); + rcSrc = rcClip; + OffsetRect( &rcClip, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + /* if an scroll rectangle is specified, only the pixels within that + * rectangle are scrolled */ + if( lprcScroll) + IntersectRect( &rcSrc, &rcSrc, lprcScroll); + /* now convert to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcSrc, 2); + TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); + /* also dx and dy */ + SetRect(&offset, 0, 0, dx, dy); + LPtoDP(hdc, (LPPOINT)&offset, 2); + dxdev = offset.right - offset.left; + dydev = offset.bottom - offset.top; + /* now intersect with the visible region to get the pixels that will + * actually scroll */ + DstRgn = CreateRectRgnIndirect( &rcSrc); + res = CombineRgn( DstRgn, DstRgn, visrgn, RGN_AND); + /* and translate, giving the destination region */ + OffsetRgn( DstRgn, dxdev, dydev); + //if( TRACE_ON( scroll)) dump_region( "Destination scroll region: ", DstRgn); + /* if there are any, do it */ + if( res > NULLREGION) { + RECT rect ; + /* clip to the destination region, so we can BitBlt with a simple + * bounding rectangle */ + if( clipRgn) + ExtSelectClipRgn( hdc, DstRgn, RGN_AND); + else + SelectClipRgn( hdc, DstRgn); + GetRgnBox( DstRgn, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); + + BitBlt( hdc, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + hdc, rect.left - dx, rect.top - dy, SRCCOPY); + } + /* compute the update areas. This is the combined clip rectangle + * minus the scrolled region, and intersected with the visible + * region. */ + if (hrgnUpdate || lprcUpdate) + { + HRGN hrgn = hrgnUpdate; + HRGN ExpRgn = 0; + + /* collect all the exposures */ + //code = X11DRV_END_EXPOSURES; + //ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, + // sizeof(ExpRgn), (LPSTR)&ExpRgn ); + /* Intersect clip and scroll rectangles, allowing NULL values */ + if( lprcScroll) + if( lprcClip) + IntersectRect( &rcClip, lprcClip, lprcScroll); + else + rcClip = *lprcScroll; + else + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); + /* Convert the combined clip rectangle to device coordinates */ + LPtoDP(hdc, (LPPOINT)&rcClip, 2); + if( hrgn ) + SetRectRgn( hrgn, rcClip.left, rcClip.top, rcClip.right, + rcClip.bottom); + else + hrgn = CreateRectRgnIndirect( &rcClip); + CombineRgn( hrgn, hrgn, visrgn, RGN_AND); + CombineRgn( hrgn, hrgn, DstRgn, RGN_DIFF); + /* add the exposures to this */ + if( ExpRgn) { + //if( TRACE_ON( scroll)) dump_region( "Expose region: ", ExpRgn); + CombineRgn( hrgn, hrgn, ExpRgn, RGN_OR); + DeleteObject( ExpRgn); + } + //if( TRACE_ON( scroll)) dump_region( "Update region: ", hrgn); + if( lprcUpdate) { + GetRgnBox( hrgn, lprcUpdate ); + /* Put the lprcUpdate in logical coordinates */ + DPtoLP( hdc, (LPPOINT)lprcUpdate, 2 ); + TRACE("returning lprcUpdate %s\n", wine_dbgstr_rect(lprcUpdate)); + } + if( !hrgnUpdate) + DeleteObject( hrgn); + } + /* restore original clipping region */ + SelectClipRgn( hdc, clipRgn); + DeleteObject( visrgn); + DeleteObject( DstRgn); + if( clipRgn) DeleteObject( clipRgn); + return TRUE; } void CDECL RosDrv_SetCapture( HWND hwnd, UINT flags )

15 years, 1 month

← Newer
1
...
51
52
53
54
55
56
57
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009