Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33896: add dummy test for dciman32 for now, real test will come later
by greatlrd＠svn.reactos.org 08 Jun '08

08 Jun '08

Author: greatlrd Date: Sun Jun 8 03:29:04 2008 New Revision: 33896 URL: http://svn.reactos.org/svn/reactos?rev=33896&view=rev Log: add dummy test for dciman32 for now, real test will come later Added: trunk/rostests/apitests/dciman32api/ trunk/rostests/apitests/dciman32api/dciman32api.c (with props) trunk/rostests/apitests/dciman32api/dciman32api.h (with props) trunk/rostests/apitests/dciman32api/dciman32api.rbuild (with props) trunk/rostests/apitests/dciman32api/testlist.c (with props) trunk/rostests/apitests/dciman32api/tests/ trunk/rostests/apitests/dciman32api/tests/DCICreatePrimary.c (with props) Modified: trunk/rostests/apitests/directory.rbuild Added: trunk/rostests/apitests/dciman32api/dciman32api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32api/dcim… ============================================================================== --- trunk/rostests/apitests/dciman32api/dciman32api.c (added) +++ trunk/rostests/apitests/dciman32api/dciman32api.c [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -1,0 +1,19 @@ +#include "dciman32api.h" + +HINSTANCE g_hInstance; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int APIENTRY +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + g_hInstance = hInstance; + return TestMain(L"dciman32api", L"dciman32.dll"); +} Propchange: trunk/rostests/apitests/dciman32api/dciman32api.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32api/dciman32api.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32api/dcim… ============================================================================== --- trunk/rostests/apitests/dciman32api/dciman32api.h (added) +++ trunk/rostests/apitests/dciman32api/dciman32api.h [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -1,0 +1,22 @@ +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0501 +#endif + +#define WIN32_NO_STATUS +#include <windows.h> +#include <windows.h> +#include <ndk/ntndk.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <prntfont.h> + +/* Public Win32K Headers */ +#include <win32k/ntgdityp.h> +#include <ntgdi.h> +#include <win32k/ntgdihdl.h> + +#include "../apitest.h" + + + Propchange: trunk/rostests/apitests/dciman32api/dciman32api.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32api/dciman32api.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32api/dcim… ============================================================================== --- trunk/rostests/apitests/dciman32api/dciman32api.rbuild (added) +++ trunk/rostests/apitests/dciman32api/dciman32api.rbuild [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -1,0 +1,12 @@ +<module name="dciman32api" type="win32cui"> + <include base="dciman32api">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>shell32</library> + <file>dciman32api.c</file> + <file>testlist.c</file> +</module> Propchange: trunk/rostests/apitests/dciman32api/dciman32api.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32api/test… ============================================================================== --- trunk/rostests/apitests/dciman32api/testlist.c (added) +++ trunk/rostests/apitests/dciman32api/testlist.c [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -1,0 +1,32 @@ +#ifndef _DCIMAN32TESTLIST_H +#define _DCIMAN32TESTLIST_H + +#include "dciman32api.h" + +/* include the tests */ +#include "tests/DCICreatePrimary.c" + + + + + + + + + + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"DCICreatePrimary", Test_DCICreatePrimary } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return sizeof(TestList) / sizeof(TESTENTRY); +} + +#endif + +/* EOF */ Propchange: trunk/rostests/apitests/dciman32api/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32api/tests/DCICreatePrimary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32api/test… ============================================================================== --- trunk/rostests/apitests/dciman32api/tests/DCICreatePrimary.c (added) +++ trunk/rostests/apitests/dciman32api/tests/DCICreatePrimary.c [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -1,0 +1,8 @@ + +INT +Test_DCICreatePrimary(PTESTINFO pti) +{ + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/dciman32api/tests/DCICreatePrimary.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Sun Jun 8 03:29:04 2008 @@ -7,6 +7,10 @@ <define name="_WIN32_WINNT">0x0501</define> <file>apitest.c</file> </module> + + <directory name="dciman32api"> + <xi:include href="dciman32api/dciman32api.rbuild" /> + </directory> <directory name="gdi32api"> <xi:include href="gdi32api/gdi32api.rbuild" />

1 0

[fireball] 33895: - Magnus: Reformat clip.c source code to better match overall coding style. No code logic change.
by fireball＠svn.reactos.org 08 Jun '08

08 Jun '08

Author: fireball Date: Sun Jun 8 02:31:10 2008 New Revision: 33895 URL: http://svn.reactos.org/svn/reactos?rev=33895&view=rev Log: - Magnus: Reformat clip.c source code to better match overall coding style. No code logic change. Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] Sun Jun 8 02:31:10 2008 @@ -33,231 +33,239 @@ #include <debug.h> static __inline int -CompareRightDown(const PRECT r1, const PRECT r2) -{ - int Cmp; - - if (r1->top < r2->top) - { - Cmp = -1; - } - else if (r2->top < r1->top) - { - Cmp = +1; - } - else - { - ASSERT(r1->bottom == r2->bottom); - if (r1->left < r2->left) - { - Cmp = -1; - } - else if (r2->left < r1->left) - { - Cmp = +1; - } - else - { - ASSERT(r1->right == r2->right); - Cmp = 0; - } - } - - return Cmp; +CompareRightDown( + const PRECT r1, + const PRECT r2) +{ + int Cmp; + + if (r1->top < r2->top) + { + Cmp = -1; + } + else if (r2->top < r1->top) + { + Cmp = +1; + } + else + { + ASSERT(r1->bottom == r2->bottom); + if (r1->left < r2->left) + { + Cmp = -1; + } + else if (r2->left < r1->left) + { + Cmp = +1; + } + else + { + ASSERT(r1->right == r2->right); + Cmp = 0; + } + } + + return Cmp; } static __inline int -CompareRightUp(const PRECT r1, const PRECT r2) -{ - int Cmp; - - if (r1->bottom < r2->bottom) - { - Cmp = +1; - } - else if (r2->bottom < r1->bottom) - { - Cmp = -1; - } - else - { - ASSERT(r1->top == r2->top); - if (r1->left < r2->left) - { - Cmp = -1; - } - else if (r2->left < r1->left) - { - Cmp = +1; - } - else - { - ASSERT(r1->right == r2->right); - Cmp = 0; - } - } - - return Cmp; +CompareRightUp( + const PRECT r1, + const PRECT r2) +{ + int Cmp; + + if (r1->bottom < r2->bottom) + { + Cmp = +1; + } + else if (r2->bottom < r1->bottom) + { + Cmp = -1; + } + else + { + ASSERT(r1->top == r2->top); + if (r1->left < r2->left) + { + Cmp = -1; + } + else if (r2->left < r1->left) + { + Cmp = +1; + } + else + { + ASSERT(r1->right == r2->right); + Cmp = 0; + } + } + + return Cmp; } static __inline int -CompareLeftDown(const PRECT r1, const PRECT r2) -{ - int Cmp; - - if (r1->top < r2->top) - { - Cmp = -1; - } - else if (r2->top < r1->top) - { - Cmp = +1; - } - else - { - ASSERT(r1->bottom == r2->bottom); - if (r1->right < r2->right) - { - Cmp = +1; - } - else if (r2->right < r1->right) - { - Cmp = -1; - } - else - { - ASSERT(r1->left == r2->left); - Cmp = 0; - } - } - - return Cmp; +CompareLeftDown( + const PRECT r1, + const PRECT r2) +{ + int Cmp; + + if (r1->top < r2->top) + { + Cmp = -1; + } + else if (r2->top < r1->top) + { + Cmp = +1; + } + else + { + ASSERT(r1->bottom == r2->bottom); + if (r1->right < r2->right) + { + Cmp = +1; + } + else if (r2->right < r1->right) + { + Cmp = -1; + } + else + { + ASSERT(r1->left == r2->left); + Cmp = 0; + } + } + + return Cmp; } static __inline int -CompareLeftUp(const PRECT r1, const PRECT r2) -{ - int Cmp; - - if (r1->bottom < r2->bottom) - { - Cmp = +1; - } - else if (r2->bottom < r1->bottom) - { - Cmp = -1; - } - else - { - ASSERT(r1->top == r2->top); - if (r1->right < r2->right) - { - Cmp = +1; - } - else if (r2->right < r1->right) - { - Cmp = -1; - } - else - { - ASSERT(r1->left == r2->left); - Cmp = 0; - } - } - - return Cmp; +CompareLeftUp( + const PRECT r1, + const PRECT r2) +{ + int Cmp; + + if (r1->bottom < r2->bottom) + { + Cmp = +1; + } + else if (r2->bottom < r1->bottom) + { + Cmp = -1; + } + else + { + ASSERT(r1->top == r2->top); + if (r1->right < r2->right) + { + Cmp = +1; + } + else if (r2->right < r1->right) + { + Cmp = -1; + } + else + { + ASSERT(r1->left == r2->left); + Cmp = 0; + } + } + return Cmp; } static __inline int -CompareSpans(const PSPAN Span1, const PSPAN Span2) -{ - int Cmp; - - if (Span1->Y < Span2->Y) - { - Cmp = -1; - } - else if (Span2->Y < Span1->Y) - { - Cmp = +1; - } - else - { - if (Span1->X < Span2->X) - { - Cmp = -1; - } - else if (Span2->X < Span1->X) - { - Cmp = +1; - } - else - { - Cmp = 0; - } - } - - return Cmp; +CompareSpans( + const PSPAN Span1, + const PSPAN Span2) +{ + int Cmp; + + if (Span1->Y < Span2->Y) + { + Cmp = -1; + } + else if (Span2->Y < Span1->Y) + { + Cmp = +1; + } + else + { + if (Span1->X < Span2->X) + { + Cmp = -1; + } + else if (Span2->X < Span1->X) + { + Cmp = +1; + } + else + { + Cmp = 0; + } + } + + return Cmp; } VOID FASTCALL IntEngDeleteClipRegion(CLIPOBJ *ClipObj) { - EngFreeMem(ObjToGDI(ClipObj, CLIP)); + EngFreeMem(ObjToGDI(ClipObj, CLIP)); } CLIPOBJ* FASTCALL IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) { - CLIPGDI *Clip; - - if(count > 1) - { - RECTL *dest; - - Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), TAG_CLIPOBJ); - - if(Clip != NULL) - { - Clip->EnumRects.c = count; - Clip->EnumOrder = CD_ANY; - for(dest = Clip->EnumRects.arcl; - count > 0; - count--, dest++, pRect++) - { - *dest = *pRect; - } - - Clip->ClipObj.iDComplexity = DC_COMPLEX; - Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; - - return GDIToObj(Clip, CLIP); - } - } - else - { - Clip = EngAllocMem(0, sizeof(CLIPGDI), TAG_CLIPOBJ); - - if(Clip != NULL) - { - Clip->EnumRects.c = 1; - Clip->EnumOrder = CD_ANY; - Clip->EnumRects.arcl[0] = *rcBounds; - - Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && - (rcBounds->left == rcBounds->right)) - ? DC_TRIVIAL : DC_RECT); - Clip->ClipObj.iFComplexity = FC_RECT; - Clip->ClipObj.iMode = TC_RECTANGLES; - Clip->ClipObj.rclBounds = *rcBounds; - - return GDIToObj(Clip, CLIP); - } - } - - return NULL; + CLIPGDI *Clip; + + if(count > 1) + { + RECTL *dest; + + Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), TAG_CLIPOBJ); + + if(Clip != NULL) + { + Clip->EnumRects.c = count; + Clip->EnumOrder = CD_ANY; + for(dest = Clip->EnumRects.arcl;count > 0; count--, dest++, pRect++) + { + *dest = *pRect; + } + + Clip->ClipObj.iDComplexity = DC_COMPLEX; + Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); + Clip->ClipObj.iMode = TC_RECTANGLES; + Clip->ClipObj.rclBounds = *rcBounds; + + return GDIToObj(Clip, CLIP); + } + } + else + { + Clip = EngAllocMem(0, sizeof(CLIPGDI), TAG_CLIPOBJ); + + if(Clip != NULL) + { + Clip->EnumRects.c = 1; + Clip->EnumOrder = CD_ANY; + Clip->EnumRects.arcl[0] = *rcBounds; + + Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && + (rcBounds->left == rcBounds->right)) + ? DC_TRIVIAL : DC_RECT); + + Clip->ClipObj.iFComplexity = FC_RECT; + Clip->ClipObj.iMode = TC_RECTANGLES; + Clip->ClipObj.rclBounds = *rcBounds; + + return GDIToObj(Clip, CLIP); + } + } + + return NULL; } /* @@ -266,13 +274,13 @@ CLIPOBJ * STDCALL EngCreateClip(VOID) { - CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), TAG_CLIPOBJ); - if(Clip != NULL) - { - return GDIToObj(Clip, CLIP); - } - - return NULL; + CLIPGDI *Clip = EngAllocMem(FL_ZERO_MEMORY, sizeof(CLIPGDI), TAG_CLIPOBJ); + if(Clip != NULL) + { + return GDIToObj(Clip, CLIP); + } + + return NULL; } /* @@ -281,196 +289,202 @@ VOID STDCALL EngDeleteClip(CLIPOBJ *ClipRegion) { - EngFreeMem(ObjToGDI(ClipRegion, CLIP)); + EngFreeMem(ObjToGDI(ClipRegion, CLIP)); } /* * @implemented */ ULONG STDCALL -CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj, - IN BOOL ShouldDoAll, - IN ULONG ClipType, - IN ULONG BuildOrder, - IN ULONG MaxRects) -{ - CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); - SORTCOMP CompareFunc; - - ClipGDI->EnumPos = 0; - ClipGDI->EnumMax = (MaxRects > 0) ? MaxRects : ClipGDI->EnumRects.c; - - if (CD_ANY != BuildOrder && ClipGDI->EnumOrder != BuildOrder) - { - switch (BuildOrder) - { - case CD_RIGHTDOWN: - CompareFunc = (SORTCOMP) CompareRightDown; - break; - case CD_RIGHTUP: - CompareFunc = (SORTCOMP) CompareRightUp; - break; - case CD_LEFTDOWN: - CompareFunc = (SORTCOMP) CompareLeftDown; - break; - case CD_LEFTUP: - CompareFunc = (SORTCOMP) CompareLeftUp; - break; - default: - DPRINT1("Invalid BuildOrder %d\n", BuildOrder); - BuildOrder = ClipGDI->EnumOrder; - CompareFunc = NULL; - break; - } - - if (NULL != CompareFunc) - { - EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, - CompareFunc); - } - - ClipGDI->EnumOrder = BuildOrder; - } - - /* Return the number of rectangles enumerated */ - if ((MaxRects > 0) && (ClipGDI->EnumRects.c > MaxRects)) - { - return 0xFFFFFFFF; - } - - return ClipGDI->EnumRects.c; +CLIPOBJ_cEnumStart( + IN CLIPOBJ* ClipObj, + IN BOOL ShouldDoAll, + IN ULONG ClipType, + IN ULONG BuildOrder, + IN ULONG MaxRects) +{ + CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); + SORTCOMP CompareFunc; + + ClipGDI->EnumPos = 0; + ClipGDI->EnumMax = (MaxRects > 0) ? MaxRects : ClipGDI->EnumRects.c; + + if (CD_ANY != BuildOrder && ClipGDI->EnumOrder != BuildOrder) + { + switch (BuildOrder) + { + case CD_RIGHTDOWN: + CompareFunc = (SORTCOMP) CompareRightDown; + break; + + case CD_RIGHTUP: + CompareFunc = (SORTCOMP) CompareRightUp; + break; + + case CD_LEFTDOWN: + CompareFunc = (SORTCOMP) CompareLeftDown; + break; + + case CD_LEFTUP: + CompareFunc = (SORTCOMP) CompareLeftUp; + break; + + default: + DPRINT1("Invalid BuildOrder %d\n", BuildOrder); + BuildOrder = ClipGDI->EnumOrder; + CompareFunc = NULL; + break; + } + + if (NULL != CompareFunc) + { + EngSort((PBYTE) ClipGDI->EnumRects.arcl, sizeof(RECTL), ClipGDI->EnumRects.c, CompareFunc); + } + + ClipGDI->EnumOrder = BuildOrder; + } + + /* Return the number of rectangles enumerated */ + if ((MaxRects > 0) && (ClipGDI->EnumRects.c > MaxRects)) + { + return 0xFFFFFFFF; + } + + return ClipGDI->EnumRects.c; } /* * @implemented */ BOOL STDCALL -CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj, - IN ULONG ObjSize, - OUT ULONG *EnumRects) -{ - RECTL *dest, *src; - CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); - ULONG nCopy, i; - ENUMRECTS* pERects = (ENUMRECTS*)EnumRects; - - //calculate how many rectangles we should copy - nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, - min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, - (ObjSize - sizeof(ULONG)) / sizeof(RECTL))); - if(nCopy == 0) - { - return FALSE; - } - - /* copy rectangles */ - src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; - for(i = 0, dest = pERects->arcl; - i < nCopy; - i++, dest++, src++) - { - *dest = *src; - } - - pERects->c = nCopy; - - ClipGDI->EnumPos+=nCopy; - - return ClipGDI->EnumPos < ClipGDI->EnumRects.c; +CLIPOBJ_bEnum( + IN CLIPOBJ* ClipObj, + IN ULONG ObjSize, + OUT ULONG *EnumRects) +{ + RECTL *dest, *src; + CLIPGDI *ClipGDI = ObjToGDI(ClipObj, CLIP); + ULONG nCopy, i; + ENUMRECTS* pERects = (ENUMRECTS*)EnumRects; + + //calculate how many rectangles we should copy + nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, + min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, + (ObjSize - sizeof(ULONG)) / sizeof(RECTL))); + + if(nCopy == 0) + { + return FALSE; + } + + /* copy rectangles */ + src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; + for(i = 0, dest = pERects->arcl; i < nCopy; i++, dest++, src++) + { + *dest = *src; + } + + pERects->c = nCopy; + + ClipGDI->EnumPos+=nCopy; + + return ClipGDI->EnumPos < ClipGDI->EnumRects.c; } BOOLEAN FASTCALL -ClipobjToSpans(PSPAN *Spans, UINT *Count, CLIPOBJ *ClipRegion, PRECTL Boundary) -{ - BOOL EnumMore; - UINT i, NewCount; - RECT_ENUM RectEnum; - PSPAN NewSpans; - RECTL *Rect; - - ASSERT(Boundary->top <= Boundary->bottom && Boundary->left <= Boundary->right); - - *Spans = NULL; - if (NULL == ClipRegion || DC_TRIVIAL == ClipRegion->iDComplexity) - { - *Count = Boundary->bottom - Boundary->top; - if (0 != *Count) - { - *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), TAG_CLIP); - if (NULL == *Spans) - { - *Count = 0; - return FALSE; - } - for (i = 0; i < Boundary->bottom - Boundary->top; i++) - { - (*Spans)[i].X = Boundary->left; - (*Spans)[i].Y = Boundary->top + i; - (*Spans)[i].Width = Boundary->right - Boundary->left; +ClipobjToSpans( + PSPAN *Spans, + UINT *Count, + CLIPOBJ *ClipRegion, + PRECTL Boundary) +{ + BOOL EnumMore; + UINT i, NewCount; + RECT_ENUM RectEnum; + PSPAN NewSpans; + RECTL *Rect; + + ASSERT(Boundary->top <= Boundary->bottom && Boundary->left <= Boundary->right); + + *Spans = NULL; + if (NULL == ClipRegion || DC_TRIVIAL == ClipRegion->iDComplexity) + { + *Count = Boundary->bottom - Boundary->top; + if (0 != *Count) + { + *Spans = ExAllocatePoolWithTag(PagedPool, *Count * sizeof(SPAN), TAG_CLIP); + if (NULL == *Spans) + { + *Count = 0; + return FALSE; + } + for (i = 0; i < Boundary->bottom - Boundary->top; i++) + { + (*Spans)[i].X = Boundary->left; + (*Spans)[i].Y = Boundary->top + i; + (*Spans)[i].Width = Boundary->right - Boundary->left; } } return TRUE; } - *Count = 0; - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); - do - { - EnumMore = CLIPOBJ_bEnum(ClipRegion, (ULONG) sizeof(RECT_ENUM), (PVOID) &RectEnum); - - NewCount = *Count; - for (i = 0; i < RectEnum.c; i++) - { - NewCount += RectEnum.arcl[i].bottom - RectEnum.arcl[i].top; - } - if (NewCount != *Count) - { - NewSpans = ExAllocatePoolWithTag(PagedPool, NewCount * sizeof(SPAN), TAG_CLIP); - if (NULL == NewSpans) - { - if (NULL != *Spans) + *Count = 0; + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion, (ULONG) sizeof(RECT_ENUM), (PVOID) &RectEnum); + + NewCount = *Count; + for (i = 0; i < RectEnum.c; i++) + { + NewCount += RectEnum.arcl[i].bottom - RectEnum.arcl[i].top; + } + if (NewCount != *Count) + { + NewSpans = ExAllocatePoolWithTag(PagedPool, NewCount * sizeof(SPAN), TAG_CLIP); + if (NULL == NewSpans) + { + if (NULL != *Spans) { - ExFreePool(*Spans); - *Spans = NULL; + ExFreePool(*Spans); + *Spans = NULL; } - *Count = 0; - return FALSE; - } - if (0 != *Count) - { - PSPAN dest, src; - UINT i = *Count; - for(dest = NewSpans, src = *Spans; - i > 0; - i--) - { - *dest++ = *src++; - } - ExFreePool(*Spans); - } - *Spans = NewSpans; - } - for (Rect = RectEnum.arcl; Rect < RectEnum.arcl + RectEnum.c; Rect++) - { - for (i = 0; i < Rect->bottom - Rect->top; i++) - { - (*Spans)[*Count].X = Rect->left; - (*Spans)[*Count].Y = Rect->top + i; - (*Spans)[*Count].Width = Rect->right - Rect->left; - (*Count)++; - } - } - ASSERT(*Count == NewCount); - } - while (EnumMore); - - if (0 != *Count) - { - EngSort((PBYTE) *Spans, sizeof(SPAN), *Count, (SORTCOMP) CompareSpans); - } - - return TRUE; + *Count = 0; + return FALSE; + } + if (0 != *Count) + { + PSPAN dest, src; + UINT i = *Count; + for(dest = NewSpans, src = *Spans;i > 0; i--) + { + *dest++ = *src++; + } + ExFreePool(*Spans); + } + *Spans = NewSpans; + } + for (Rect = RectEnum.arcl; Rect < RectEnum.arcl + RectEnum.c; Rect++) + { + for (i = 0; i < Rect->bottom - Rect->top; i++) + { + (*Spans)[*Count].X = Rect->left; + (*Spans)[*Count].Y = Rect->top + i; + (*Spans)[*Count].Width = Rect->right - Rect->left; + (*Count)++; + } + } + ASSERT(*Count == NewCount); + } + while (EnumMore); + + if (0 != *Count) + { + EngSort((PBYTE) *Spans, sizeof(SPAN), *Count, (SORTCOMP) CompareSpans); + } + + return TRUE; } /* EOF */

1 0

[jimtabor] 33894: Update NtUserInitializeClientPfnArrays add additional structures and types for future support.
by jimtabor＠svn.reactos.org 08 Jun '08

08 Jun '08

Author: jimtabor Date: Sat Jun 7 22:34:25 2008 New Revision: 33894 URL: http://svn.reactos.org/svn/reactos?rev=33894&view=rev Log: Update NtUserInitializeClientPfnArrays add additional structures and types for future support. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Jun 7 22:34:25 2008 @@ -168,6 +168,93 @@ UINT HideFocus : 1; UINT HideAccel : 1; } WINDOW, *PWINDOW; + +typedef struct _PFNCLIENT +{ + PROC pfnScrollBarC; + PROC pfnDefWndC; + PROC pfnMenuC; + PROC pfnDesktopC; + PROC pfnDefWnd1C; + PROC pfnDefWnd2C; + PROC pfnDefWnd3C; + PROC pfnButtomC; + PROC pfnComboBoxC; + PROC pfnComboListBoxC; + PROC pfnDefDlgC; + PROC pfnEditC; + PROC pfnListBoxC; + PROC pfnMDIClientC; + PROC pfnStaticC; + PROC pfnImeC; + PROC pfnHkINLPCWPSTRUCT; + PROC pfnHkINLPCWPRETSTRUCT; + PROC pfnDispatchHookC; + PROC pfnDispatchDefC; +} PFNCLIENT, *PPFNCLIENT; + +typedef struct _PFNCLIENTWORKER +{ + PROC pfnButtonCW; + PROC pfnComboBoxCW; + PROC pfnComboListBoxCW; + PROC pfnDefDlgCW; + PROC pfnEditCW; + PROC pfnListBoxCW; + PROC pfnMDIClientCW; + PROC pfnStaticCW; + PROC pfnImeCW; +} PFNCLIENTWORKER, *PPFNCLIENTWORKER; + + +// FNID's for NtUserSetWindowFNID +#define FNID_SCROLLBAR 0x029A +#define FNID_ICONTITLE 0x029B +#define FNID_MENU 0x029C +#define FNID_DESKTOP 0x029D +#define FNID_SWITCH 0x02A0 +#define FNID_BUTTON 0x02A1 +#define FNID_COMBOBOX 0x02A2 +#define FNID_COMBOLBOX 0x02A3 +#define FNID_DIALOG 0x02A4 +#define FNID_EDIT 0x02A5 +#define FNID_LISTBOX 0x02A6 +#define FNID_MDICLIENT 0x02A7 +#define FNID_STATIC 0x02A8 +#define FNID_IME 0x02A9 +#define FNID_TOOLTIPS 0x02B5 +#define FNID_UNKNOWN 0x02B6 + +#define FNID_DDEML 0x2000 // Registers DDEML +#define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. + // Seen during WM_CREATE on error exit too. + +// ICLS's for NtUserGetClassName FNID to ICLS, NtUserInitializeClientPfnArrays +#define ICLS_BUTTON 0 +#define ICLS_EDIT 1 +#define ICLS_STATIC 2 +#define ICLS_LISTBOX 3 +#define ICLS_SCROLLBAR 4 +#define ICLS_COMBOBOX 5 +#define ICLS_MDICLIENT 6 +#define ICLS_COMBOLBOX 7 +#define ICLS_DDEMLEVENT 8 +#define ICLS_DDEMLMOTHER 9 +#define ICLS_DDEML16BIT 10 +#define ICLS_DDEMLCLIENTA 11 +#define ICLS_DDEMLCLIENTW 12 +#define ICLS_DDEMLSERVERA 13 +#define ICLS_DDEMLSERVERW 14 +#define ICLS_IME 15 +#define ICLS_DESKTOP 16 +#define ICLS_DIALOG 17 +#define ICLS_MENU 18 +#define ICLS_SWITCH 19 +#define ICLS_ICONTITLE 20 +#define ICLS_TOOLTIPS 21 +#define ICLS_UNKNOWN 22 +#define ICLS_NOTUSED 23 +#define ICLS_END 31 #define SRVINFO_METRICS 0x0020 @@ -271,32 +358,6 @@ PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); -// FNID's for NtUserSetWindowFNID -#define FNID_BUTTON 0x02A1 -#define FNID_COMBOBOX 0x02A2 -#define FNID_COMBOLBOX 0x02A3 -#define FNID_DIALOG 0x02A4 -#define FNID_EDIT 0x02A5 -#define FNID_LISTBOX 0x02A6 -#define FNID_MDICLIENT 0x02A7 -#define FNID_STATIC 0x02A8 -#define FNID_IME 0x02A9 - -#define FNID_DDEML 0x2000 // Registers DDEML -#define FNID_DESTROY 0x4000 // This is sent when WM_NCDESTROY or in the support routine. - // Seen during WM_CREATE on error exit too. - -// ICLS's for NtUserGetClassName FNID to ICLS -#define ICLS_BUTTON 0 -#define ICLS_EDIT 1 -#define ICLS_STATIC 2 -#define ICLS_LISTBOX 3 -#define ICLS_COMBOBOX 5 -#define ICLS_MDICLIENT 6 -#define ICLS_COMBOLBOX 7 -#define ICLS_IME 15 -#define ICLS_DIALOG 17 -#define ICLS_END 31 DWORD NTAPI @@ -1557,13 +1618,13 @@ DWORD dwUnknown2, DWORD dwUnknown3); -DWORD +NTSTATUS NTAPI NtUserInitializeClientPfnArrays( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + PPFNCLIENT pfnClientA, + PPFNCLIENT pfnClientW, + PPFNCLIENTWORKER pfnClientWorker, + HINSTANCE hmodUser); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Jun 7 22:34:25 2008 @@ -348,17 +348,17 @@ return 0; } -DWORD +NTSTATUS STDCALL NtUserInitializeClientPfnArrays( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; + PPFNCLIENT pfnClientA, + PPFNCLIENT pfnClientW, + PPFNCLIENTWORKER pfnClientWorker, + HINSTANCE hmodUser) +{ + UNIMPLEMENTED + + return STATUS_UNSUCCESSFUL; } DWORD

1 0

[tkreuzer] 33893: Fix some region leaks: GdiSelectVisRgn copies the region, so the given one it must be deleted afterwards. This code is not perfect ~ as Jim already said, not completed. But it's at least working correctly now. Say welcome to a stable running Firefox 1.5. Also added some DPRINTs on failures.
by tkreuzer＠svn.reactos.org 08 Jun '08

08 Jun '08

Author: tkreuzer Date: Sat Jun 7 19:43:07 2008 New Revision: 33893 URL: http://svn.reactos.org/svn/reactos?rev=33893&view=rev Log: Fix some region leaks: GdiSelectVisRgn copies the region, so the given one it must be deleted afterwards. This code is not perfect ~ as Jim already said, not completed. But it's at least working correctly now. Say welcome to a stable running Firefox 1.5. Also added some DPRINTs on failures. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Sat Jun 7 19:43:07 2008 @@ -72,6 +72,7 @@ DisplayDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, TRUE); if (NULL == DisplayDC) { + DPRINT1("Failed to create DisplayDC\n"); return NULL; } hDC = DisplayDC; @@ -85,11 +86,13 @@ { NtGdiDeleteObjectApp(DisplayDC); } + DPRINT1("Failed to lock hDC\n"); return NULL; } hNewDC = DC_AllocDC(&OrigDC->DriverName); if (NULL == hNewDC) { + DPRINT1("Failed to create hNewDC\n"); DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { @@ -98,6 +101,13 @@ return NULL; } NewDC = DC_LockDc( hNewDC ); + + if(!NewDC) + { + DPRINT1("Failed to lock hNewDC\n"); + NtGdiDeleteObjectApp(hNewDC); + return NULL; + } oDc_Attr = OrigDC->pDc_Attr; if(!oDc_Attr) oDc_Attr = &OrigDC->Dc_Attr; @@ -142,7 +152,11 @@ } hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); - GdiSelectVisRgn(hNewDC, hVisRgn); + if (hVisRgn) + { + GdiSelectVisRgn(hNewDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); + } if (Layout) NtGdiSetLayout( hNewDC, -1, Layout); DC_InitDC(hNewDC); @@ -779,13 +793,16 @@ /* Check for existing DC object */ if ((hNewDC = DC_FindOpenDC(Driver)) != NULL) { - hDC = hNewDC; - return NtGdiCreateCompatibleDC(hDC); + hDC = NtGdiCreateCompatibleDC(hNewDC); + if (!hDC) + DPRINT1("NtGdiCreateCompatibleDC() failed\n"); + return hDC; } /* Allocate a DC object */ if ((hNewDC = DC_AllocDC(Driver)) == NULL) { + DPRINT1("DC_AllocDC() failed\n"); return NULL; } @@ -793,6 +810,7 @@ if ( !NewDC ) { DC_FreeDC( hNewDC ); + DPRINT1("DC_LockDc() failed\n"); return NULL; } @@ -828,7 +846,11 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulHorzRes, ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.ulVertRes); - GdiSelectVisRgn(hNewDC, hVisRgn); + if (hVisRgn) + { + GdiSelectVisRgn(hNewDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); + } /* Initialize the DC state */ DC_InitDC(hNewDC); @@ -1960,7 +1982,12 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, pBmp->SurfObj.sizlBitmap.cx, pBmp->SurfObj.sizlBitmap.cy); BITMAPOBJ_UnlockBitmap(pBmp); - GdiSelectVisRgn(hDC, hVisRgn); + + if (hVisRgn) + { + GdiSelectVisRgn(hDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); + } return hOrgBmp; } @@ -2422,6 +2449,7 @@ Buf = ExAllocatePoolWithTag(PagedPool, Driver->MaximumLength, TAG_DC); if(!Buf) { + DPRINT1("ExAllocatePoolWithTag failed\n"); return NULL; } RtlCopyMemory(Buf, Driver->Buffer, Driver->MaximumLength); @@ -2434,6 +2462,7 @@ { ExFreePool(Buf); } + DPRINT1("GDIOBJ_AllocObjWithHandle failed\n"); return NULL; }

1 0

[ekohl] 33892: Real fix for the broken netapi32.dll.
by ekohl＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: ekohl Date: Sat Jun 7 17:50:55 2008 New Revision: 33892 URL: http://svn.reactos.org/svn/reactos?rev=33892&view=rev Log: Real fix for the broken netapi32.dll. Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sat Jun 7 17:50:55 2008 @@ -260,7 +260,9 @@ LPTSTR pszFullName = NULL; LPTSTR pszComment = NULL; NET_API_STATUS status; +#if 0 DWORD dwIndex; +#endif INT nLength; NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); @@ -297,13 +299,13 @@ #if 0 status = NetUserSetInfo(NULL, pUserData->szUserName, 3, (LPBYTE)pUserInfo, &dwIndex); + if (status != NERR_Success) + { + DebugPrintf(_T("Status: %lu Index: %lu"), status, dwIndex); + } #else status = NERR_Success; #endif - if (status != NERR_Success) - { - DebugPrintf(_T("Status: %lu Index: %lu"), status, dwIndex); - } if (pszFullName) HeapFree(GetProcessHeap(), 0, pszFullName);

1 0

[ekohl] 33891: Fix for broken netapi32.dll.
by ekohl＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: ekohl Date: Sat Jun 7 17:44:15 2008 New Revision: 33891 URL: http://svn.reactos.org/svn/reactos?rev=33891&view=rev Log: Fix for broken netapi32.dll. Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sat Jun 7 17:44:15 2008 @@ -295,7 +295,11 @@ pUserInfo->usri3_comment = pszComment; } +#if 0 status = NetUserSetInfo(NULL, pUserData->szUserName, 3, (LPBYTE)pUserInfo, &dwIndex); +#else + status = NERR_Success; +#endif if (status != NERR_Success) { DebugPrintf(_T("Status: %lu Index: %lu"), status, dwIndex);

1 0

[ekohl] 33890: - Group properties: Display the SID of well-known members. - User properties: Store changes to the general settings.
by ekohl＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: ekohl Date: Sat Jun 7 17:31:24 2008 New Revision: 33890 URL: http://svn.reactos.org/svn/reactos?rev=33890&view=rev Log: - Group properties: Display the SID of well-known members. - User properties: Store changes to the general settings. Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/userprops.c trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/cpl/usrmgr/usrmgr.h trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groupprops.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -8,6 +8,56 @@ */ #include "usrmgr.h" + +typedef struct _GENERAL_GROUP_DATA +{ + TCHAR szGroupName[1]; +} GENERAL_GROUP_DATA, *PGENERAL_GROUP_DATA; + + +static VOID +GetTextSid(PSID pSid, + LPTSTR pTextSid) +{ + PSID_IDENTIFIER_AUTHORITY psia; + DWORD dwSubAuthorities; + DWORD dwSidRev = SID_REVISION; + DWORD dwCounter; + DWORD dwSidSize; + + psia = GetSidIdentifierAuthority(pSid); + + dwSubAuthorities = *GetSidSubAuthorityCount(pSid); + + dwSidSize = wsprintf(pTextSid, TEXT("S-%lu-"), dwSidRev); + + if ((psia->Value[0] != 0) || (psia->Value[1] != 0)) + { + dwSidSize += wsprintf(pTextSid + lstrlen(pTextSid), + TEXT("0x%02hx%02hx%02hx%02hx%02hx%02hx"), + (USHORT)psia->Value[0], + (USHORT)psia->Value[1], + (USHORT)psia->Value[2], + (USHORT)psia->Value[3], + (USHORT)psia->Value[4], + (USHORT)psia->Value[5]); + } + else + { + dwSidSize += wsprintf(pTextSid + lstrlen(pTextSid), + TEXT("%lu"), + (ULONG)(psia->Value[5]) + + (ULONG)(psia->Value[4] << 8) + + (ULONG)(psia->Value[3] << 16) + + (ULONG)(psia->Value[2] << 24)); + } + + for (dwCounter = 0 ; dwCounter < dwSubAuthorities ; dwCounter++) + { + dwSidSize += wsprintf(pTextSid + dwSidSize, TEXT("-%lu"), + *GetSidSubAuthority(pSid, dwCounter)); + } +} static VOID @@ -25,6 +75,8 @@ RECT rect; HIMAGELIST hImgList; HICON hIcon; + TCHAR szGroupName[256]; + hwndLV = GetDlgItem(hwndDlg, IDC_GROUP_GENERAL_MEMBERS); @@ -70,6 +122,21 @@ lvi.iImage = (membersInfo[i].lgrmi1_sidusage == SidTypeGroup || membersInfo[i].lgrmi1_sidusage == SidTypeWellKnownGroup) ? 1 : 0; + if (membersInfo[i].lgrmi1_sidusage == SidTypeWellKnownGroup) + { + TCHAR szSid[256]; + + GetTextSid(membersInfo[i].lgrmi1_sid, szSid); + + wsprintf(szGroupName, + TEXT("%s\\%s (%s)"), + + membersInfo[i].lgrmi1_name, + szSid); + + lvi.pszText = szGroupName; + } + (void)ListView_InsertItem(hwndLV, &lvi); } @@ -118,7 +185,7 @@ } -VOID +BOOL GroupProperties(HWND hwndDlg) { PROPSHEETPAGE psp[1]; @@ -130,7 +197,7 @@ hwndLV = GetDlgItem(hwndDlg, IDC_GROUPS_LIST); nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); if (nItem == -1) - return; + return FALSE; /* Get the new user name */ ListView_GetItemText(hwndLV, @@ -151,5 +218,5 @@ InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, (DLGPROC)GroupGeneralPageProc, szGroupName); - PropertySheet(&psh); -} + return (PropertySheet(&psh) == IDOK); +} Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -50,7 +50,7 @@ AUTOCHECKBOX "User cannot change the password",IDC_USER_GENERAL_CANNOT_CHANGE,7,95,210,10 AUTOCHECKBOX "Password never expires",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 AUTOCHECKBOX "Account is disabled",IDC_USER_GENERAL_DISABLED,7,121,210,10 - AUTOCHECKBOX "Account is locked",IDC_USER_GENERAL_LOCKED,7,134,210,10,WS_DISABLED + AUTOCHECKBOX "Account is locked",IDC_USER_GENERAL_LOCKED,7,134,210,10 END Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -8,6 +8,16 @@ */ #include "usrmgr.h" + +typedef struct _GENERAL_USER_DATA +{ + DWORD dwFlags; + DWORD dwPasswordExpired; + TCHAR szUserName[1]; +} GENERAL_USER_DATA, *PGENERAL_USER_DATA; + +#define VALID_GENERAL_FLAGS (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD | UF_ACCOUNTDISABLE | UF_LOCKOUT) + static VOID @@ -187,48 +197,116 @@ static VOID UpdateUserOptions(HWND hwndDlg, - PUSER_INFO_3 userInfo, + PGENERAL_USER_DATA pUserData, BOOL bInit) { EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_CANNOT_CHANGE), - !userInfo->usri3_password_expired); + !pUserData->dwPasswordExpired); EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_NEVER_EXPIRES), - !userInfo->usri3_password_expired); + !pUserData->dwPasswordExpired); EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_FORCE_CHANGE), - (userInfo->usri3_flags & (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD)) == 0); + (pUserData->dwFlags & (UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD)) == 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_USER_GENERAL_LOCKED), + (pUserData->dwFlags & UF_LOCKOUT) != 0); if (bInit) { CheckDlgButton(hwndDlg, IDC_USER_GENERAL_FORCE_CHANGE, - userInfo->usri3_password_expired ? BST_CHECKED : BST_UNCHECKED); + pUserData->dwPasswordExpired ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_USER_GENERAL_CANNOT_CHANGE, - (userInfo->usri3_flags & UF_PASSWD_CANT_CHANGE) ? BST_CHECKED : BST_UNCHECKED); + (pUserData->dwFlags & UF_PASSWD_CANT_CHANGE) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_USER_GENERAL_NEVER_EXPIRES, - (userInfo->usri3_flags & UF_DONT_EXPIRE_PASSWD) ? BST_CHECKED : BST_UNCHECKED); + (pUserData->dwFlags & UF_DONT_EXPIRE_PASSWD) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_USER_GENERAL_DISABLED, - (userInfo->usri3_flags & UF_ACCOUNTDISABLE) ? BST_CHECKED : BST_UNCHECKED); + (pUserData->dwFlags & UF_ACCOUNTDISABLE) ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USER_GENERAL_LOCKED, + (pUserData->dwFlags & UF_LOCKOUT) ? BST_CHECKED : BST_UNCHECKED); } } static VOID -GetUserData(HWND hwndDlg, LPTSTR lpUserName, PUSER_INFO_3 *usrInfo) -{ - PUSER_INFO_3 userInfo = NULL; - - SetDlgItemText(hwndDlg, IDC_USER_GENERAL_NAME, lpUserName); - - NetUserGetInfo(NULL, lpUserName, 3, (LPBYTE*)&userInfo); - - SetDlgItemText(hwndDlg, IDC_USER_GENERAL_FULL_NAME, userInfo->usri3_full_name); - SetDlgItemText(hwndDlg, IDC_USER_GENERAL_DESCRIPTION, userInfo->usri3_comment); - - UpdateUserOptions(hwndDlg, userInfo, TRUE); - - *usrInfo = userInfo; +GetGeneralUserData(HWND hwndDlg, + PGENERAL_USER_DATA pUserData) +{ + PUSER_INFO_3 pUserInfo = NULL; + + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_NAME, pUserData->szUserName); + + NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); + + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_FULL_NAME, pUserInfo->usri3_full_name); + SetDlgItemText(hwndDlg, IDC_USER_GENERAL_DESCRIPTION, pUserInfo->usri3_comment); + + pUserData->dwFlags = pUserInfo->usri3_flags; + pUserData->dwPasswordExpired = pUserInfo->usri3_password_expired; + + NetApiBufferFree(pUserInfo); + + UpdateUserOptions(hwndDlg, pUserData, TRUE); +} + + +static BOOL +SetGeneralUserData(HWND hwndDlg, + PGENERAL_USER_DATA pUserData) +{ + PUSER_INFO_3 pUserInfo = NULL; + LPTSTR pszFullName = NULL; + LPTSTR pszComment = NULL; + NET_API_STATUS status; + DWORD dwIndex; + INT nLength; + + NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); + + pUserInfo->usri3_flags = + (pUserData->dwFlags & VALID_GENERAL_FLAGS) | + (pUserInfo->usri3_flags & ~VALID_GENERAL_FLAGS); + + pUserInfo->usri3_password_expired = pUserData->dwPasswordExpired; + + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_GENERAL_FULL_NAME)); + if (nLength == 0) + { + pUserInfo->usri3_full_name = NULL; + } + else + { + pszFullName = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_GENERAL_FULL_NAME, pszFullName, nLength + 1); + pUserInfo->usri3_full_name = pszFullName; + } + + nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_GENERAL_DESCRIPTION)); + if (nLength == 0) + { + pUserInfo->usri3_full_name = NULL; + } + else + { + pszComment = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + GetDlgItemText(hwndDlg, IDC_USER_GENERAL_DESCRIPTION, pszComment, nLength + 1); + pUserInfo->usri3_comment = pszComment; + } + + status = NetUserSetInfo(NULL, pUserData->szUserName, 3, (LPBYTE)pUserInfo, &dwIndex); + if (status != NERR_Success) + { + DebugPrintf(_T("Status: %lu Index: %lu"), status, dwIndex); + } + + if (pszFullName) + HeapFree(GetProcessHeap(), 0, pszFullName); + + NetApiBufferFree(pUserInfo); + + return (status == NERR_Success); } @@ -238,52 +316,72 @@ WPARAM wParam, LPARAM lParam) { - PUSER_INFO_3 userInfo; + PGENERAL_USER_DATA pUserData; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); - userInfo = (PUSER_INFO_3)GetWindowLongPtr(hwndDlg, DWLP_USER); + pUserData= (PGENERAL_USER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - GetUserData(hwndDlg, - (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam, - &userInfo); - SetWindowLongPtr(hwndDlg, DWLP_USER, (INT_PTR)userInfo); + pUserData = (PGENERAL_USER_DATA)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(GENERAL_USER_DATA) + + lstrlen((LPTSTR)((PROPSHEETPAGE *)lParam)->lParam) * sizeof(TCHAR)); + lstrcpy(pUserData->szUserName, (LPTSTR)((PROPSHEETPAGE *)lParam)->lParam); + + GetGeneralUserData(hwndDlg, + pUserData); + + SetWindowLongPtr(hwndDlg, DWLP_USER, (INT_PTR)pUserData); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_USER_GENERAL_FORCE_CHANGE: - userInfo->usri3_password_expired = !userInfo->usri3_password_expired; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + pUserData->dwPasswordExpired = !pUserData->dwPasswordExpired; + UpdateUserOptions(hwndDlg, pUserData, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_USER_GENERAL_CANNOT_CHANGE: - userInfo->usri3_flags ^= UF_PASSWD_CANT_CHANGE; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + pUserData->dwFlags ^= UF_PASSWD_CANT_CHANGE; + UpdateUserOptions(hwndDlg, pUserData, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_USER_GENERAL_NEVER_EXPIRES: - userInfo->usri3_flags ^= UF_DONT_EXPIRE_PASSWD; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + pUserData->dwFlags ^= UF_DONT_EXPIRE_PASSWD; + UpdateUserOptions(hwndDlg, pUserData, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_USER_GENERAL_DISABLED: - userInfo->usri3_flags ^= UF_ACCOUNTDISABLE; + pUserData->dwFlags ^= UF_ACCOUNTDISABLE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_USER_GENERAL_LOCKED: + pUserData->dwFlags ^= UF_LOCKOUT; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } break; + case WM_NOTIFY: + if (((LPPSHNOTIFY)lParam)->hdr.code == PSN_APPLY) + { + SetGeneralUserData(hwndDlg, pUserData); + return TRUE; + } + break; + case WM_DESTROY: - NetApiBufferFree(userInfo); + HeapFree(GetProcessHeap(), 0, pUserData); break; } @@ -304,7 +402,7 @@ } -VOID +BOOL UserProperties(HWND hwndDlg) { PROPSHEETPAGE psp[3]; @@ -316,7 +414,7 @@ hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); if (nItem == -1) - return; + return FALSE; /* Get the new user name */ ListView_GetItemText(hwndLV, @@ -339,5 +437,5 @@ InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, (DLGPROC)UserMembershipPageProc, szUserName); InitPropSheetPage(&psp[2], IDD_USER_PROFILE, (DLGPROC)UserProfilePageProc, szUserName); - PropertySheet(&psh); -} + return (PropertySheet(&psh) == IDOK); +} Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -596,6 +596,46 @@ } +static VOID +UpdateUserProperties(HWND hwndDlg) +{ + TCHAR szUserName[UNLEN]; + INT iItem; + HWND hwndLV; + NET_API_STATUS status; + PUSER_INFO_2 pUserInfo = NULL; + LV_ITEM lvi; + + hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST); + iItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED); + if (iItem == -1) + return; + + /* Get the new user name */ + ListView_GetItemText(hwndLV, + iItem, 0, + szUserName, + UNLEN); + + status = NetUserGetInfo(NULL, szUserName, 2, (LPBYTE*)&pUserInfo); + + memset(&lvi, 0x00, sizeof(lvi)); + lvi.iItem = iItem; + lvi.iSubItem = 0; + lvi.mask = LVIF_IMAGE; + lvi.iImage = (pUserInfo->usri2_flags & UF_ACCOUNTDISABLE) ? 1 : 0; + (void)ListView_SetItem(hwndLV, &lvi); + + ListView_SetItemText(hwndLV, iItem, 1, + pUserInfo->usri2_full_name); + + ListView_SetItemText(hwndLV, iItem, 2, + pUserInfo->usri2_comment); + + NetApiBufferFree(pUserInfo); +} + + INT_PTR CALLBACK UsersPageProc(HWND hwndDlg, UINT uMsg, @@ -646,7 +686,10 @@ break; case IDM_USER_PROPERTIES: - UserProperties(hwndDlg); + if (UserProperties(hwndDlg)) + { + UpdateUserProperties(hwndDlg); + } break; } break; Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.h?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -30,7 +30,7 @@ INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* groupprops.c */ -VOID +BOOL GroupProperties(HWND hwndDlg); /* misc.c */ @@ -43,7 +43,7 @@ LPTSTR lpAccountName); /* userprops.c */ -VOID +BOOL UserProperties(HWND hwndDlg); #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] Sat Jun 7 17:31:24 2008 @@ -7,6 +7,7 @@ <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x609</define> <library>kernel32</library> + <library>advapi32</library> <library>user32</library> <library>gdi32</library> <library>comctl32</library>

1 0

[hpoussin] 33889: Write the complete error message to debug log, instead of partial information
by hpoussin＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: hpoussin Date: Sat Jun 7 15:44:57 2008 New Revision: 33889 URL: http://svn.reactos.org/svn/reactos?rev=33889&view=rev Log: Write the complete error message to debug log, instead of partial information Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Jun 7 15:44:57 2008 @@ -195,8 +195,8 @@ HardErrorMessage->Response = ResponseNotHandled; - DPRINT1("NumberOfParameters = %d\n", HardErrorMessage->NumberOfParameters); - DPRINT1("Status = %lx\n", HardErrorMessage->Status); + DPRINT("NumberOfParameters = %d\n", HardErrorMessage->NumberOfParameters); + DPRINT("Status = %lx\n", HardErrorMessage->Status); // open client process InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); @@ -514,6 +514,7 @@ } // FIXME: We should not use MessageBox !!!! + DPRINT1("%S\n", szxMessageBody); MessageBoxResponse = MessageBoxW(0, szxMessageBody, szxCaptionText, responce|MB_ICONERROR|MB_SYSTEMMODAL|MB_SETFOREGROUND); RtlFreeHeap (RtlGetProcessHeap(), 0, szxMessageBody);

1 0

[greatlrd] 33888: add a missing asseert
by greatlrd＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: greatlrd Date: Sat Jun 7 09:55:59 2008 New Revision: 33888 URL: http://svn.reactos.org/svn/reactos?rev=33888&view=rev Log: add a missing asseert Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jun 7 09:55:59 2008 @@ -958,6 +958,7 @@ BOOL ret = TRUE; ASSERT(BrushObj); + ASSERT(dc); BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); if (BitmapObj == NULL)

1 0

[greatlrd] 33887: Fixed almost all firefox 1.5 crash also sync with trunk thus files
by greatlrd＠svn.reactos.org 07 Jun '08

07 Jun '08

Author: greatlrd Date: Sat Jun 7 09:34:25 2008 New Revision: 33887 URL: http://svn.reactos.org/svn/reactos?rev=33887&view=rev Log: Fixed almost all firefox 1.5 crash also sync with trunk thus files Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -42,13 +42,11 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect, SourceRect; BOOL Status; XLATEOBJ *XlateObj; BLENDOBJ BlendObj; - HPALETTE SourcePalette = 0, DestPalette = 0; BlendObj.BlendFunction = BlendFunc; DCDest = DC_LockDc(hDCDest); @@ -88,14 +86,11 @@ DCSrc = DCDest; } - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; - /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; + XOriginDest += DCDest->ptlDCOrig.x; + YOriginDest += DCDest->ptlDCOrig.y; + XOriginSrc += DCSrc->ptlDCOrig.x; + YOriginSrc += DCSrc->ptlDCOrig.y; DestRect.left = XOriginDest; DestRect.top = YOriginDest; @@ -109,53 +104,43 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; + } + } /* Create the XLATEOBJ. */ - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!!!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; + Status = FALSE; } else { - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - if (BitmapSrc != BitmapDest) - BITMAPOBJ_UnlockBitmap(BitmapSrc); - DC_UnlockDc(DCDest); - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } - } - - /* Perform the alpha blend operation */ - Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, - DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, &BlendObj); + /* Perform the alpha blend operation */ + Status = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, &BlendObj); + } if (XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -186,14 +171,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; + PDC_ATTR Dc_Attr = NULL; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; POINTL SourcePoint, BrushOrigin; - BOOL Status; + BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; GDIBRUSHINST BrushInst; BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL UsesPattern = ROP3_USES_PATTERN(ROP); @@ -240,16 +224,16 @@ DCSrc = NULL; } - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; /* Offset the destination and source by the origin of their DCs. */ - XDest += DCDest->w.DCOrgX; - YDest += DCDest->w.DCOrgY; + XDest += DCDest->ptlDCOrig.x; + YDest += DCDest->ptlDCOrig.y; if (UsesSource) { - XSrc += DCSrc->w.DCOrgX; - YSrc += DCSrc->w.DCOrgY; + XSrc += DCSrc->ptlDCOrig.x; + YSrc += DCSrc->ptlDCOrig.y; } DestRect.left = XDest; @@ -267,12 +251,19 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + goto cleanup; + if (UsesSource) { if (DCSrc->w.hBitmap == DCDest->w.hBitmap) BitmapSrc = BitmapDest; else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + goto cleanup; + } } else { @@ -284,21 +275,8 @@ BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + goto cleanup; } BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); @@ -311,65 +289,25 @@ /* Create the XLATEOBJ. */ if (UsesSource) { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* KB41464 details how to convert between mono and color */ - if (DCDest->w.bitsPerPixel == 1 && DCSrc->w.bitsPerPixel == 1) - { + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + + if (XlateObj == (XLATEOBJ*)-1) + { + DPRINT1("error!\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; - } - else - { - Dc_Attr = DCSrc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCSrc->Dc_Attr; - if (DCDest->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateMonoXlate(0, DestPalette, SourcePalette, Dc_Attr->crBackgroundClr); - } - else if (DCSrc->w.bitsPerPixel == 1) - { - XlateObj = IntEngCreateSrcMonoXlate(DestPalette, Dc_Attr->crBackgroundClr, Dc_Attr->crForegroundClr); - } - else - { - XlateObj = IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - } - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - if(BitmapDest != NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapDest); - } - if(BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - BITMAPOBJ_UnlockBitmap(BitmapSrc); - } - if(BrushObj != NULL) - { - BRUSHOBJ_UnlockBrush(BrushObj); - } - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } + goto cleanup; } } /* Perform the bitblt operation */ - Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, + Status = IntEngBitBlt( BitmapDest ? &BitmapDest->SurfObj : NULL, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP3_TO_ROP4(ROP)); +cleanup: if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); @@ -410,8 +348,8 @@ { PDC DCDest, DCSrc; RECTL rcDest, rcSrc; - BITMAPOBJ *BitmapDest, *BitmapSrc; - XLATEOBJ *XlateObj; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; + XLATEOBJ *XlateObj = NULL; HPALETTE SourcePalette = 0, DestPalette = 0; PPALGDI PalDestGDI, PalSourceGDI; USHORT PalDestMode, PalSrcMode; @@ -454,43 +392,51 @@ } /* Offset positions */ - xDst += DCDest->w.DCOrgX; - yDst += DCDest->w.DCOrgY; - xSrc += DCSrc->w.DCOrgX; - ySrc += DCSrc->w.DCOrgY; - - if(DCDest->DcLevel.hpal) - DestPalette = DCDest->DcLevel.hpal; - - if(DCSrc->DcLevel.hpal) - SourcePalette = DCSrc->DcLevel.hpal; + xDst += DCDest->ptlDCOrig.x; + yDst += DCDest->ptlDCOrig.y; + xSrc += DCSrc->ptlDCOrig.x; + ySrc += DCSrc->ptlDCOrig.y; + + BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (!BitmapDest) + { + goto done; + } + + BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (!BitmapSrc) + { + goto done; + } + + DestPalette = BitmapDest->hDIBPalette; + if (!DestPalette) DestPalette = pPrimarySurface->DevInfo.hpalDefault; + + SourcePalette = BitmapSrc->hDIBPalette; + if (!SourcePalette) SourcePalette = pPrimarySurface->DevInfo.hpalDefault; if(!(PalSourceGDI = PALETTE_LockPalette(SourcePalette))) { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if((DestPalette != SourcePalette) && !(PalDestGDI = PALETTE_LockPalette(DestPalette))) - { - PALETTE_UnlockPalette(PalSourceGDI); - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } + goto done; + } + PalSrcMode = PalSourceGDI->Mode; + PALETTE_UnlockPalette(PalSourceGDI); + if(DestPalette != SourcePalette) { + if (!(PalDestGDI = PALETTE_LockPalette(DestPalette))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + goto done; + } PalDestMode = PalDestGDI->Mode; - PalSrcMode = PalSourceGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } else { - PalDestMode = PalSrcMode = PalSourceGDI->Mode; - } - PALETTE_UnlockPalette(PalSourceGDI); + PalDestMode = PalSrcMode; + } /* Translate Transparent (RGB) Color to the source palette */ if((XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalSrcMode, PAL_RGB, SourcePalette, NULL))) @@ -501,13 +447,6 @@ /* Create the XLATE object to convert colors between source and destination */ XlateObj = (XLATEOBJ*)IntEngCreateXlate(PalDestMode, PalSrcMode, DestPalette, SourcePalette); - - BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); - /* FIXME - BitmapDest can be NULL!!!! Don't assert here! */ - ASSERT(BitmapDest); - BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - /* FIXME - BitmapSrc can be NULL!!!! Don't assert here! */ - ASSERT(BitmapSrc); rcDest.left = xDst; rcDest.top = yDst; @@ -529,9 +468,15 @@ TransparentColor, 0); done: - BITMAPOBJ_UnlockBitmap(BitmapDest); - BITMAPOBJ_UnlockBitmap(BitmapSrc); DC_UnlockDc(DCSrc); + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (BitmapSrc) + { + BITMAPOBJ_UnlockBitmap(BitmapSrc); + } if(hdcDst != hdcSrc) { DC_UnlockDc(DCDest); @@ -791,14 +736,13 @@ { PDC DCDest = NULL; PDC DCSrc = NULL; - PDC_ATTR Dc_Attr = NULL; - BITMAPOBJ *BitmapDest, *BitmapSrc; + PDC_ATTR Dc_Attr; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; RECTL SourceRect; BOOL Status; XLATEOBJ *XlateObj = NULL; - HPALETTE SourcePalette = 0, DestPalette = 0; - PGDIBRUSHOBJ BrushObj; + PGDIBRUSHOBJ BrushObj = NULL; BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); BOOL UsesPattern = ((ROP & 0xF00000) >> 4) != (ROP & 0x0F0000); @@ -852,12 +796,13 @@ } /* Offset the destination and source by the origin of their DCs. */ - XOriginDest += DCDest->w.DCOrgX; - YOriginDest += DCDest->w.DCOrgY; + // FIXME: ptlDCOrig is in device coordinates! + XOriginDest += DCDest->ptlDCOrig.x; + YOriginDest += DCDest->ptlDCOrig.y; if (UsesSource) { - XOriginSrc += DCSrc->w.DCOrgX; - YOriginSrc += DCSrc->w.DCOrgY; + XOriginSrc += DCSrc->ptlDCOrig.x; + YOriginSrc += DCSrc->ptlDCOrig.y; } DestRect.left = XOriginDest; @@ -878,14 +823,7 @@ BitmapSrc = BitmapDest; else BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - } - else - { - BitmapSrc = NULL; - } - - if ( UsesSource ) - { + int sw = BitmapSrc->SurfObj.sizlBitmap.cx; int sh = BitmapSrc->SurfObj.sizlBitmap.cy; if ( SourceRect.left < 0 ) @@ -936,50 +874,36 @@ Status = FALSE; goto failed; } + + /* Create the XLATEOBJ. */ + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + if (XlateObj == (XLATEOBJ*)-1) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = FALSE; + goto failed; + } + } + else + { + BitmapSrc = NULL; } if (UsesPattern) { - Dc_Attr = DCDest->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; + Dc_Attr = DCDest->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; BrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (NULL == BrushObj) { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; + Status = FALSE; + goto failed; } } else { BrushObj = NULL; - } - - /* Create the XLATEOBJ. */ - if (UsesSource) - { - if (DCDest->DcLevel.hpal != 0) - DestPalette = DCDest->DcLevel.hpal; - - if (DCSrc->DcLevel.hpal != 0) - SourcePalette = DCSrc->DcLevel.hpal; - - /* FIXME: Use the same logic for create XLATEOBJ as in NtGdiBitBlt. */ - XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, 0, DestPalette, SourcePalette); - if (NULL == XlateObj) - { - if (UsesSource && hDCSrc != hDCDest) - { - DC_UnlockDc(DCSrc); - } - DC_UnlockDc(DCDest); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return FALSE; - } } /* Perform the bitblt operation */ @@ -988,18 +912,26 @@ &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR); - if (UsesSource) +failed: + if (XlateObj) + { EngDeleteXlate(XlateObj); - if (UsesPattern) + } + if (BrushObj) { BRUSHOBJ_UnlockBrush(BrushObj); } -failed: - if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) + if ( (BitmapSrc) && + (BitmapSrc != BitmapDest)) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } - BITMAPOBJ_UnlockBitmap(BitmapDest); + + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } + if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -1038,30 +970,30 @@ { if (Width > 0) { - DestRect.left = XLeft + dc->w.DCOrgX; - DestRect.right = XLeft + Width + dc->w.DCOrgX; + DestRect.left = XLeft + dc->ptlDCOrig.x; + DestRect.right = XLeft + Width + dc->ptlDCOrig.x; } else { - DestRect.left = XLeft + Width + 1 + dc->w.DCOrgX; - DestRect.right = XLeft + dc->w.DCOrgX + 1; + DestRect.left = XLeft + Width + 1 + dc->ptlDCOrig.x; + DestRect.right = XLeft + dc->ptlDCOrig.x + 1; } if (Height > 0) { - DestRect.top = YLeft + dc->w.DCOrgY; - DestRect.bottom = YLeft + Height + dc->w.DCOrgY; + DestRect.top = YLeft + dc->ptlDCOrig.y; + DestRect.bottom = YLeft + Height + dc->ptlDCOrig.y; } else { - DestRect.top = YLeft + Height + dc->w.DCOrgY + 1; - DestRect.bottom = YLeft + dc->w.DCOrgY + 1; + DestRect.top = YLeft + Height + dc->ptlDCOrig.y + 1; + DestRect.bottom = YLeft + dc->ptlDCOrig.y + 1; } IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - BrushOrigin.x = BrushObj->ptOrigin.x + dc->w.DCOrgX; - BrushOrigin.y = BrushObj->ptOrigin.y + dc->w.DCOrgY; + BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x; + BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y; IntGdiInitBrushInstance(&BrushInst, BrushObj, dc->XlateBrush); @@ -1074,7 +1006,7 @@ &DestRect, NULL, NULL, - &BrushInst.BrushObject, + &BrushInst.BrushObject, // use pDC->eboFill &BrushOrigin, ROP3_TO_ROP4(ROP)); } @@ -1144,10 +1076,18 @@ DWORD ROP) { PGDIBRUSHOBJ BrushObj; - DC *dc = DC_LockDc(hDC); + DC *dc; PDC_ATTR Dc_Attr; BOOL ret; + BOOL UsesSource = ROP3_USES_SOURCE(ROP); + if (UsesSource) + { + /* in this case we call on GdiMaskBlt */ + return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); + } + + dc = DC_LockDc(hDC); if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -372,8 +372,14 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.right = XDest + Width; - rcDest.bottom = YDest + Height; + if (bTransformCoordinates) + { + CoordLPtoDP(pDC, (LPPOINT)&rcDest); + } + rcDest.left += pDC->ptlDCOrig.x; + rcDest.top += pDC->ptlDCOrig.y; + rcDest.right = rcDest.left + Width; + rcDest.bottom = rcDest.top + Height; ptSource.x = XSrc; ptSource.y = YSrc; @@ -758,7 +764,7 @@ INT APIENTRY NtGdiStretchDIBitsInternal( - HDC hDC, + HDC hdc, INT XDest, INT YDest, INT DestWidth, @@ -779,6 +785,7 @@ HDC hdcMem; HPALETTE hPal = NULL; PDC pDC; + HDC hDC = hdc; if (!Bits || !BitsInfo) { @@ -786,15 +793,33 @@ return 0; } + /* if hdc is null we get it, for NtGdiCreateCompatibleDC can not handle NULL hdc */ + if (hDC == NULL) + { + DPRINT1("hdc is NULL we using GetDC(NULL) hdc\n"); + hDC = NtUserGetDC(NULL); + } + hdcMem = NtGdiCreateCompatibleDC(hDC); + if (hdcMem == NULL) + { + DPRINT1("Waring : NtGdiCreateCompatibleDC fails \n"); + } + hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); + + if (hBitmap == NULL) + { + DPRINT1("Waring : NtGdiCreateCompatibleBitmap fails \n"); + } + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); if(Usage == DIB_PAL_COLORS) { hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); - hPal = NtUserSelectPalette(hdcMem, hPal, FALSE); + hPal = GdiSelectPalette(hdcMem, hPal, FALSE); } if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || @@ -811,12 +836,18 @@ } pDC = DC_LockDc(hdcMem); - - IntSetDIBits(pDC, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, + if (pDC != NULL) + { + /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, + * if it negitve we getting to many scanline for scanline is UINT not + * a INT, so we need make the negtive value to positve and that make the + * count correct for negtive bitmap, TODO : we need testcase for this api */ + + IntSetDIBits(pDC, hBitmap, 0, abs(BitsInfo->bmiHeader.biHeight), Bits, BitsInfo, Usage); - DC_UnlockDc(pDC); - + DC_UnlockDc(pDC); + } /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ @@ -830,11 +861,18 @@ SrcWidth, SrcHeight, ROP, 0); if(hPal) - NtUserSelectPalette(hdcMem, hPal, FALSE); + GdiSelectPalette(hdcMem, hPal, FALSE); NtGdiSelectBitmap(hdcMem, hOldBitmap); - NtGdiDeleteObjectApp(hdcMem); - NtGdiDeleteObject(hBitmap); + + if (hdcMem) + NtGdiDeleteObjectApp(hdcMem); + + if (hBitmap) + NtGdiDeleteObject(hBitmap); + + if (hdc == NULL) + UserReleaseDC(NULL, hDC, FALSE); return SrcHeight; } @@ -993,6 +1031,8 @@ HBITMAP hbitmap = 0; DC *dc; BOOL bDesktopDC = FALSE; + + if (!bmi) return hbitmap; // Make sure. // If the reference hdc is null, take the desktop dc if (hDC == 0) Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -73,8 +73,8 @@ IntLPtoDP(dc, UnsafePoints, Count); for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) { - UnsafePoints[CurrentPoint].x += dc->w.DCOrgX; - UnsafePoints[CurrentPoint].y += dc->w.DCOrgY; + UnsafePoints[CurrentPoint].x += dc->ptlDCOrig.x; + UnsafePoints[CurrentPoint].y += dc->ptlDCOrig.y; } if (PATH_IsPathOpen(dc->w.path)) @@ -157,7 +157,8 @@ LPINT PolyCounts, int Count) { - while (--Count >=0) + /* crash in POLYGONFILL_MakeEdgeList if we process point 0 */ + while (--Count >=1) { if (!IntGdiPolygon ( dc, Points, *PolyCounts )) return FALSE; @@ -273,10 +274,10 @@ IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); - RectBounds.left += dc->w.DCOrgX; - RectBounds.right += dc->w.DCOrgX; - RectBounds.top += dc->w.DCOrgY; - RectBounds.bottom += dc->w.DCOrgY; + RectBounds.left += dc->ptlDCOrig.x; + RectBounds.right += dc->ptlDCOrig.x; + RectBounds.top += dc->ptlDCOrig.y; + RectBounds.bottom += dc->ptlDCOrig.y; RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); @@ -683,14 +684,14 @@ return FALSE; } - Left += dc->w.DCOrgX; - Right += dc->w.DCOrgX; - Top += dc->w.DCOrgY; - Bottom += dc->w.DCOrgY; - XRadialStart += dc->w.DCOrgX; - YRadialStart += dc->w.DCOrgY; - XRadialEnd += dc->w.DCOrgX; - YRadialEnd += dc->w.DCOrgY; + Left += dc->ptlDCOrig.x; + Right += dc->ptlDCOrig.x; + Top += dc->ptlDCOrig.y; + Bottom += dc->ptlDCOrig.y; + XRadialStart += dc->ptlDCOrig.x; + YRadialStart += dc->ptlDCOrig.y; + XRadialEnd += dc->ptlDCOrig.x; + YRadialEnd += dc->ptlDCOrig.y; RectBounds.left = Left; RectBounds.right = Right; @@ -1047,10 +1048,10 @@ } else { - LeftRect += dc->w.DCOrgX; - RightRect += dc->w.DCOrgX - 1; - TopRect += dc->w.DCOrgY; - BottomRect += dc->w.DCOrgY - 1; + LeftRect += dc->ptlDCOrig.x; + RightRect += dc->ptlDCOrig.x - 1; + TopRect += dc->ptlDCOrig.y; + BottomRect += dc->ptlDCOrig.y - 1; DestRect.left = LeftRect; DestRect.right = RightRect; @@ -1207,10 +1208,10 @@ xradius = xCurveDiameter >> 1; yradius = yCurveDiameter >> 1; - left += dc->w.DCOrgX; - right += dc->w.DCOrgX; - top += dc->w.DCOrgY; - bottom += dc->w.DCOrgY; + left += dc->ptlDCOrig.x; + right += dc->ptlDCOrig.x; + top += dc->ptlDCOrig.y; + bottom += dc->ptlDCOrig.y; RectBounds.left = left; RectBounds.right = right; @@ -1492,6 +1493,7 @@ POINTL DitherOrg; ULONG Mode, i; BOOL Ret; + HPALETTE hDestPalette; ASSERT(dc); ASSERT(pVertex); @@ -1539,8 +1541,8 @@ Extent.bottom = max(Extent.bottom, (pVertex + i)->y); } - DitherOrg.x = dc->w.DCOrgX; - DitherOrg.y = dc->w.DCOrgY; + DitherOrg.x = dc->ptlDCOrig.x; + DitherOrg.y = dc->ptlDCOrig.y; Extent.left += DitherOrg.x; Extent.right += DitherOrg.x; Extent.top += DitherOrg.y; @@ -1550,13 +1552,19 @@ /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(BitmapObj); - PalDestGDI = PALETTE_LockPalette(dc->DcLevel.hpal); - /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(PalDestGDI); - Mode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->DcLevel.hpal, NULL); + hDestPalette = BitmapObj->hDIBPalette; + if (!hDestPalette) hDestPalette = pPrimarySurface->DevInfo.hpalDefault; + + PalDestGDI = PALETTE_LockPalette(hDestPalette); + if (PalDestGDI) + { + Mode = PalDestGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + } + else + Mode = PAL_RGB; + + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, hDestPalette, NULL); ASSERT(XlateObj); Ret = IntEngGradientFill(&BitmapObj->SurfObj, Modified: branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/win32k-gdi-dx/subsystems/win32/… ============================================================================== --- branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] (original) +++ branches/win32k-gdi-dx/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] Sat Jun 7 09:34:25 2008 @@ -281,6 +281,7 @@ else list->Edges[list->Count++] = e; } + /* notes pionts does not come with paris from IntGdiPolyPolygon */ e = POLYGONFILL_MakeEdge ( Points[CurPt-1], Points[0] ); if ( !e ) goto fail;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs