Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 42329: [rbuild] Fix wrapping of long lines in generated makefile
by hpoussin＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: hpoussin Date: Sun Aug 2 10:06:04 2009 New Revision: 42329 URL: http://svn.reactos.org/svn/reactos?rev=42329&view=rev Log: [rbuild] Fix wrapping of long lines in generated makefile Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Aug 2 10:06:04 2009 @@ -164,7 +164,10 @@ { const FileLocation& file = files[i]; if ( wrap_at > 0 && wrap_count++ == wrap_at ) + { s += " \\\n\t\t"; + wrap_count = 1; + } else if ( s.size() ) s += " "; s += backend->GetFullName ( file ); @@ -185,7 +188,10 @@ if ( !v[i].size() ) continue; if ( wrap_at > 0 && wrap_count++ == wrap_at ) + { s += " \\\n\t\t"; + wrap_count = 1; + } else if ( s.size() ) s += " "; s += v[i];

1 0

[tkreuzer] 42328: Add regtests/gdi Tests for gdi, written in winetest style so it can be easily plugged into sysreg. Currently containing some xlate tests. More to come.
by tkreuzer＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: tkreuzer Date: Sun Aug 2 02:26:51 2009 New Revision: 42328 URL: http://svn.reactos.org/svn/reactos?rev=42328&view=rev Log: Add regtests/gdi Tests for gdi, written in winetest style so it can be easily plugged into sysreg. Currently containing some xlate tests. More to come. Added: trunk/rostests/regtests/ (with props) trunk/rostests/regtests/directory.rbuild (with props) trunk/rostests/regtests/gdi/ (with props) trunk/rostests/regtests/gdi/gdi_regtest.rbuild (with props) trunk/rostests/regtests/gdi/testlist.c (with props) trunk/rostests/regtests/gdi/xlate.c (with props) Modified: trunk/rostests/directory.rbuild Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=4232… ============================================================================== --- trunk/rostests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/directory.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -9,6 +9,9 @@ </directory> <directory name="dxtest"> <xi:include href="dxtest/directory.rbuild" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.rbuild" /> </directory> <directory name="rosautotest"> <xi:include href="rosautotest/rosautotest.rbuild" /> Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 2 02:26:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/regtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/directory.rbuild… ============================================================================== --- trunk/rostests/regtests/directory.rbuild (added) +++ trunk/rostests/regtests/directory.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="gdi"> + <xi:include href="gdi/gdi_regtest.rbuild" /> + </directory> +</group> Propchange: trunk/rostests/regtests/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 2 02:26:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/regtests/gdi/gdi_regtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/gdi_regtest.… ============================================================================== --- trunk/rostests/regtests/gdi/gdi_regtest.rbuild (added) +++ trunk/rostests/regtests/gdi/gdi_regtest.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="gdi_regtest" type="win32cui" installbase="bin" installname="gdi_regtest.exe"> + <include base="gdi_regtest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + + <file>xlate.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/regtests/gdi/gdi_regtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/gdi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/testlist.c?r… ============================================================================== --- trunk/rostests/regtests/gdi/testlist.c (added) +++ trunk/rostests/regtests/gdi/testlist.c [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,17 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_xlate(void); + +const struct test winetest_testlist[] = +{ + { "xlate", func_xlate }, + { 0, 0 } +}; + Propchange: trunk/rostests/regtests/gdi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/gdi/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/xlate.c?rev=… ============================================================================== --- trunk/rostests/regtests/gdi/xlate.c (added) +++ trunk/rostests/regtests/gdi/xlate.c [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,285 @@ + +#include <stdio.h> +#include <windows.h> +#include <wine/test.h> + +static BYTE ajBits1[] = {0xAA, 0xAA, 0xAA, 0xAA, 0,0,0,0}; +static BYTE ajBits8[] = {0x00, 0xFF, 0x80, 0xCC, 0,0,0,0}; +static WORD ajBits16[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static DWORD ajBits24[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static DWORD ajBits32[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static HBITMAP hbmp1bpp_a, hbmp1bpp_b; +static HBITMAP hbmp8bpp_a, hbmp8bpp_b; +static HBITMAP hbmp16bpp_a, hbmp16bpp_b; +static HBITMAP hbmp24bpp_a, hbmp24bpp_b; +static HBITMAP hbmp32bpp_a, hbmp32bpp_b; +static HDC hdcSrc, hdcDst; +static ULONG dstbpp; + +ULONG +GetRealColorDepth() +{ + HBITMAP hbmp; + HDC hdc; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG aulMasks[3]; + } bmi; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmi; + ULONG ulColorDepth; + + /* Get the screen DC */ + hdc = GetDC(NULL); + + /* Create a compatible bitmap */ + hbmp = CreateCompatibleBitmap(hdc, 1, 1); + + /* Fill BITMAPINFOHEADER */ + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + + /* Get the basic color depth */ + ulColorDepth = bmi.bmiHeader.biBitCount; + + /* Special case 16 bpp */ + if (ulColorDepth == 16) + { + /* Call again to fill in the bitfields */ + GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + + /* Check the red mask */ + if (bmi.aulMasks[0] == 0x7c00) + ulColorDepth = 15; + } + + /* Cleanup and return */ + DeleteObject(hbmp); + return ulColorDepth; +} + +static +ULONG +GetClosestColor(ULONG bpp, COLORREF crColor) +{ + ULONG ulRed, ulGreen, ulBlue; + + ulRed = GetRValue(crColor); + ulGreen = GetGValue(crColor); + ulBlue = GetBValue(crColor); + + switch (bpp) + { + case 1: + return crColor ? 0xffffff : 0; + case 8: + case 15: + ulRed &= 0xF8; + ulGreen &= 0xF8; + ulBlue &= 0xF8; + printf("ulRed = %lx\n", ulRed); + ulRed |= ulRed >> 5; + ulGreen |= ulGreen >> 5; + ulBlue |= ulBlue >> 5; + printf("ulRed = %lx\n", ulRed); + return RGB(ulRed, ulGreen, ulBlue); + + case 16: + ulRed &= 0xF8; + ulGreen &= 0xFC; + ulBlue &= 0xF8; + ulRed |= ulRed >> 5; + ulGreen |= ulGreen >> 6; + ulBlue |= ulBlue >> 5; + return RGB(ulRed, ulGreen, ulBlue); + + case 24: + case 32: + return crColor; + } + return 0; +} + + +static +void +Initialize() +{ + hdcSrc = CreateCompatibleDC(0); + hdcDst = CreateCompatibleDC(0); + + dstbpp = GetRealColorDepth(); + + hbmp1bpp_a = CreateBitmap(4, 2, 1, 1, ajBits1); + ok(hbmp1bpp_a != 0, "CreateBitmap failed\n"); + + hbmp1bpp_b = CreateBitmap(4, 2, 1, 1, ajBits1); + ok(hbmp1bpp_b != 0, "CreateBitmap failed\n"); + + hbmp8bpp_a = CreateBitmap(4, 2, 1, 8, ajBits8); + ok(hbmp8bpp_a != 0, "CreateBitmap failed\n"); + + hbmp8bpp_b = CreateBitmap(4, 2, 1, 8, ajBits8); + ok(hbmp8bpp_b != 0, "CreateBitmap failed\n"); + + hbmp16bpp_a = CreateBitmap(4, 2, 1, 16, ajBits16); + ok(hbmp16bpp_a != 0, "CreateBitmap failed\n"); + + hbmp16bpp_b = CreateBitmap(4, 2, 1, 16, ajBits16); + ok(hbmp16bpp_b != 0, "CreateBitmap failed\n"); + + hbmp24bpp_a = CreateBitmap(4, 2, 1, 24, ajBits24); + ok(hbmp24bpp_a != 0, "CreateBitmap failed\n"); + + hbmp24bpp_b = CreateBitmap(4, 2, 1, 24, ajBits24); + ok(hbmp24bpp_b != 0, "CreateBitmap failed\n"); + + hbmp32bpp_a = CreateBitmap(4, 2, 1, 32, ajBits32); + ok(hbmp32bpp_a != 0, "CreateBitmap failed\n"); + + hbmp32bpp_b = CreateBitmap(4, 2, 1, 32, ajBits32); + ok(hbmp32bpp_b != 0, "CreateBitmap failed\n"); + + +} + +void +Test_SrcMono1(UINT cBits, HBITMAP hbmpDst) +{ + ULONG c, expected; + HBRUSH hbr; + RECT rect; + ULONG dstbpp = GetDeviceCaps(hdcDst, BITSPIXEL); + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG bmiColors[2]; + BYTE aj[32]; + } bmi; + + SelectObject(hdcSrc, hbmp1bpp_a); + SelectObject(hdcDst, hbmpDst); + + /* Set default dc fore and back colors */ + SetTextColor(hdcSrc, 0x000000); + SetBkColor(hdcSrc, 0xffffff); + SetTextColor(hdcDst, 0x000000); + SetBkColor(hdcDst, 0xffffff); + + /* Do a bitblt operation */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); + + /* Check resulting colors */ + c = GetPixel(hdcDst, 0, 0); + ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + c = GetPixel(hdcDst, 1, 0); + ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + + /* Set different dc fore and back colors */ + SetTextColor(hdcSrc, 0xf00f0f); + SetBkColor(hdcSrc, 0xf0ff0f); + SetTextColor(hdcDst, 0xffFFff); + SetBkColor(hdcDst, 0x000000); + + /* Make sure this alone didn't affect the resulting colors */ + c = GetPixel(hdcDst, 0, 0); + ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + c = GetPixel(hdcDst, 1, 0); + ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + + /* Repeat the bitblt operation */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); + + /* Finally test effect of the fore / cack color on the operation */ + c = GetPixel(hdcDst, 0, 0); + expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? GetTextColor(hdcDst) : 0; + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + /* Set dc fore and back colors */ + SetTextColor(hdcDst, 0x102030); + SetBkColor(hdcDst, 0xeeccee); + SetBkMode(hdcDst, OPAQUE); + + /* Create a hatch brush */ + hbr = CreateHatchBrush(HS_DIAGCROSS, 0x123456); + + /* Fill the destination bitmap */ + rect.left = rect.top = 0; + rect.bottom = rect.right = 4; + ok(FillRect(hdcDst, &rect, hbr), "FillRect failed\n"); + + /* Test the fore color of the hatch brush */ + c = GetPixel(hdcDst, 0, 0); + expected = cBits >= dstbpp ? 0x123456 : 0; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + /* Test the back color of the hatch brush */ + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + DeleteObject(hbr); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = 8; + bmi.bmiHeader.biHeight = 8; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 1; + bmi.bmiHeader.biYPelsPerMeter = 1; + bmi.bmiHeader.biClrUsed = 2; + bmi.bmiHeader.biClrImportant = 2; + bmi.bmiColors[0] = 0xeeeeee; + bmi.bmiColors[1] = 0x111111; + memset(bmi.aj, 0xaaaa, sizeof(bmi.aj)); + hbr = CreateDIBPatternBrushPt(&bmi, DIB_RGB_COLORS); + ok(hbr != 0, "CreateDIBPatternBrushPt failed\n"); + + rect.left = rect.top = 0; + rect.bottom = rect.right = 4; + ok(FillRect(hdcDst, &rect, hbr),"FillRect failed\n"); + + /* Test the fore and back color of the dib brush */ + c = GetPixel(hdcDst, 0, 1); + expected = cBits >= dstbpp ? bmi.bmiColors[1] : 0; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? bmi.bmiColors[0] : 0xffffff; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + DeleteObject(hbr); + + + +} + + +void +Test_SrcMono() +{ + + Test_SrcMono1(1, hbmp1bpp_b); + Test_SrcMono1(8, hbmp8bpp_b); + Test_SrcMono1(16, hbmp16bpp_b); + Test_SrcMono1(24, hbmp24bpp_b); + Test_SrcMono1(32, hbmp32bpp_b); + + +} + +START_TEST(xlate) +{ + Initialize(); + + Test_SrcMono(); +} Propchange: trunk/rostests/regtests/gdi/xlate.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 42327: - Properly define dummy unions/structs for MSVC too.
by sginsberg＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: sginsberg Date: Sat Aug 1 21:10:16 2009 New Revision: 42327 URL: http://svn.reactos.org/svn/reactos?rev=42327&view=rev Log: - Properly define dummy unions/structs for MSVC too. Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/psdk/windef.h trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -85,8 +85,8 @@ // We should use the -fms-extensions compiler flag for gcc, // and clean up the mess. // +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -95,11 +95,11 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -202,8 +202,8 @@ #define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -212,11 +212,11 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -33,8 +33,8 @@ #define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC #endif +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -43,11 +43,12 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ + #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION #define _UNION_NAME(x) x

1 0

[fireball] 42326: - Remove GreatLord's "uberoptimized" DIB_32BPP_ColorFill since it doesn't really conform to any calling convention and doesn't correctly set up ebp and esp as it should. As an example of such actions it's impossible to have a backtrace if an exception occurs in this function.
by fireball＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: fireball Date: Sat Aug 1 21:00:07 2009 New Revision: 42326 URL: http://svn.reactos.org/svn/reactos?rev=42326&view=rev Log: - Remove GreatLord's "uberoptimized" DIB_32BPP_ColorFill since it doesn't really conform to any calling convention and doesn't correctly set up ebp and esp as it should. As an example of such actions it's impossible to have a backtrace if an exception occurs in this function. Removed: branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s Modified: branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Aug 1 21:00:07 2009 @@ -294,6 +294,19 @@ } BOOLEAN +DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY < DestRect->bottom; DestY++) + { + DIB_32BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } + + return TRUE; +} + +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) Removed: branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s (removed) @@ -1,93 +1,0 @@ - -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: */ - .globl _DIB_32BPP_ColorFill - .intel_syntax noprefix - - .def _DIB_32BPP_ColorFill; - .scl 2; - .type 32; - .endef - - _DIB_32BPP_ColorFill: - sub esp, 24 - mov ecx, [esp+32] - mov [esp+8], ebx - mov ebx, [esp+28] - mov [esp+20], ebp - mov ebp, [esp+36] - mov [esp+12], esi - mov [esp+16], edi - mov edi, [ecx] - mov esi, [ecx+8] - mov edx, [ebx+36] - sub esi, edi - mov edi, [ecx+4] - mov eax, edi - imul eax, edx - add eax, [ebx+32] - mov ebx, [ecx] - lea eax, [eax+ebx*4] - mov [esp+4], eax - mov eax, [ecx+12] - cmp eax, edi - jbe end - sub eax, edi - mov [esp], eax - lea esi, [esi+0] - - for_loop: - mov eax, ebp - cld - mov ebx, esi - mov edi, [esp+4] - test edi, 3 - jnz algin_draw - mov ecx, esi - rep stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - end: - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret - - algin_draw: - stosd - dec ebx - mov ecx, ebx - rol eax, 16 - stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Aug 1 21:00:07 2009 @@ -43,7 +43,6 @@ <directory name="i386"> <file>dib24bpp_hline.s</file> <file>dib32bpp_hline.s</file> - <file>dib32bpp_colorfill.s</file> </directory> </if> <ifnot property="ARCH" value="i386">

1 0

[fireball] 42325: Giannis Adamopoulos - Remove hardcoded dependency to 800x600 (and 640x480 in monitor functions) display size (see arwinss issue nr. 18), explorer now correctly shows its desktop on a full screen.
by fireball＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: fireball Date: Sat Aug 1 20:24:39 2009 New Revision: 42325 URL: http://svn.reactos.org/svn/reactos?rev=42325&view=rev Log: Giannis Adamopoulos - Remove hardcoded dependency to 800x600 (and 640x480 in monitor functions) display size (see arwinss issue nr. 18), explorer now correctly shows its desktop on a full screen. Added: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/user.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild 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] Sat Aug 1 20:24:39 2009 @@ -89,7 +89,7 @@ void CDECL RosDrv_Beep(void) { - UNIMPLEMENTED; + Beep(500, 100); } SHORT CDECL RosDrv_GetAsyncKeyState( INT key ) @@ -361,12 +361,62 @@ BOOL CDECL RosDrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT monrect = {0, 0, 640, 480}; - - FIXME("RosDrv_EnumDisplayMonitors is a hack\n"); - - proc((HMONITOR)1, hdc, &monrect, lp); - + int i; + int nb_monitors; + HMONITOR *monitors; + RECT *monitors_rect; + + /* Get the count of the display monitors */ + nb_monitors = RosUserEnumDisplayMonitors(NULL, NULL, 0); + if (nb_monitors <= 0) + { + return FALSE; + } + + /* Allocate the buffers that will be filled by RosUserEnumDisplayMonitors */ + monitors = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(HMONITOR)); + monitors_rect = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(RECT)); + if(!monitors || !monitors_rect) + { + return FALSE; + } + + /* Fill the buffers with the handles and the rects of all display monitors */ + nb_monitors = RosUserEnumDisplayMonitors(monitors, (PRECTL)monitors_rect, nb_monitors); + if (nb_monitors <= 0) + { + return FALSE; + } + + if (hdc) + { + POINT origin; + RECT limit; + + if (!GetDCOrgEx( hdc, &origin )) return FALSE; + if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; + + if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; + + for (i = 0; i < nb_monitors; i++) + { + RECT monrect = monitors_rect[i]; + OffsetRect( &monrect, -origin.x, -origin.y ); + if (IntersectRect( &monrect, &monrect, &limit )) + if (!proc( monitors[i], hdc, &monrect, lp )) + return FALSE; + } + } + else + { + for (i = 0; i < nb_monitors; i++) + { + RECT unused; + if (!rect || IntersectRect( &unused, &monitors_rect[i], rect )) + if (!proc( monitors[i], 0, &monitors_rect[i], lp )) + return FALSE; + } + } return TRUE; } @@ -378,14 +428,7 @@ BOOL CDECL RosDrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - RECT monrect = {0, 0, 640, 480}; - - FIXME("RosDrv_GetMonitorInfo(%x %p) is a hack\n", handle, info); - - info->rcMonitor = monrect; - info->rcWork = monrect; - - return TRUE; + return RosUserGetMonitorInfo(handle, info); } BOOL CDECL RosDrv_CreateDesktopWindow( HWND hwnd ) @@ -413,8 +456,8 @@ req->flags = SWP_NOZORDER; req->window.left = 0; req->window.top = 0; - req->window.right = 800; // FIXME: Use primary surface's dimensions! - req->window.bottom = 600; + req->window.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + req->window.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); req->client = req->window; wine_server_call( req ); } Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -49,6 +49,19 @@ void NTAPI RosUserSetCursor( ICONINFO* IconInfo ); +INT +APIENTRY +RosUserEnumDisplayMonitors( + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT PRECTL monitorRectList, + OPTIONAL IN DWORD listSize); + +BOOL +APIENTRY +RosUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo); + VOID NTAPI RosUserConnectCsrss(); Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -183,8 +183,6 @@ HANDLE MouseThreadHandle; ClipCursor(NULL); - SetCursorPos(GetSystemMetrics( SM_CXVIRTUALSCREEN ) /2, - GetSystemMetrics( SM_CYVIRTUALSCREEN ) /2); MouseThreadHandle = CreateThread(NULL, 0, MouseInputThread, NULL, 0,NULL); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -534,14 +534,17 @@ SurfaceRect.bottom = SurfObj->sizlBitmap.cy; //EngEraseSurface(SurfObj, &SurfaceRect, 0); - /* Put the pointer in the center of the screen */ - //gpsi->ptCursor.x = (SurfaceRect.right - SurfaceRect.left) / 2; - //gpsi->ptCursor.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; - /* Give the PDEV a MovePointer function */ PrimarySurface.pfnMovePointer = PrimarySurface.DriverFunctions.MovePointer; if (!PrimarySurface.pfnMovePointer) PrimarySurface.pfnMovePointer = EngMovePointer; + + /* attach monitor */ + AttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); + + /* Put the pointer in the center of the screen */ + RosUserSetCursorPos((SurfaceRect.right - SurfaceRect.left) / 2, + (SurfaceRect.bottom - SurfaceRect.top) / 2); EngUnlockSurface(SurfObj); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -12,6 +12,8 @@ #define NDEBUG #include <debug.h> +extern PDEVOBJ PrimarySurface; + /* PUBLIC FUNCTIONS **********************************************************/ BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, @@ -79,8 +81,8 @@ pDC = DC_Lock(physDev); scrRect.left = scrRect.top = 0; - scrRect.right = 800; - scrRect.bottom = 600; + scrRect.right = PrimarySurface.GDIInfo.ulHorzRes; + scrRect.bottom = PrimarySurface.GDIInfo.ulVertRes; pClipObj = IntEngCreateClipRegion(1, NULL, &scrRect); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -13,6 +13,8 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +extern PDEVOBJ PrimarySurface; /* PUBLIC FUNCTIONS **********************************************************/ @@ -112,8 +114,8 @@ // HACK DestRect.left = 0; DestRect.top = 0; - DestRect.bottom = 600; - DestRect.right = 800; + DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; + DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -11,6 +11,8 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +extern PDEVOBJ PrimarySurface; /* PUBLIC FUNCTIONS **********************************************************/ @@ -105,8 +107,8 @@ // HACK DestRect.left = 0; DestRect.top = 0; - DestRect.bottom = 600; - DestRect.right = 800; + DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; + DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; /* Draw brush-based polygon */ if (pDC->pFillBrush) Added: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -1,0 +1,26 @@ +#ifndef _WIN32K_MONITOR_H +#define _WIN32K_MONITOR_H + +typedef struct _MONITOR_OBJECT +{ + HANDLE Handle; /* system object handle */ + FAST_MUTEX Lock; /* R/W lock */ + + BOOL IsPrimary; /* wether this is the primary monitor */ + UNICODE_STRING DeviceName; /* name of the monitor */ + PDEVOBJ *GdiDevice; /* pointer to the GDI device to + which this monitor is attached */ + struct _MONITOR_OBJECT *Prev, *Next; /* double linked list */ + + RECT rcMonitor; + RECT rcWork; +} MONITOR, *PMONITOR; + +NTSTATUS +AttachMonitor(IN PDEVOBJ *pGdiDevice, + IN ULONG DisplayNumber); + +NTSTATUS +DetachMonitor(IN PDEVOBJ *pGdiDevice); + +#endif /* _WIN32K_MONITOR_H */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -35,7 +35,8 @@ enum user_object { USER_WINDOW = 1, - USER_HOOK + USER_HOOK, + USER_MONITOR }; #define DESKTOP_ATOM ((atom_t)32769) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -48,6 +48,7 @@ #include <xlateobj.h> #include <cursor.h> #include <gre.h> +#include <monitor.h> #include "winesup.h" Added: branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -1,0 +1,457 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Monitor support + * FILE: subsys/win32k/ntuser/monitor.c + * PROGRAMER: Anich Gregor (blight(a)blight.eu.org) + * REVISION HISTORY: + * 26-02-2004 Created + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#include "object.h" +#include "user.h" +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* list of monitors */ +static PMONITOR gMonitorList = NULL; + +/* PRIVATE FUNCTIONS **********************************************************/ + +/* IntCreateMonitorObject + * + * Creates a MONITOR struct + * + * Return value + * If the function succeeds a pointer to a MONITOR struct is returned. On failure + * NULL is returned. + */ +static +PMONITOR +IntCreateMonitorObject() +{ + PMONITOR Monitor; + + Monitor = ExAllocatePool( PagedPool, sizeof (MONITOR) ); + if (Monitor == NULL) + { + return NULL; + } + + RtlZeroMemory(Monitor, sizeof (MONITOR)); + Monitor->Handle = (HANDLE)alloc_user_handle(Monitor, USER_MONITOR); + + ExInitializeFastMutex(&Monitor->Lock); + + return Monitor; +} + +/* IntDestroyMonitorObject + * + * Destroys a MONITOR struct + * You have to be the owner of the monitors lock to safely destroy it. + * + * Arguments + * + * pMonitor + * Pointer to the MONITOR struct which shall be deleted + */ +static +void +IntDestroyMonitorObject(IN PMONITOR pMonitor) +{ + RtlFreeUnicodeString(&pMonitor->DeviceName); + free_user_handle((user_handle_t)pMonitor->Handle); + //UserDereferenceObject(pMonitor); +} + + +PMONITOR FASTCALL +UserGetMonitorObject(IN HMONITOR hMonitor) +{ + PMONITOR Monitor; + + if (!hMonitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + Monitor = (PMONITOR)get_user_object((user_handle_t)hMonitor, USER_MONITOR); + if (!Monitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + return Monitor; +} + + +/* IntAttachMonitor + * + * Creates a new MONITOR struct and appends it to the list of monitors. + * + * Arguments + * + * pGdiDevice Pointer to the PDEVOBJ onto which the monitor was attached + * DisplayNumber Display Number (starting with 0) + * + * Return value + * Returns a NTSTATUS + */ +NTSTATUS +AttachMonitor(IN PDEVOBJ *pGdiDevice, + IN ULONG DisplayNumber) +{ + PMONITOR Monitor; + WCHAR Buffer[CCHDEVICENAME]; + + DPRINT("Attaching monitor...\n"); + + /* create new monitor object */ + Monitor = IntCreateMonitorObject(); + if (Monitor == NULL) + { + DPRINT1("Couldnt create monitor object\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); + if (!RtlCreateUnicodeString(&Monitor->DeviceName, Buffer)) + { + DPRINT1("Couldn't duplicate monitor name!\n"); + //UserDereferenceObject(Monitor); + //UserDeleteObject(Monitor->Handle, Monitor); + free_user_handle((user_handle_t)Monitor->Handle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Monitor->GdiDevice = pGdiDevice; + if (gMonitorList == NULL) + { + DPRINT("Primary monitor is beeing attached\n"); + Monitor->IsPrimary = TRUE; + gMonitorList = Monitor; + } + else + { + PMONITOR p; + DPRINT("Additional monitor is beeing attached\n"); + for (p = gMonitorList; p->Next != NULL; p = p->Next) + ; + { + p->Next = Monitor; + } + Monitor->Prev = p; + } + + return STATUS_SUCCESS; +} + +/* IntDetachMonitor + * + * Deletes a MONITOR struct and removes it from the list of monitors. + * + * Arguments + * + * pGdiDevice Pointer to the PDEVOBJ from which the monitor was detached + * + * Return value + * Returns a NTSTATUS + */ +NTSTATUS +DetachMonitor(IN PDEVOBJ *pGdiDevice) +{ + PMONITOR Monitor; + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + if (Monitor->GdiDevice == pGdiDevice) + break; + } + + if (Monitor == NULL) + { + /* no monitor for given device found */ + return STATUS_INVALID_PARAMETER; + } + + if (Monitor->IsPrimary && (Monitor->Next != NULL || Monitor->Prev != NULL)) + { + PMONITOR NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&NewPrimaryMonitor->Lock); + NewPrimaryMonitor->IsPrimary = TRUE; + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&NewPrimaryMonitor->Lock); + } + + if (gMonitorList == Monitor) + { + gMonitorList = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = NULL; + } + else + { + Monitor->Prev->Next = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = Monitor->Prev; + } + + IntDestroyMonitorObject(Monitor); + + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* RosUserEnumDisplayMonitors + * + * Fills hMonitorList with handles to all available monitors and their rectangles + * + */ +INT +APIENTRY +RosUserEnumDisplayMonitors( + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT PRECTL monitorRectList, + OPTIONAL IN DWORD listSize) +{ + INT numMonitors = 0,i =0; + HMONITOR *safeHMonitorList = NULL; + PMONITOR Monitor; + PRECTL safeRectList = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RosUserEnumDisplayMonitors called\n"); + + /* get monitors count */ + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + numMonitors++; + } + + if (numMonitors == 0 || listSize == 0 || (hMonitorList == NULL && monitorRectList == NULL)) + { + return numMonitors; + } + + safeHMonitorList = ExAllocatePool(PagedPool, sizeof (HMONITOR) * listSize); + if (safeHMonitorList == NULL) + { + /* FIXME: SetLastWin32Error? */ + DPRINT1("safeHMonitorList == NULL\n"); + return -1; + } + + safeRectList = ExAllocatePool(PagedPool, sizeof (RECT) * listSize); + if (safeRectList == NULL) + { + ExFreePool(safeHMonitorList); + /* FIXME: SetLastWin32Error? */ + DPRINT1("safeRectList == NULL\n"); + return -1; + } + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + safeHMonitorList[i] = Monitor->Handle; + safeRectList[i].left = 0; /* FIXME: get origin */ + safeRectList[i].top = 0; /* FIXME: get origin */ + safeRectList[i].right = safeRectList->left + Monitor->GdiDevice->GDIInfo.ulHorzRes; + safeRectList[i].bottom = safeRectList->top + Monitor->GdiDevice->GDIInfo.ulVertRes; + + i++; + } + + /* output result */ + if (hMonitorList != NULL) + { + _SEH2_TRY + { + ProbeForWrite(hMonitorList, sizeof (HMONITOR) * listSize, 1); + RtlCopyMemory(hMonitorList,safeHMonitorList,sizeof (HMONITOR) * listSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(safeHMonitorList); + SetLastNtError(Status); + return -1; + } + } + if (monitorRectList != NULL) + { + _SEH2_TRY + { + ProbeForWrite(monitorRectList, sizeof (RECT) * listSize, 1); + RtlCopyMemory(monitorRectList,safeRectList,sizeof (RECT) * listSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ExFreePool(safeRectList); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return -1; + } + } + + return numMonitors; +} + +/* RosUserGetMonitorInfo + * + * Retrieves information about a given monitor + * + * Arguments + * + * hMonitor + * Handle to a monitor for which to get information + * + * pMonitorInfo + * Pointer to a MONITORINFO struct which is filled with the information. + * The cbSize member must be set to sizeof(MONITORINFO) or + * sizeof(MONITORINFOEX). Even if set to sizeof(MONITORINFOEX) only parts + * from MONITORINFO will be filled. + * + * pDevice + * Pointer to a UNICODE_STRING which will recieve the device's name. The + * length should be CCHDEVICENAME + * Can be NULL + * + * Return value + * TRUE on success; FALSE on failure (calls SetLastNtError()) + * + */ +BOOL +APIENTRY +RosUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo) +{ + PMONITOR Monitor; + MONITORINFOEXW MonitorInfo; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("Enter NtUserGetMonitorInfo\n"); + //FIXME: lock + + /* get monitor object */ + if (!(Monitor = UserGetMonitorObject(hMonitor))) + { + DPRINT1("Couldnt find monitor 0x%lx\n", hMonitor); + return FALSE; + } + + if(pMonitorInfo == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + /* get size of pMonitorInfo */ + _SEH2_TRY + { + ProbeForRead(&pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize), 1); + RtlCopyMemory(&MonitorInfo.cbSize, &pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + if ((MonitorInfo.cbSize != sizeof (MONITORINFO)) && + (MonitorInfo.cbSize != sizeof (MONITORINFOEXW))) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + /* fill monitor info */ + MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ + MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ + MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; + MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->GDIInfo.ulVertRes; + MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ + MonitorInfo.dwFlags = 0; + + if (Monitor->IsPrimary) + MonitorInfo.dwFlags |= MONITORINFOF_PRIMARY; + + /* fill device name */ + if (MonitorInfo.cbSize == sizeof (MONITORINFOEXW)) + { + WCHAR nul = L'\0'; + INT len = Monitor->DeviceName.Length; + if (len >= CCHDEVICENAME * sizeof (WCHAR)) + len = (CCHDEVICENAME - 1) * sizeof (WCHAR); + + memcpy(MonitorInfo.szDevice, Monitor->DeviceName.Buffer, len); + memcpy(MonitorInfo.szDevice + (len / sizeof (WCHAR)), &nul, sizeof (WCHAR)); + } + + /* output data */ + _SEH2_TRY + { + ProbeForWrite(pMonitorInfo, MonitorInfo.cbSize, 1); + RtlCopyMemory(pMonitorInfo,&MonitorInfo,MonitorInfo.cbSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + //FIXME: unlock + + DPRINT("GetMonitorInfo: success\n"); + + return TRUE; + + +} Propchange: branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -65,4 +65,6 @@ RosUserGetCursorPos 1 RosUserSetCursorPos 2 RosUserClipCursor 1 -RosUserSetCursor 1 +RosUserSetCursor 1 +RosUserEnumDisplayMonitors 3 +RosUserGetMonitorInfo 2 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -114,6 +114,7 @@ <file>init.c</file> <file>usrheap.c</file> <file>cursor.c</file> + <file>monitor.c</file> </directory> <directory name="wine"> <file>atom.c</file>

1 0

[gschneider] 42324: FloodFill: - Remove unneeded casts when setting the initial flood start, add debug print for flood region location (silenced) - Improve memory guards, free memory on error
by gschneider＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: gschneider Date: Sat Aug 1 19:58:28 2009 New Revision: 42324 URL: http://svn.reactos.org/svn/reactos?rev=42324&view=rev Log: FloodFill: - Remove unneeded casts when setting the initial flood start, add debug print for flood region location (silenced) - Improve memory guards, free memory on error Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Sat Aug 1 19:58:28 2009 @@ -43,7 +43,8 @@ { return FALSE; } - info->floodStart = (FLOODITEM*)((PBYTE)info->floodData + (width * height * sizeof(FLOODITEM))); + info->floodStart = info->floodData + (width * height); + DPRINT("Allocated flood stack from %p to %p\n", info->floodData, info->floodStart); return TRUE; } static __inline VOID finalizeFlood(FLOODINFO *info) @@ -118,15 +119,16 @@ removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + if (flood.floodStart - 4 < flood.floodData) + { + DPRINT1("Can't finish flooding!\n"); + finalizeFlood(&flood); + return FALSE; + } addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, FALSE); addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, FALSE); - if (flood.floodStart <= flood.floodData) - { - DPRINT1("Couldn't finish flooding!\n"); - return FALSE; - } } finalizeFlood(&flood); } @@ -150,15 +152,16 @@ removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); + if (flood.floodStart - 4 < flood.floodData) + { + DPRINT1("Can't finish flooding!\n"); + finalizeFlood(&flood); + return FALSE; + } addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, TRUE); addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, TRUE); - if (flood.floodStart <= flood.floodData) - { - DPRINT1("Couldn't finish flooding!\n"); - return FALSE; - } } finalizeFlood(&flood); }

1 0

[gschneider] 42323: FloodFill: -Get rid of global variables for flood control -Translate the provided color to the surface, not the other way around (improves speed) -Rename the function to reflect the functionality -Add comments on how to implement support for hatched brushes and non-standard surfaces -Thanks to tkreuzer for feedback
by gschneider＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: gschneider Date: Sat Aug 1 16:39:40 2009 New Revision: 42323 URL: http://svn.reactos.org/svn/reactos?rev=42323&view=rev Log: FloodFill: -Get rid of global variables for flood control -Translate the provided color to the surface, not the other way around (improves speed) -Rename the function to reflect the functionality -Add comments on how to implement support for hatched brushes and non-standard surfaces -Thanks to tkreuzer for feedback Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/floodfill.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -133,7 +133,7 @@ BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); -BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, XLATEOBJ*, COLORREF, UINT); +BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, ULONG, UINT); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -27,76 +27,72 @@ ULONG y; } FLOODITEM; -static ULONG floodLen = 0; -static FLOODITEM *floodStart = NULL, *floodData = NULL; +typedef struct _floodInfo +{ + ULONG floodLen; + FLOODITEM *floodStart; + FLOODITEM *floodData; +} FLOODINFO; -static __inline BOOL initFlood(RECTL *DstRect) +static __inline BOOL initFlood(FLOODINFO *info, RECTL *DstRect) { ULONG width = DstRect->right - DstRect->left; ULONG height = DstRect->bottom - DstRect->top; - floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB); - if (floodData == NULL) + info->floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB); + if (info->floodData == NULL) { return FALSE; } - floodStart = (FLOODITEM*)((PBYTE)floodData + (width * height * sizeof(FLOODITEM))); + info->floodStart = (FLOODITEM*)((PBYTE)info->floodData + (width * height * sizeof(FLOODITEM))); return TRUE; } -static __inline VOID finalizeFlood() +static __inline VOID finalizeFlood(FLOODINFO *info) { - ExFreePoolWithTag(floodData, TAG_DIB); + ExFreePoolWithTag(info->floodData, TAG_DIB); } -static __inline VOID addItemFlood(ULONG x, +static __inline VOID addItemFlood(FLOODINFO *info, + ULONG x, ULONG y, SURFOBJ *DstSurf, RECTL *DstRect, - XLATEOBJ* ColorTranslation, - COLORREF Color, + ULONG Color, BOOL isSurf) { if (x >= DstRect->left && x <= DstRect->right && y >= DstRect->top && y <= DstRect->bottom) { - if (isSurf == TRUE && XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + if (isSurf == TRUE && + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != Color) { return; } - else if (isSurf == FALSE && XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + else if (isSurf == FALSE && + DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) == Color) { return; } - floodStart--; - floodStart->x = x; - floodStart->y = y; - floodLen++; + info->floodStart--; + info->floodStart->x = x; + info->floodStart->y = y; + info->floodLen++; } } -static __inline VOID removeItemFlood() +static __inline VOID removeItemFlood(FLOODINFO *info) { - floodStart++; - floodLen--; -} -static __inline BOOL isEmptyFlood() -{ - if (floodLen == 0) - { - return TRUE; - } - return FALSE; + info->floodStart++; + info->floodLen--; } -BOOLEAN DIB_XXBPP_FloodFill(SURFOBJ *DstSurf, - BRUSHOBJ *Brush, - RECTL *DstRect, - POINTL *Origin, - XLATEOBJ *ColorTranslation, - COLORREF Color, - UINT FillType) +BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf, + BRUSHOBJ *Brush, + RECTL *DstRect, + POINTL *Origin, + ULONG ConvColor, + UINT FillType) { ULONG x, y; ULONG BrushColor; + FLOODINFO flood = {0, NULL, NULL}; BrushColor = Brush->iSolidColor; x = Origin->x; @@ -105,59 +101,66 @@ if (FillType == FLOODFILLBORDER) { /* Check if the start pixel has the border color */ - if (XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) == Color) + if (DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) == ConvColor) { return FALSE; } - if (initFlood(DstRect) == FALSE) + if (initFlood(&flood, DstRect) == FALSE) { return FALSE; } - addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); - while (!isEmptyFlood()) + addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, FALSE); + while (flood.floodLen != 0) { - x = floodStart->x; - y = floodStart->y; - removeItemFlood(); + x = flood.floodStart->x; + y = flood.floodStart->y; + removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); - addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); - addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, FALSE); + addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, FALSE); + addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, FALSE); + if (flood.floodStart <= flood.floodData) + { + DPRINT1("Couldn't finish flooding!\n"); + return FALSE; + } } - finalizeFlood(); + finalizeFlood(&flood); } else if (FillType == FLOODFILLSURFACE) { /* Check if the start pixel has the surface color */ - if (XLATEOBJ_iXlate(ColorTranslation, - DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y)) != Color) + if (DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != ConvColor) { return FALSE; } - if (initFlood(DstRect) == FALSE) + if (initFlood(&flood, DstRect) == FALSE) { return FALSE; } - addItemFlood(x, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - while (!isEmptyFlood()) + addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, TRUE); + while (flood.floodLen != 0) { - x = floodStart->x; - y = floodStart->y; - removeItemFlood(); + x = flood.floodStart->x; + y = flood.floodStart->y; + removeItemFlood(&flood); DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor); - addItemFlood(x, y + 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x, y - 1, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x + 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - addItemFlood(x - 1, y, DstSurf, DstRect, ColorTranslation, Color, TRUE); - + addItemFlood(&flood, x, y + 1, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x, y - 1, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x + 1, y, DstSurf, DstRect, ConvColor, TRUE); + addItemFlood(&flood, x - 1, y, DstSurf, DstRect, ConvColor, TRUE); + if (flood.floodStart <= flood.floodData) + { + DPRINT1("Couldn't finish flooding!\n"); + return FALSE; + } } - finalizeFlood(); + finalizeFlood(&flood); } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sat Aug 1 16:39:40 2009 @@ -1070,13 +1070,14 @@ UINT FillType) { PDC dc; - PDC_ATTR pdcattr; - SURFACE *psurf = NULL; - HPALETTE Pal = 0; - XLATEOBJ *XlateObj = NULL; + PDC_ATTR pdcattr; + SURFACE *psurf = NULL; + HPALETTE Pal = 0; + XLATEOBJ *XlateObj = NULL; BOOL Ret = FALSE; RECTL DestRect; POINTL Pt; + ULONG ConvColor; dc = DC_LockDc(hDC); if (!dc) @@ -1118,11 +1119,16 @@ Pal = dc->dclevel.pSurface->hDIBPalette; if (!Pal) Pal = pPrimarySurface->DevInfo.hpalDefault; - XlateObj = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, 0, NULL, Pal); - + XlateObj = (XLATEOBJ*)IntEngCreateXlate(0, PAL_RGB, Pal, NULL); + + /* Only solid fills supported for now + * How to support pattern brushes and non standard surfaces (not offering dib functions): + * Version a (most likely slow): call DrvPatBlt for every pixel + * Version b: create a flood mask and let MaskBlt blit a masked brush */ if (XlateObj != NULL) { - Ret = DIB_XXBPP_FloodFill(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, XlateObj, Color, FillType); + ConvColor = XLATEOBJ_iXlate(XlateObj, Color); + Ret = DIB_XXBPP_FloodFillSolid(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, &Pt, ConvColor, FillType); EngDeleteXlate(XlateObj); }

1 0

[gschneider] 42322: GetWindowLongPtr returns a LONG_PTR, so be it
by gschneider＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: gschneider Date: Sat Aug 1 13:32:48 2009 New Revision: 42322 URL: http://svn.reactos.org/svn/reactos?rev=42322&view=rev Log: GetWindowLongPtr returns a LONG_PTR, so be it Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Aug 1 13:32:48 2009 @@ -1148,7 +1148,7 @@ else { POINT Pt; - DWORD Style; + LONG_PTR Style; LONG HitCode; Style = GetWindowLongPtrW(hWnd, GWL_STYLE); @@ -1352,7 +1352,7 @@ case WM_SETCURSOR: { - ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); if (Style & WS_CHILD) {

1 0

[gschneider] 42321: - Handle WM_SETREDRAW messages differently in the DefWndProc, ported from current Wine - Fixes mIRC riched component regression, no more riched20 reverts for releases needed See issue #4098 for more details.
by gschneider＠svn.reactos.org 01 Aug '09

01 Aug '09

Author: gschneider Date: Sat Aug 1 13:26:40 2009 New Revision: 42321 URL: http://svn.reactos.org/svn/reactos?rev=42321&view=rev Log: - Handle WM_SETREDRAW messages differently in the DefWndProc, ported from current Wine - Fixes mIRC riched component regression, no more riched20 reverts for releases needed See issue #4098 for more details. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Aug 1 13:26:40 2009 @@ -1245,7 +1245,14 @@ case WM_SETREDRAW: { - DefWndSetRedraw(hWnd, wParam); + LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + if (wParam) SetWindowLongPtr(hWnd, GWL_STYLE, Style | WS_VISIBLE); + else + { + RedrawWindow(hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE); + Style &= ~WS_VISIBLE; + SetWindowLongPtr(hWnd, GWL_STYLE, Style); + } return (0); }

1 0

[fireball] 42320: - Switch arwinss win32k to the GDI object manager from trunk. gdiobj.c is cleaned up from functions which aren't used in arwinss, and the user<->kernel handle mapping still remains. The only supported object types now are DC, SURFACE and PALETTE. (see arwinss issue nr. 14). - Kernelmode GDI handles leak now very significantly. To be investigated.
by fireball＠svn.reactos.org 31 Jul '09

31 Jul '09

Author: fireball Date: Sat Aug 1 00:08:01 2009 New Revision: 42320 URL: http://svn.reactos.org/svn/reactos?rev=42320&view=rev Log: - Switch arwinss win32k to the GDI object manager from trunk. gdiobj.c is cleaned up from functions which aren't used in arwinss, and the user<->kernel handle mapping still remains. The only supported object types now are DC, SURFACE and PALETTE. (see arwinss issue nr. 14). - Kernelmode GDI handles leak now very significantly. To be investigated. Added: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdidbg.c - copied, changed from r42309, trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c - copied, changed from r42309, trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpal.c branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/gdiobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpal.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpal.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -24,18 +24,27 @@ IN FLONG flGreen, IN FLONG flBlue) { - HPALETTE Palette; + HPALETTE Palette; - Palette = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); + Palette = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); - return Palette; + /* Make it global */ + GDIOBJ_SetOwnership(Palette, NULL); + + return Palette; } BOOL APIENTRY EngDeletePalette(IN HPALETTE hpal) { + /* Get ownership */ + GDIOBJ_SetOwnership(hpal, PsGetCurrentProcess()); + + /* Free palette by handle */ PALETTE_FreePaletteByHandle(hpal); + + /* Report success */ return TRUE; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -30,6 +30,9 @@ /* Call the internal routine */ hNewBitmap = GreCreateBitmap(Size, Width, Format, Flags, Bits); + /* Make it global */ + GDIOBJ_SetOwnership(hNewBitmap, NULL); + return hNewBitmap; } @@ -240,6 +243,9 @@ APIENTRY EngDeleteSurface(IN HSURF hSurf) { + /* Get ownership */ + GDIOBJ_SetOwnership(hSurf, PsGetCurrentProcess()); + /* Delete this bitmap */ GreDeleteBitmap((HGDIOBJ)hSurf); @@ -255,7 +261,7 @@ DPRINT("EngLockSurface(%x)\n", hSurf); /* Get a pointer to the surface */ - Surface = GDI_GetObjPtr(hSurf, (SHORT)GDI_OBJECT_TYPE_BITMAP); + Surface = SURFACE_ShareLock(hSurf); /* Return pointer to SURFOBJ object */ return &Surface->SurfObj; @@ -263,12 +269,13 @@ VOID APIENTRY -EngUnlockSurface(IN SURFOBJ* Surface) -{ - DPRINT("EngUnlockSurface(%p)\n", Surface); +EngUnlockSurface(IN SURFOBJ* pSurfObj) +{ + SURFACE *pSurface = CONTAINING_RECORD(pSurfObj, SURFACE, SurfObj); + DPRINT("EngUnlockSurface(%p)\n", pSurface); /* Release the surface */ - GDI_ReleaseObj(0); + SURFACE_ShareUnlock(pSurface); } BOOL @@ -282,7 +289,7 @@ DPRINT("EngAssociateSurface(%x %x)\n", hSurf, hDev); /* Get a pointer to the surface */ - pSurface = GDI_GetObjPtr(hSurf, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pSurface = SURFACE_Lock(hSurf); /* Associate it */ pSurface->SurfObj.hdev = hDev; @@ -294,7 +301,7 @@ DPRINT1("flHooks: 0x%x\n", flHooks); /* Release the pointer */ - GDI_ReleaseObj(hSurf); + SURFACE_Unlock(pSurface); /* Indicate success */ return TRUE; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -32,15 +32,15 @@ DPRINT("BitBlt %x -> %x\n", physDevSrc, physDevDst); /* Get a pointer to the DCs */ - pSrc = GDI_GetObjPtr(physDevSrc, (SHORT)GDI_OBJECT_TYPE_DC); - pDst = GDI_GetObjPtr(physDevDst, (SHORT)GDI_OBJECT_TYPE_DC); + pSrc = DC_Lock(physDevSrc); + pDst = DC_Lock(physDevDst); /* Call the internal helper */ bRes = GreBitBlt(pDst, xDst, yDst, width, height, pSrc, xSrc, ySrc, rop); /* Release DC objects */ - GDI_ReleaseObj(physDevDst); - GDI_ReleaseObj(physDevSrc); + DC_Unlock(pDst); + DC_Unlock(pSrc); /* Return status */ return bRes; @@ -81,13 +81,13 @@ if (bmBits) { /* Get the object pointer */ - pSurface = GDI_GetObjPtr(hBitmap, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pSurface = SURFACE_Lock(hBitmap); /* Copy bits */ GreSetBitmapBits(pSurface, pSurface->SurfObj.cjBits, bmBits); /* Release the surface */ - GDI_ReleaseObj(hBitmap); + SURFACE_Unlock(pSurface); } /* Map handles */ @@ -143,11 +143,8 @@ return 0; } - psurf = GDI_GetObjPtr(hKernel, (SHORT)GDI_OBJECT_TYPE_BITMAP); - if (!psurf) - { - return 0; - } + psurf = SURFACE_Lock(hKernel); + if (!psurf) return 0; bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx, BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * @@ -156,7 +153,7 @@ /* If the bits vector is null, the function should return the read size */ if (buffer == NULL) { - GDI_ReleaseObj(psurf); + SURFACE_Unlock(psurf); return bmSize; } @@ -167,7 +164,7 @@ ret = GreGetBitmapBits(psurf, Bytes, buffer); /* Release bitmap pointer */ - GDI_ReleaseObj(psurf); + SURFACE_Unlock(psurf); return ret; } @@ -191,13 +188,13 @@ PDC pDst; /* Get a pointer to the DCs */ - pDst = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDst = DC_Lock(physDev); /* Call the internal helper */ bRet = GrePatBlt(pDst, left, top, width, height, rop, pDst->pLineBrush); /* Release DC objects */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDst); /* Return status */ return bRet; @@ -223,7 +220,7 @@ HGDIOBJ hBitmap = GDI_MapUserHandle(hUserBitmap); /* Get a pointer to the DCs */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); DPRINT("RosGdiSetDIBits for bitmap %x (user handle %x), StartScan %d, ScanLines %d\n", hBitmap, hUserBitmap, StartScan, ScanLines); @@ -238,7 +235,7 @@ ColorUse); /* Release DC objects */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Return amount of lines set */ return ScanLines; @@ -268,11 +265,10 @@ } /* Get a pointer to the DCs */ - pDcDest = GDI_GetObjPtr(physDevDst, (SHORT)GDI_OBJECT_TYPE_DC); + pDcDest = DC_Lock(physDevDst); if (physDevSrc) - pDcSrc = GDI_GetObjPtr(physDevSrc, (SHORT)GDI_OBJECT_TYPE_DC); - + pDcSrc = DC_Lock(physDevSrc); bRet = GreStretchBltMask( pDcDest, @@ -290,8 +286,8 @@ NULL); /* Release DC objects */ - GDI_ReleaseObj(physDevDst); - if (physDevSrc) GDI_ReleaseObj(physDevSrc); + DC_Unlock(pDcDest); + if (pDcSrc) DC_Unlock(pDcSrc); /* Return result */ return bRet; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -85,12 +85,11 @@ return STATUS_UNSUCCESSFUL; /* Allocate storage for DC structure */ - pNewDC = ExAllocatePool(PagedPool, sizeof(DC)); + pNewDC = (PDC)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_DC); if (!pNewDC) return FALSE; - RtlZeroMemory(pNewDC, sizeof(DC)); - - /* Allocate a handle for it */ - hNewDC = alloc_gdi_handle(&pNewDC->BaseObject, (SHORT)GDI_OBJECT_TYPE_DC); + + /* Save a handle to it */ + hNewDC = pNewDC->BaseObject.hHmgr; /* Set physical device pointer */ pNewDC->pPDevice = (PVOID)&PrimarySurface; @@ -121,7 +120,7 @@ DPRINT("Creating a memory DC %x\n", hNewDC); slSize.cx = 1; slSize.cy = 1; hStockBitmap = GreCreateBitmap(slSize, 1, 1, 0, NULL); - pNewDC->pBitmap = GDI_GetObjPtr(hStockBitmap, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pNewDC->pBitmap = SURFACE_ShareLock(hStockBitmap); /* Set DC rectangles */ pNewDC->rcDcRect.left = 0; pNewDC->rcDcRect.top = 0; @@ -131,7 +130,7 @@ else { DPRINT("Creating a display DC %x\n", hNewDC); - pNewDC->pBitmap = GDI_GetObjPtr(PrimarySurface.pSurface, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pNewDC->pBitmap = SURFACE_ShareLock(PrimarySurface.pSurface); /* Set DC rectangles */ pNewDC->rcVport.left = 0; @@ -145,23 +144,27 @@ /* Give handle to the caller */ *pdev = hNewDC; + /* Unlock the DC */ + DC_Unlock(pNewDC); + /* Indicate success */ return TRUE; } BOOL APIENTRY RosGdiDeleteDC( HDC physDev ) { - PDC pDC; + PDC pDC = DC_Lock(physDev); + DPRINT("RosGdiDeleteDC(%x)\n", physDev); - /* Free the handle */ - pDC = free_gdi_handle((HGDIOBJ)physDev); - /* Release the surface */ - GDI_ReleaseObj(pDC->pBitmap); - - /* Free its storage */ - ExFreePool(pDC); + SURFACE_ShareUnlock(pDC->pBitmap); + + /* Unlock DC */ + DC_Unlock(pDC); + + /* Free DC */ + GDIOBJ_FreeObjByHandle(physDev, GDI_OBJECT_TYPE_DC); /* Indicate success */ return TRUE; @@ -199,8 +202,8 @@ DPRINT("Selecting %x bitmap to hdc %x\n", hBmpKern, physDev); /* Get a pointer to the DC and the bitmap*/ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); - pSurface = GDI_GetObjPtr(hBmpKern, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pDC = DC_Lock(physDev); + pSurface = SURFACE_ShareLock(hBmpKern); /* Select it */ pDC->pBitmap = pSurface; @@ -213,7 +216,7 @@ pDC->rcDcRect = pDC->rcVport; /* Release the DC object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); } VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ) @@ -223,7 +226,7 @@ PSURFACE pSurface; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); DPRINT("RosGdiSelectBrush(): dc %x, brush style %x, brush color %x\n", physDev, pLogBrush->lbStyle, pLogBrush->lbColor); @@ -261,7 +264,7 @@ DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", pLogBrush->lbHatch, physDev); break; } - pSurface = GDI_GetObjPtr(hBmpKern, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pSurface = SURFACE_Lock(hBmpKern); pDC->pFillBrush = GreCreatePatternBrush(pSurface); break; @@ -271,7 +274,7 @@ } /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); } HFONT APIENTRY RosGdiSelectFont( HDC physDev, HFONT hfont, HANDLE gdiFont ) @@ -285,7 +288,7 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); DPRINT("RosGdiSelectPen(): dc %x, pen style %x, pen color %x\n", physDev, pLogPen->lopnStyle, pLogPen->lopnColor); @@ -293,7 +296,7 @@ { DPRINT1("Ext pens aren't supported yet!"); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); return; } @@ -314,7 +317,7 @@ TRUE); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); } COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ) @@ -322,13 +325,13 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Set the color */ pDC->crBackgroundClr = color; /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Return the color set */ return color; @@ -357,7 +360,7 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Delete old clipping region */ if (pDC->CombinedClip) @@ -370,7 +373,7 @@ physDev, rcBounds->left, rcBounds->bottom, rcBounds->right, rcBounds->top); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); } BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp) @@ -398,13 +401,13 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Set the color */ pDC->crForegroundClr = color; /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Return the color set */ return color; @@ -415,7 +418,7 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Set DC rectangle */ if (rcDcRect) @@ -438,7 +441,7 @@ } /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); } /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -50,13 +50,13 @@ INT iCaps; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Get device caps from the DC */ iCaps = GreGetDeviceCaps(pDC, cap); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Return result */ return iCaps; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -55,13 +55,13 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Call GRE routine */ GreTextOut(pDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); return TRUE; } @@ -76,7 +76,7 @@ DPRINT("LineTo: (%d,%d)-(%d,%d)\n", x1, y1, x2, y2); /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); scrRect.left = scrRect.top = 0; scrRect.right = 800; @@ -105,7 +105,7 @@ IntEngDeleteClipRegion(pClipObj); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); return TRUE; } @@ -138,7 +138,7 @@ ULONG i; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Capture the points buffer */ _SEH2_TRY @@ -161,7 +161,7 @@ if (!NT_SUCCESS(Status)) { /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Free the buffer if it was allocated */ if (pPoints != pStackBuf) ExFreePool(pPoints); @@ -181,7 +181,7 @@ GrePolygon(pDC, pPoints, count); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); /* Free the buffer if it was allocated */ if (pPoints != pStackBuf) ExFreePool(pPoints); @@ -195,13 +195,13 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Draw the polyline */ GrePolyline(pDC, pt, count); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); return TRUE; } @@ -223,13 +223,13 @@ PDC pDC; /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + pDC = DC_Lock(physDev); /* Draw the rectangle */ GreRectangle(pDC, rc->left, rc->top, rc->right, rc->bottom); /* Release the object */ - GDI_ReleaseObj(physDev); + DC_Unlock(pDC); return TRUE; } 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] Sat Aug 1 00:08:01 2009 @@ -427,7 +427,7 @@ INT DIBWidth; // Check parameters - if (!(bitmap = GDI_GetObjPtr(hBitmap, (SHORT)GDI_OBJECT_TYPE_BITMAP))) + if (!(bitmap = SURFACE_Lock(hBitmap))) { return 0; } @@ -454,7 +454,7 @@ (PVOID) Bits); if (0 == SourceBitmap) { - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -463,7 +463,7 @@ if (NULL == SourceSurf) { EngDeleteSurface((HSURF)SourceBitmap); - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -484,7 +484,7 @@ { EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } @@ -497,7 +497,7 @@ { EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -509,7 +509,7 @@ PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -538,7 +538,7 @@ EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); - GDI_ReleaseObj(bitmap); + SURFACE_Unlock(bitmap); return result; } Copied: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdidbg.c (from r42309, trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdidbg.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -212,11 +212,11 @@ r = 0; DPRINT1("Used entry invalid KernelData\n"); } - if (((POBJ)(pEntry->KernelData))->hHmgr != Handle) + if (((PBASEOBJECT)(pEntry->KernelData))->hHmgr != Handle) { r = 0; DPRINT1("Used entry %ld, has invalid hHmg %p (expected: %p)\n", - i, ((POBJ)(pEntry->KernelData))->hHmgr, Handle); + i, ((PBASEOBJECT)(pEntry->KernelData))->hHmgr, Handle); } nUsed++; } @@ -269,7 +269,7 @@ ULONG FASTCALL -GDIOBJ_IncrementShareCount(POBJ Object) +GDIOBJ_IncrementShareCount(PBASEOBJECT Object) { INT cLocks = InterlockedIncrement((PLONG)&Object->ulShareCount); GDIDBG_CAPTURESHARELOCKER(Object->hHmgr); Copied: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c (from r42309, trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/win32k/objects/gdiobj.c + * FILE: subsystems/win32/win32k/gre/gdiobj.c * PURPOSE: General GDI object manipulation routines * PROGRAMMERS: ... */ @@ -10,7 +10,7 @@ //#define GDI_DEBUG -#include <w32k.h> +#include <win32k.h> #define NDEBUG #include <debug.h> @@ -31,7 +31,7 @@ #include "gdidbg.c" /* static */ /* FIXME: -fno-unit-at-a-time breaks this */ -BOOL INTERNAL_CALL GDI_CleanupDummy(PVOID ObjectBody); +BOOL APIENTRY GDI_CleanupDummy(PVOID ObjectBody); /** GLOBALS *******************************************************************/ @@ -41,42 +41,42 @@ ULONG_PTR ulBodySize; ULONG Tag; GDICLEANUPPROC CleanupProc; -} OBJ_TYPE_INFO, *POBJ_TYPE_INFO; +} OBJ_TYPE_INFO, *PBASEOBJECT_TYPE_INFO; static const OBJ_TYPE_INFO ObjTypeInfo[BASE_OBJTYPE_COUNT] = { {0, 0, 0, NULL}, /* 00 reserved entry */ - {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC */ - {1, 0, 0, NULL}, /* 02 UNUSED1 */ - {1, 0, 0, NULL}, /* 03 UNUSED2 */ - {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN */ - {1, sizeof(SURFACE), TAG_SURFACE, SURFACE_Cleanup}, /* 05 SURFACE */ - {1, sizeof(CLIENTOBJ), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... */ - {1, sizeof(PATH), TAG_PATH, GDI_CleanupDummy}, /* 07 PATH */ - {1, sizeof(PALETTE), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ - {1, sizeof(COLORSPACE), TAG_ICMLCS, GDI_CleanupDummy}, /* 09 ICMLCS, */ - {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */ - {0, 0, TAG_RFONT, NULL}, /* 0b RFONT, unused */ - {0, 0, TAG_PFE, NULL}, /* 0c PFE, unused */ - {0, 0, TAG_PFT, NULL}, /* 0d PFT, unused */ - {0, sizeof(GDICLRXFORM), TAG_ICMCXF, GDI_CleanupDummy}, /* 0e ICMCXF, */ - {0, 0, TAG_SPRITE, NULL}, /* 0f SPRITE, unused */ - {1, sizeof(BRUSH), TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ - {0, 0, TAG_UMPD, NULL}, /* 11 UMPD, unused */ + {0, sizeof(DC), TAG_DC, GDI_CleanupDummy}, /* 01 DC */ + {0, 0, 0, NULL}, /* 02 reserved entry */ + {0, 0, 0, NULL}, /* 03 reserved entry */ + {0, 0, 0, NULL}, /* 04 reserved entry */ + {0, sizeof(SURFACE), TAG_SURFOBJ, GDI_CleanupDummy}, /* 05 SURFACE */ + {0, 0, 0, NULL}, /* 06 reserved entry */ + {0, 0, 0, NULL}, /* 07 reserved entry */ + {0, sizeof(PALETTE), TAG_PALETTE, GDI_CleanupDummy}, /* 08 PAL */ + {0, 0, 0, NULL}, /* 09 ICMLCS, */ + {0, 0, 0, NULL}, /* 0a LFONT */ + {0, 0, 0, NULL}, /* 0b RFONT, unused */ + {0, 0, 0, NULL}, /* 0c PFE, unused */ + {0, 0, 0, NULL}, /* 0d PFT, unused */ + {0, 0, 0, NULL}, /* 0e ICMCXF, */ + {0, 0, 0, NULL}, /* 0f SPRITE, unused */ + {0, 0, 0, NULL}, /* 10 BRUSH, PEN, EXTPEN */ + {0, 0, 0, NULL}, /* 11 UMPD, unused */ {0, 0, 0, NULL}, /* 12 UNUSED4 */ - {0, 0, TAG_SPACE, NULL}, /* 13 SPACE, unused */ + {0, 0, 0, NULL}, /* 13 SPACE, unused */ {0, 0, 0, NULL}, /* 14 UNUSED5 */ - {0, 0, TAG_META, NULL}, /* 15 META, unused */ - {0, 0, TAG_EFSTATE, NULL}, /* 16 EFSTATE, unused */ - {0, 0, TAG_BMFD, NULL}, /* 17 BMFD, unused */ - {0, 0, TAG_VTFD, NULL}, /* 18 VTFD, unused */ - {0, 0, TAG_TTFD, NULL}, /* 19 TTFD, unused */ - {0, 0, TAG_RC, NULL}, /* 1a RC, unused */ - {0, 0, TAG_TEMP, NULL}, /* 1b TEMP, unused */ - {0, sizeof(EDRIVEROBJ), TAG_DRVOBJ, DRIVEROBJ_Cleanup},/* 1c DRVOBJ */ - {0, 0, TAG_DCIOBJ, NULL}, /* 1d DCIOBJ, unused */ - {0, 0, TAG_SPOOL, NULL}, /* 1e SPOOL, unused */ + {0, 0, 0, NULL}, /* 15 META, unused */ + {0, 0, 0, NULL}, /* 16 EFSTATE, unused */ + {0, 0, 0, NULL}, /* 17 BMFD, unused */ + {0, 0, 0, NULL}, /* 18 VTFD, unused */ + {0, 0, 0, NULL}, /* 19 TTFD, unused */ + {0, 0, 0, NULL}, /* 1a RC, unused */ + {0, 0, 0, NULL}, /* 1b TEMP, unused */ + {0, 0, 0, NULL}, /* 1c DRVOBJ */ + {0, 0, 0, NULL}, /* 1d DCIOBJ, unused */ + {0, 0, 0, NULL}, /* 1e SPOOL, unused */ {0, 0, 0, NULL}, /* 1f reserved entry */ }; @@ -88,7 +88,7 @@ * Dummy GDI Cleanup Callback */ /* static */ /* FIXME: -fno-unit-at-a-time breaks this */ -BOOL INTERNAL_CALL +BOOL APIENTRY GDI_CleanupDummy(PVOID ObjectBody) { return TRUE; @@ -98,7 +98,7 @@ * Allocate GDI object table. * \param Size - number of entries in the object table. */ -PGDI_HANDLE_TABLE INTERNAL_CALL +PGDI_HANDLE_TABLE APIENTRY GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject) { PGDI_HANDLE_TABLE HandleTable = NULL; @@ -288,7 +288,7 @@ BOOL -INTERNAL_CALL +APIENTRY GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType) { PGDI_TABLE_ENTRY Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); @@ -304,10 +304,10 @@ return FALSE; } -POBJ INTERNAL_CALL +PBASEOBJECT APIENTRY GDIOBJ_AllocObj(UCHAR BaseType) { - POBJ pObject; + PBASEOBJECT PBASEOBJECTect; ASSERT((BaseType & ~GDIObjTypeTotal) == 0); // BaseType &= GDI_HANDLE_BASETYPE_MASK; @@ -317,21 +317,21 @@ PPAGED_LOOKASIDE_LIST LookasideList; LookasideList = GdiHandleTable->LookasideLists + BaseType; - pObject = ExAllocateFromPagedLookasideList(LookasideList); + PBASEOBJECTect = ExAllocateFromPagedLookasideList(LookasideList); } else { - pObject = ExAllocatePoolWithTag(PagedPool, + PBASEOBJECTect = ExAllocatePoolWithTag(PagedPool, ObjTypeInfo[BaseType].ulBodySize, ObjTypeInfo[BaseType].Tag); } - if (pObject) - { - RtlZeroMemory(pObject, ObjTypeInfo[BaseType].ulBodySize); - } - - return pObject; + if (PBASEOBJECTect) + { + RtlZeroMemory(PBASEOBJECTect, ObjTypeInfo[BaseType].ulBodySize); + } + + return PBASEOBJECTect; } @@ -342,11 +342,11 @@ * * \return Pointer to the allocated object, which is locked. */ -POBJ INTERNAL_CALL +PBASEOBJECT APIENTRY GDIOBJ_AllocObjWithHandle(ULONG ObjectType) { PPROCESSINFO W32Process; - POBJ newObject = NULL; + PBASEOBJECT newObject = NULL; HANDLE CurrentProcessId, LockedProcessId; UCHAR TypeIndex; @@ -453,22 +453,22 @@ } -VOID INTERNAL_CALL -GDIOBJ_FreeObj(POBJ pObject, UCHAR BaseType) +VOID APIENTRY +GDIOBJ_FreeObj(PBASEOBJECT PBASEOBJECTect, UCHAR BaseType) { /* Object must not have a handle! */ - ASSERT(pObject->hHmgr == NULL); + ASSERT(PBASEOBJECTect->hHmgr == NULL); if (ObjTypeInfo[BaseType].bUseLookaside) { PPAGED_LOOKASIDE_LIST LookasideList; LookasideList = GdiHandleTable->LookasideLists + BaseType; - ExFreeToPagedLookasideList(LookasideList, pObject); + ExFreeToPagedLookasideList(LookasideList, PBASEOBJECTect); } else { - ExFreePool(pObject); + ExFreePool(PBASEOBJECTect); } } @@ -484,7 +484,7 @@ * * \bug This function should return VOID and kill the object no matter what... */ -BOOL INTERNAL_CALL +BOOL APIENTRY GDIOBJ_FreeObjByHandle(HGDIOBJ hObj, DWORD ExpectedType) { PGDI_TABLE_ENTRY Entry; @@ -493,8 +493,6 @@ BOOL Silent; GDIDBG_INITLOOPTRACE(); - - DPRINT("GDIOBJ_FreeObj: hObj: 0x%08x\n", hObj); if (GDI_HANDLE_IS_STOCKOBJ(hObj)) { @@ -535,7 +533,7 @@ ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) && ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == (HandleUpper & GDI_ENTRY_BASETYPE_MASK)) ) { - POBJ Object; + PBASEOBJECT Object; Object = Entry->KernelData; @@ -587,7 +585,6 @@ /* * The object is currently locked by another thread, so freeing is forbidden! */ - DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); GDIDBG_TRACECALLER(); GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); @@ -654,29 +651,6 @@ } } - -/*! - * Delete GDI object - * \param hObject object handle - * \return if the function fails the returned value is FALSE. -*/ -BOOL -FASTCALL -GreDeleteObject(HGDIOBJ hObject) -{ - DPRINT("NtGdiDeleteObject handle 0x%08x\n", hObject); - if (!IsObjectDead(hObject)) - { - return NULL != hObject - ? GDIOBJ_FreeObjByHandle(hObject, GDI_OBJECT_TYPE_DONTCARE) : FALSE; - } - else - { - DPRINT1("Attempt DeleteObject 0x%x currently being destroyed!!!\n",hObject); - return TRUE; // return true and move on. - } -} - VOID FASTCALL IntDeleteHandlesForProcess(struct _EPROCESS *Process, ULONG ObjectType) @@ -736,7 +710,7 @@ * Internal function. Called when the process is destroyed to free the remaining GDI handles. * \param Process - PID of the process that will be destroyed. */ -BOOL INTERNAL_CALL +BOOL APIENTRY GDI_CleanupForProcess(struct _EPROCESS *Process) { PEPROCESS CurrentProcess; @@ -787,13 +761,13 @@ * * \todo Get rid of the ExpectedType parameter! */ -PGDIOBJ INTERNAL_CALL +PVOID APIENTRY GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ExpectedType) { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; - POBJ Object = NULL; + PBASEOBJECT Object = NULL; ULONG HandleType, HandleUpper; HandleIndex = GDI_HANDLE_GET_INDEX(hObj); @@ -877,7 +851,6 @@ { /* Unlock the handle table entry. */ (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); - DelayExecution(); continue; } @@ -914,6 +887,20 @@ return Object; } +/*! + * Release GDI object. Every object locked by GDIOBJ_LockObj() must be unlocked. + * You should unlock the object + * as soon as you don't need to have access to it's data. + + * \param Object Object pointer (as returned by GDIOBJ_LockObj). + */ +ULONG FASTCALL +GDIOBJ_UnlockObjByPtr(PBASEOBJECT Object) +{ + INT cLocks = InterlockedDecrement((PLONG)&Object->cExclusiveLock); + ASSERT(cLocks >= 0); + return cLocks; +} /*! * Return pointer to the object by handle (and allow sharing of the handle @@ -926,13 +913,13 @@ * * \todo Get rid of the ExpectedType parameter! */ -PGDIOBJ INTERNAL_CALL +PVOID APIENTRY GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ExpectedType) { ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; - POBJ Object = NULL; + PBASEOBJECT Object = NULL; ULONG_PTR HandleType, HandleUpper; HandleIndex = GDI_HANDLE_GET_INDEX(hObj); @@ -995,7 +982,7 @@ if ( (Entry->KernelData != NULL) && (HandleUpper == (Entry->Type << GDI_ENTRY_UPPER_SHIFT)) ) { - Object = (POBJ)Entry->KernelData; + Object = (PBASEOBJECT)Entry->KernelData; GDIDBG_CAPTURESHARELOCKER(HandleIndex); #ifdef GDI_DEBUG3 @@ -1038,7 +1025,7 @@ return Object; } -BOOL INTERNAL_CALL +BOOL APIENTRY GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle) { PGDI_TABLE_ENTRY Entry; @@ -1062,140 +1049,7 @@ return FALSE; } -BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(HGDIOBJ *phObj) -{ - /* - * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS - * MIGHT ATTEMPT TO LOCK THE OBJECT DURING THIS CALL!!! - */ - PGDI_TABLE_ENTRY Entry; - HANDLE ProcessId, LockedProcessId, PrevProcId; - PTHREADINFO Thread; - HGDIOBJ hObj; - - GDIDBG_INITLOOPTRACE(); - - ASSERT(phObj); - hObj = *phObj; - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); - - Thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); - - if (!GDI_HANDLE_IS_STOCKOBJ(hObj)) - { - ProcessId = PsGetCurrentProcessId(); - LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - - Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); - -LockHandle: - /* lock the object, we must not convert stock objects, so don't check!!! */ - PrevProcId = InterlockedCompareExchangePointer((PVOID*)&Entry->ProcessId, LockedProcessId, ProcessId); - if (PrevProcId == ProcessId) - { - LONG NewType, PrevType, OldType; - - /* we're locking an object that belongs to our process. First calculate - the new object type including the stock object flag and then try to - exchange it.*/ - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ - OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); - /* We are currently not using bits 24..31 (flags) of the type field, but for compatibility - we copy them as we can't get them from the handle */ - OldType |= Entry->Type & GDI_ENTRY_FLAGS_MASK; - - /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType = OldType | GDI_ENTRY_STOCK_MASK; - - /* Try to exchange the type field - but only if the old (previous type) matches! */ - PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); - if (PrevType == OldType && Entry->KernelData != NULL) - { - PTHREADINFO PrevThread; - POBJ Object; - - /* We successfully set the stock object flag. - KernelData should never be NULL here!!! */ - ASSERT(Entry->KernelData); - - Object = Entry->KernelData; - - PrevThread = Object->Tid; - if (Object->cExclusiveLock == 0 || PrevThread == Thread) - { - /* dereference the process' object counter */ - if (PrevProcId != GDI_GLOBAL_PROCESS) - { - PEPROCESS OldProcess; - PPROCESSINFO W32Process; - NTSTATUS Status; - - /* FIXME */ - Status = PsLookupProcessByProcessId((HANDLE)((ULONG_PTR)PrevProcId & ~0x1), &OldProcess); - if (NT_SUCCESS(Status)) - { - W32Process = (PPROCESSINFO)OldProcess->Win32Process; - if (W32Process != NULL) - { - InterlockedDecrement(&W32Process->GDIHandleCount); - } - ObDereferenceObject(OldProcess); - } - } - - hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); - *phObj = hObj; - Object->hHmgr = hObj; - - /* remove the process id lock and make it global */ - (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, GDI_GLOBAL_PROCESS); - - /* we're done, successfully converted the object */ - return TRUE; - } - else - { - GDIDBG_TRACELOOP(hObj, PrevThread, Thread); - - /* WTF?! The object is already locked by a different thread! - Release the lock, wait a bit and try again! - FIXME - we should give up after some time unless we want to wait forever! */ - (void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId); - - DelayExecution(); - goto LockHandle; - } - } - else - { - DPRINT1("Attempted to convert object 0x%x that is deleted! Should never get here!!!\n", hObj); - DPRINT1("OldType = 0x%x, Entry->Type = 0x%x, NewType = 0x%x, Entry->KernelData = 0x%x\n", OldType, Entry->Type, NewType, Entry->KernelData); - } - } - else if (PrevProcId == LockedProcessId) - { - GDIDBG_TRACELOOP(hObj, PrevProcId, ProcessId); - - /* the object is currently locked, wait some time and try again. - FIXME - we shouldn't loop forever! Give up after some time! */ - DelayExecution(); - /* try again */ - goto LockHandle; - } - else - { - DPRINT1("Attempted to convert invalid handle: 0x%x\n", hObj); - } - } - - return FALSE; -} - -BOOL INTERNAL_CALL +BOOL APIENTRY GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS NewOwner) { PGDI_TABLE_ENTRY Entry; @@ -1225,7 +1079,7 @@ if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) { - POBJ Object = Entry->KernelData; + PBASEOBJECT Object = Entry->KernelData; PrevThread = Object->Tid; if (Object->cExclusiveLock == 0 || PrevThread == Thread) @@ -1324,7 +1178,7 @@ return Ret; } -BOOL INTERNAL_CALL +BOOL APIENTRY GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo) { PGDI_TABLE_ENTRY FromEntry; @@ -1351,7 +1205,7 @@ if (FromPrevProcId == FromProcessId) { PTHREADINFO PrevThread; - POBJ Object; + PBASEOBJECT Object; if ((FromEntry->Type & GDI_ENTRY_BASETYPE_MASK) != 0) { @@ -1431,7 +1285,7 @@ return Ret; } -PVOID INTERNAL_CALL +PVOID APIENTRY GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process) { PVOID MappedView = NULL; @@ -1461,328 +1315,114 @@ return MappedView; } -/** PUBLIC FUNCTIONS **********************************************************/ - -/* - Since Brush/Pen and Region objects are sharable,,, we can just use - UserHeapAlloc to allocate the small attribute objects. - - Example Allocating: - - // Save Kernel Space Pointer - (PBRUSH)->pBrushAttr = IntGdiAllocObjAttr(GDIObjType_BRUSH_TYPE); - - // Kernel Space to User Space Pointer - (PGDI_TABLE_ENTRY)->UserData = pBrushAttr; - // Gdi will adjust for heap delta. - - Example Freeing: - - (PGDI_TABLE_ENTRY)->UserData = NULL; // Zero the user ptr. - UserHeapFree((PBRUSH)->pBrushAttr); // Free from kernel ptr. - (PBRUSH)->pBrushAttr = NULL; - - Notes: - Testing with DC_ATTR works but has drawing difficulties. - Base on observation, (Over looking the obvious) we need to supply heap delta - to user space gdi. Now, with testing, looks all normal. - - */ -PVOID -FASTCALL -IntGdiAllocObjAttr(GDIOBJTYPE Type) -{ - PVOID pMemAttr = NULL; - - switch( Type ) - { - case GDIObjType_DC_TYPE: - pMemAttr = UserHeapAlloc(sizeof(DC_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(DC_ATTR)); - break; - case GDIObjType_RGN_TYPE: - pMemAttr = UserHeapAlloc(sizeof(RGN_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(RGN_ATTR)); - break; - case GDIObjType_BRUSH_TYPE: - pMemAttr = UserHeapAlloc(sizeof(BRUSH_ATTR)); - if (pMemAttr) RtlZeroMemory(pMemAttr, sizeof(BRUSH_ATTR)); - break; - default: - break; - } - return pMemAttr; -} - - -BOOL -FASTCALL -IntGdiSetBrushOwner(PBRUSH pbr, DWORD OwnerMask) -{ - HBRUSH hBR; - PEPROCESS Owner = NULL; - PGDI_TABLE_ENTRY pEntry = NULL; - - if (!pbr) return FALSE; - - hBR = pbr->BaseObject.hHmgr; - - if (!hBR || (GDI_HANDLE_GET_TYPE(hBR) != GDI_OBJECT_TYPE_BRUSH)) - return FALSE; - else - { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hBR); - pEntry = &GdiHandleTable->Entries[Index]; - } - - if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) - { - GDIOBJ_ShareUnlockObjByPtr((POBJ)pbr); - return TRUE; - } - - if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) - { - // Set this Brush to inaccessible mode and to an Owner of NONE. -// if (OwnerMask == GDI_OBJ_HMGR_NONE) Owner = OwnerMask; - - if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, Owner)) - return FALSE; - - // Deny user access to User Data. - pEntry->UserData = NULL; // This hBR is inaccessible! - } - - if (OwnerMask == GDI_OBJ_HMGR_POWNED) - { - if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, PsGetCurrentProcess() )) - return FALSE; - - // Allow user access to User Data. - pEntry->UserData = pbr->pBrushAttr; - } - return TRUE; -} - - -BOOL -FASTCALL -IntGdiSetDCOwnerEx( HDC hDC, DWORD OwnerMask, BOOL NoSetBrush) -{ - PDC pDC; - BOOL Ret = FALSE; - - if (!hDC || (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)) return FALSE; - - if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) - { - pDC = DC_LockDc ( hDC ); - MmCopyFromCaller(&pDC->dcattr, pDC->pdcattr, sizeof(DC_ATTR)); - DC_UnlockDc( pDC ); - - DC_FreeDcAttr( hDC ); // Free the dcattr! - - if (!DC_SetOwnership( hDC, NULL )) // This hDC is inaccessible! - return Ret; - } - - if (OwnerMask == GDI_OBJ_HMGR_POWNED) - { - pDC = DC_LockDc ( hDC ); - ASSERT(pDC->pdcattr == &pDC->dcattr); - DC_UnlockDc( pDC ); - - if (!DC_SetOwnership( hDC, PsGetCurrentProcess() )) return Ret; - - DC_AllocateDcAttr( hDC ); // Allocate new dcattr - - DCU_SynchDcAttrtoUser( hDC ); // Copy data from dc to dcattr - } - - if ((OwnerMask != GDI_OBJ_HMGR_NONE) && !NoSetBrush) - { - pDC = DC_LockDc ( hDC ); - if (IntGdiSetBrushOwner((PBRUSH)pDC->dclevel.pbrFill, OwnerMask)) - IntGdiSetBrushOwner((PBRUSH)pDC->dclevel.pbrLine, OwnerMask); - DC_UnlockDc( pDC ); - } - return TRUE; -} - -INT -FASTCALL -GreGetObjectOwner(HGDIOBJ Handle, GDIOBJTYPE ObjType) -{ - INT Ret = GDI_OBJ_HMGR_RESTRICTED; - - if ( GDI_HANDLE_GET_INDEX(Handle) < GDI_HANDLE_COUNT ) - { - PGDI_TABLE_ENTRY pEntry = &GdiHandleTable->Entries[GDI_HANDLE_GET_INDEX(Handle)]; - - if (pEntry->ObjectType == ObjType) - { - if (pEntry->FullUnique == (GDI_HANDLE_GET_UPPER(Handle) >> GDI_ENTRY_UPPER_SHIFT)) - Ret = pEntry->ProcessId & ~1; - } - } - return Ret; -} - - -W32KAPI -HANDLE -APIENTRY -NtGdiCreateClientObj( - IN ULONG ulType -) -{ - POBJ pObject; - HANDLE handle; - - /* Mask out everything that would change the type in a wrong manner */ - ulType &= (GDI_HANDLE_TYPE_MASK & ~GDI_HANDLE_BASETYPE_MASK); - - /* Allocate a new object */ - pObject = GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_CLIOBJ | ulType); - if (!pObject) - { - return NULL; - } - - /* get the handle */ - handle = pObject->hHmgr; - - /* Unlock it */ - GDIOBJ_UnlockObjByPtr(pObject); - - return handle; -} - -W32KAPI -BOOL -APIENTRY -NtGdiDeleteClientObj( - IN HANDLE h -) -{ - /* We first need to get the real type from the handle */ - ULONG type = GDI_HANDLE_GET_TYPE(h); - - /* Check if it's really a CLIENTOBJ */ - if ((type & GDI_HANDLE_BASETYPE_MASK) != GDILoObjType_LO_CLIENTOBJ_TYPE) - { - /* FIXME: SetLastError? */ - return FALSE; - } - return GDIOBJ_FreeObjByHandle(h, type); -} - -INT -FASTCALL -IntGdiGetObject(IN HANDLE Handle, - IN INT cbCount, - IN LPVOID lpBuffer) -{ - PVOID pGdiObject; - INT Result = 0; - DWORD dwObjectType; - - pGdiObject = GDIOBJ_LockObj(Handle, GDI_OBJECT_TYPE_DONTCARE); - if (!pGdiObject) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - dwObjectType = GDIOBJ_GetObjectType(Handle); - switch (dwObjectType) - { - case GDI_OBJECT_TYPE_PEN: - case GDI_OBJECT_TYPE_EXTPEN: - Result = PEN_GetObject((PBRUSH) pGdiObject, cbCount, (PLOGPEN) lpBuffer); // IntGdiCreatePenIndirect - break; - - case GDI_OBJECT_TYPE_BRUSH: - Result = BRUSH_GetObject((PBRUSH ) pGdiObject, cbCount, (LPLOGBRUSH)lpBuffer); - break; - - case GDI_OBJECT_TYPE_BITMAP: - Result = BITMAP_GetObject((SURFACE *) pGdiObject, cbCount, lpBuffer); - break; - case GDI_OBJECT_TYPE_FONT: - Result = FontGetObject((PTEXTOBJ) pGdiObject, cbCount, lpBuffer); -#if 0 - // Fix the LOGFONT structure for the stock fonts - if (FIRST_STOCK_HANDLE <= Handle && Handle <= LAST_STOCK_HANDLE) - { - FixStockFontSizeW(Handle, cbCount, lpBuffer); - } -#endif - break; - - case GDI_OBJECT_TYPE_PALETTE: - Result = PALETTE_GetObject((PPALETTE) pGdiObject, cbCount, lpBuffer); - break; - - default: - DPRINT1("GDI object type 0x%08x not implemented\n", dwObjectType); - break; - } - - GDIOBJ_UnlockObjByPtr(pGdiObject); - - return Result; -} - - - -W32KAPI -INT -APIENTRY -NtGdiExtGetObjectW(IN HANDLE hGdiObj, - IN INT cbCount, - OUT LPVOID lpBuffer) -{ - INT iRetCount = 0; - INT cbCopyCount; - union - { - BITMAP bitmap; - DIBSECTION dibsection; - LOGPEN logpen; - LOGBRUSH logbrush; - LOGFONTW logfontw; - EXTLOGFONTW extlogfontw; - ENUMLOGFONTEXDVW enumlogfontexdvw; - } Object; - - // Normalize to the largest supported object size - cbCount = min((UINT)cbCount, sizeof(Object)); - - // Now do the actual call - iRetCount = IntGdiGetObject(hGdiObj, cbCount, lpBuffer ? &Object : NULL); - cbCopyCount = min((UINT)cbCount, (UINT)iRetCount); - - // Make sure we have a buffer and a copy size - if ((cbCopyCount) && (lpBuffer)) - { - // Enter SEH for buffer transfer - _SEH2_TRY - { - // Probe the buffer and copy it - ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); - RtlCopyMemory(lpBuffer, &Object, cbCopyCount); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - // Clear the return value. - // Do *NOT* set last error here! - iRetCount = 0; - } - _SEH2_END; - } - // Return the count - return iRetCount; +/* Usermode -> kernelmode handle mapping */ +LIST_ENTRY HandleMapping; +KSPIN_LOCK HandleMappingLock; + +typedef struct _HMAPPING +{ + HGDIOBJ hUser; + HGDIOBJ hKernel; + HANDLE hProcessId; + LIST_ENTRY Entry; +} HMAPPING, *PHMAPPING; + +VOID NTAPI +GDI_InitHandleMapping() +{ + /* Initialize handles list and a spinlock */ + InitializeListHead(&HandleMapping); + KeInitializeSpinLock(&HandleMappingLock); +} + +VOID NTAPI +GDI_AddHandleMapping(HGDIOBJ hKernel, HGDIOBJ hUser) +{ + HGDIOBJ hExisting; + PHMAPPING pMapping = ExAllocatePool(NonPagedPool, sizeof(HMAPPING)); + if (!pMapping) return; + + /* Set mapping */ + pMapping->hUser = hUser; + pMapping->hKernel = hKernel; + pMapping->hProcessId = PsGetCurrentProcessId(); + + /* Debug check: see if we already have this mapping */ + hExisting = GDI_MapUserHandle(hUser); + if (hExisting) + DPRINT1("Trying to map already existing mapping %x -> %x to %x!\n", hUser, hExisting, hKernel); + + /* Add it to the list */ + ExInterlockedInsertHeadList(&HandleMapping, &pMapping->Entry, &HandleMappingLock); +} + +HGDIOBJ NTAPI +GDI_MapUserHandle(HGDIOBJ hUser) +{ + KIRQL OldIrql; + PLIST_ENTRY Current; + PHMAPPING Mapping; + HGDIOBJ Found = 0; + HANDLE hProcessId = PsGetCurrentProcessId(); + + /* Acquire the lock and check if the list is empty */ + KeAcquireSpinLock(&HandleMappingLock, &OldIrql); + + /* Traverse the list to find our mapping */ + Current = HandleMapping.Flink; + while(Current != &HandleMapping) + { + Mapping = CONTAINING_RECORD(Current, HMAPPING, Entry); + + /* Check if it's our entry */ + if (Mapping->hUser == hUser && Mapping->hProcessId == hProcessId) + { + /* Found it, save it and break out of the loop */ + Found = Mapping->hKernel; + break; + } + + /* Advance to the next pair */ + Current = Current->Flink; + } + + /* Release the lock and return the entry */ + KeReleaseSpinLock(&HandleMappingLock, OldIrql); + return Found; +} + +VOID NTAPI +GDI_RemoveHandleMapping(HGDIOBJ hUser) +{ + KIRQL OldIrql; + PLIST_ENTRY Current; + PHMAPPING Mapping; + HANDLE hProcessId = PsGetCurrentProcessId(); + + /* Acquire the lock and check if the list is empty */ + KeAcquireSpinLock(&HandleMappingLock, &OldIrql); + + /* Traverse the list to find our mapping */ + Current = HandleMapping.Flink; + while(Current != &HandleMapping) + { + Mapping = CONTAINING_RECORD(Current, HMAPPING, Entry); + + /* Check if it's our entry */ + if (Mapping->hUser == hUser && Mapping->hProcessId == hProcessId) + { + /* Remove and free it */ + RemoveEntryList(Current); + ExFreePool(Mapping); + break; + } + + /* Advance to the next pair */ + Current = Current->Flink; + } + + /* Release the lock and return the entry */ + KeReleaseSpinLock(&HandleMappingLock, OldIrql); } /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -28,13 +28,10 @@ HPALETTE NewPalette; PPALETTE PalGDI; - PalGDI = ExAllocatePool(PagedPool, sizeof(PALETTE)); - if (!PalGDI) - { - return NULL; - } - - NewPalette = alloc_gdi_handle(&PalGDI->BaseObject, (SHORT)GDI_OBJECT_TYPE_PALETTE); + PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + if (!PalGDI) return NULL; + + NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; PalGDI->Mode = Mode; @@ -61,21 +58,9 @@ PalGDI->BlueMask = Blue; } + PALETTE_UnlockPalette(PalGDI); + return NewPalette; -} - -VOID -FASTCALL -PALETTE_FreePaletteByHandle(HGDIOBJ hPalette) -{ - PPALETTE pPal; - DPRINT("RosGdiDeleteDC(%x)\n", hPalette); - - /* Free the handle */ - pPal = free_gdi_handle(hPalette); - - /* Free its storage */ - ExFreePool(pPal); } HPALETTE @@ -87,13 +72,10 @@ PPALETTE PalGDI; UINT i; - PalGDI = ExAllocatePool(PagedPool, sizeof(PALETTE)); - if (!PalGDI) - { - return NULL; - } - - NewPalette = alloc_gdi_handle(&PalGDI->BaseObject, (SHORT)GDI_OBJECT_TYPE_PALETTE); + PalGDI = (PPALETTE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_PALETTE); + if (!PalGDI) return NULL; + + NewPalette = PalGDI->BaseObject.hHmgr; PalGDI->Self = NewPalette; PalGDI->Mode = PAL_INDEXED; @@ -117,6 +99,8 @@ } PalGDI->NumColors = NumColors; + + PALETTE_UnlockPalette(PalGDI); return NewPalette; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -136,44 +136,43 @@ return 0; /* Allocate storage for surface object */ - pSurface = EngAllocMem(FL_ZERO_MEMORY, sizeof(SURFACE), TAG_SURFOBJ); - if (!pSurface) return NULL; - - /* Create a handle for it */ - hSurface = alloc_gdi_handle(&pSurface->BaseObject, (SHORT)GDI_OBJECT_TYPE_BITMAP); + pSurface = (PSURFACE)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BITMAP); + if (!pSurface) return 0; + + /* Save a handle to it */ + hSurface = pSurface->BaseObject.hHmgr; /* Check the format */ if (Format == BMF_4RLE || Format == BMF_8RLE) { DPRINT1("Bitmaps with format 0x%x aren't supported yet!\n", Format); + + /* Cleanup and exit */ + GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); + return 0; + } + + /* Initialize SURFOBJ */ + pSurfObj = &pSurface->SurfObj; + + pSurfObj->hsurf = (HSURF)hSurface; + pSurfObj->sizlBitmap = Size; + pSurfObj->iType = STYPE_BITMAP; + pSurfObj->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); + + pSurfObj->lDelta = abs(Width); + pSurfObj->cjBits = pSurfObj->lDelta * Size.cy; + +#if 0 + if (!Bits) + { + DPRINT1("Bitmaps without Bits aren't supported yet!\n"); /* Cleanup and exit */ free_gdi_handle(hSurface); ExFreePool(pSurface); return 0; } - - /* Initialize SURFOBJ */ - pSurfObj = &pSurface->SurfObj; - - pSurfObj->hsurf = (HSURF)hSurface; - pSurfObj->sizlBitmap = Size; - pSurfObj->iType = STYPE_BITMAP; - pSurfObj->fjBitmap = Flags & (BMF_TOPDOWN | BMF_NOZEROINIT); - - pSurfObj->lDelta = abs(Width); - pSurfObj->cjBits = pSurfObj->lDelta * Size.cy; - -#if 0 - if (!Bits) - { - DPRINT1("Bitmaps without Bits aren't supported yet!\n"); - - /* Cleanup and exit */ - free_gdi_handle(hSurface); - ExFreePool(pSurface); - return 0; - } #endif if (!Bits) { @@ -184,8 +183,7 @@ if (!pSurfObj->pvBits) { /* Cleanup and exit */ - free_gdi_handle(hSurface); - ExFreePool(pSurface); + GDIOBJ_FreeObjByHandle(hSurface, GDI_OBJECT_TYPE_BITMAP); return 0; } } @@ -206,6 +204,9 @@ /* Set the format */ pSurfObj->iBitmapFormat = Format; + /* Unlock the surface */ + SURFACE_Unlock(pSurface); + /* Return handle to it */ return hSurface; } @@ -213,13 +214,7 @@ VOID FASTCALL GreDeleteBitmap(HGDIOBJ hBitmap) { - PSURFACE pSurf; - - /* Free the handle */ - pSurf = free_gdi_handle(hBitmap); - - /* Free its storage */ - EngFreeMem(pSurf); + GDIOBJ_FreeObjByHandle(hBitmap, GDI_OBJECT_TYPE_BITMAP); } LONG FASTCALL Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -3,7 +3,7 @@ typedef struct _DC { - GDIOBJHDR BaseObject; + BASEOBJECT BaseObject; PPDEVOBJ pPDevice; @@ -29,107 +29,11 @@ MATRIX mxWorldToPage; } DC, *PDC; +#define DC_Lock(hDC) \ + ((PDC) GDIOBJ_LockObj ((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) +#define DC_Unlock(pDC) \ + GDIOBJ_UnlockObjByPtr ((PBASEOBJECT)pDC) + INT APIENTRY GreGetDeviceCaps(PDC pDC, INT cap); -/* NOTE! Following structures are direct copies from gdi_private.h */ -typedef enum tagGdiPathState -{ - PATH_Null, - PATH_Open, - PATH_Closed -} GdiPathState; - -typedef struct tagGdiPath -{ - GdiPathState state; - POINT *pPoints; - BYTE *pFlags; - int numEntriesUsed, numEntriesAllocated; - BOOL newStroke; -} GdiPath; - -typedef struct tagGdiFont GdiFont; - -struct saved_visrgn -{ - struct saved_visrgn *next; - HRGN hrgn; -}; - -typedef struct tagUSERDC -{ - GDIOBJHDR header; - HDC hSelf; /* Handle to this DC */ - const struct tagDC_FUNCS *funcs; /* DC function table */ - PVOID physDev; /* Physical device (driver-specific) */ - DWORD thread; /* thread owning the DC */ - LONG refcount; /* thread refcount */ - LONG dirty; /* dirty flag */ - INT saveLevel; - HDC saved_dc; - DWORD_PTR dwHookData; - PVOID hookProc; /* the original SEGPTR ... */ - PVOID hookThunk; /* ... and the thunk to call it */ - - INT wndOrgX; /* Window origin */ - INT wndOrgY; - INT wndExtX; /* Window extent */ - INT wndExtY; - INT vportOrgX; /* Viewport origin */ - INT vportOrgY; - INT vportExtX; /* Viewport extent */ - INT vportExtY; - FLOAT miterLimit; - - int flags; - DWORD layout; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hMetaRgn; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HPEN hPen; - HBRUSH hBrush; - HFONT hFont; - HBITMAP hBitmap; - HANDLE hDevice; - HPALETTE hPalette; - - GdiFont *gdiFont; - GdiPath path; - - UINT font_code_page; - WORD ROPmode; - WORD polyFillMode; - WORD stretchBltMode; - WORD relAbsMode; - WORD backgroundMode; - COLORREF backgroundColor; - COLORREF textColor; - COLORREF dcBrushColor; - COLORREF dcPenColor; - short brushOrgX; - short brushOrgY; - - WORD textAlign; /* Text alignment from SetTextAlign() */ - INT charExtra; /* Spacing from SetTextCharacterExtra() */ - INT breakExtra; /* breakTotalExtra / breakCount */ - INT breakRem; /* breakTotalExtra % breakCount */ - INT MapMode; - INT GraphicsMode; /* Graphics mode */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ -#ifndef __REACTOS__ - ABORTPROC16 pAbortProc16; #endif - INT CursPosX; /* Current position */ - INT CursPosY; - INT ArcDirection; - XFORM xformWorld2Wnd; /* World-to-window transformation */ - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - XFORM xformVport2World; /* Inverse of the above transformation */ - BOOL vport2WorldValid; /* Is xformVport2World valid? */ - RECT BoundsRect; /* Current bounding rect */ - - struct saved_visrgn *saved_visrgn; -} USERDC; - -#endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -1,15 +1,40 @@ #ifndef __WIN32K_GDIOBJ_H #define __WIN32K_GDIOBJ_H +typedef struct _GDI_HANDLE_TABLE +{ +/* The table must be located at the beginning of this structure so it can be + * properly mapped! + */ +////////////////////////////////////////////////////////////////////////////// + GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; + DEVCAPS DevCaps; // Device Capabilities. + FLONG flDeviceUniq; // Device settings uniqueness. + PVOID pvLangPack; // Language Pack. + CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. + DWORD dwCFCount; +////////////////////////////////////////////////////////////////////////////// + PPAGED_LOOKASIDE_LIST LookasideLists; -typedef struct tagGDIOBJHDR + ULONG FirstFree; + ULONG FirstUnused; + +} GDI_HANDLE_TABLE, *PGDI_HANDLE_TABLE; + +extern PGDI_HANDLE_TABLE GdiHandleTable; + +typedef struct _BASEOBJECT { - SHORT type; /* object type (one of the OBJ_* constants) */ - SHORT system : 1; /* system object flag */ - SHORT deleted : 1; /* whether DeleteObject has been called on this object */ - LONG selcount; /* number of times the object is selected in a DC */ -} GDIOBJHDR; + HGDIOBJ hHmgr; + ULONG ulShareCount; + USHORT cExclusiveLock; + USHORT BaseFlags; + PTHREADINFO Tid; +} BASEOBJECT, *PBASEOBJECT; +typedef BOOL (APIENTRY *GDICLEANUPPROC)(PVOID ObjectBody); + +#if 0 extern BOOLEAN GDIOBJ_Init(void); extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, SHORT type); extern void *free_gdi_handle( HGDIOBJ handle ); @@ -17,6 +42,48 @@ extern void GDI_ReleaseObj( HGDIOBJ ); extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ); extern BOOL GDI_dec_ref_count( HGDIOBJ handle ); +#endif + +enum BASEFLAGS +{ + BASEFLAG_LOOKASIDE = 0x80, + + /* ReactOS specific: */ + BASEFLAG_READY_TO_DIE = 0x1000 +}; + +PGDI_HANDLE_TABLE APIENTRY GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject); +PVOID APIENTRY GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process); + +BOOL APIENTRY GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); +BOOL APIENTRY GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); +BOOL APIENTRY GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); +BOOL APIENTRY GDIOBJ_ConvertToStockObj(HGDIOBJ *hObj); +BOOL APIENTRY GDIOBJ_ValidateHandle(HGDIOBJ hObj, ULONG ObjectType); +PBASEOBJECT APIENTRY GDIOBJ_AllocObj(UCHAR ObjectType); +PBASEOBJECT APIENTRY GDIOBJ_AllocObjWithHandle(ULONG ObjectType); +VOID APIENTRY GDIOBJ_FreeObj (PBASEOBJECT pObj, UCHAR ObjectType); +BOOL APIENTRY GDIOBJ_FreeObjByHandle (HGDIOBJ hObj, DWORD ObjectType); +PVOID APIENTRY GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType); +ULONG FASTCALL GDIOBJ_UnlockObjByPtr(PBASEOBJECT Object); + +PVOID APIENTRY GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType); + +/* Inlines */ +ULONG +FORCEINLINE +GDIOBJ_ShareUnlockObjByPtr(PBASEOBJECT Object) +{ + HGDIOBJ hobj = Object->hHmgr; + USHORT flags = Object->BaseFlags; + INT cLocks = InterlockedDecrement((PLONG)&Object->ulShareCount); + ASSERT(cLocks >= 0); + if ((flags & BASEFLAG_READY_TO_DIE) && (cLocks == 0)) + { + GDIOBJ_FreeObjByHandle(hobj, GDI_OBJECT_TYPE_DONTCARE); + } + return cLocks; +} /* Handle mapping */ VOID NTAPI GDI_InitHandleMapping(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -3,7 +3,7 @@ typedef struct _PALETTE { - GDIOBJHDR BaseObject; + BASEOBJECT BaseObject; PALOBJ PalObj; //XLATEOBJ *logicalToSystem; @@ -24,9 +24,6 @@ ULONG Green, ULONG Blue); -VOID FASTCALL -PALETTE_FreePaletteByHandle(HGDIOBJ hPalette); - HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors); @@ -37,8 +34,15 @@ HPALETTE NTAPI BuildDIBPalette(CONST BITMAPINFO *bmi, PINT paletteType); -#define PALETTE_LockPalette(hPalette) ((PPALETTE)GDI_GetObjPtr(hPalette, (SHORT)GDI_OBJECT_TYPE_PALETTE)) -#define PALETTE_UnlockPalette(pPalette) GDI_ReleaseObj((HANDLE)pPalette) +VOID +FORCEINLINE +PALETTE_FreePaletteByHandle(HGDIOBJ hPalette) +{ + GDIOBJ_FreeObjByHandle(hPalette, GDI_OBJECT_TYPE_PALETTE); +} + +#define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) +#define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((PBASEOBJECT)pPalette) #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/surfobj.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -4,7 +4,7 @@ typedef struct _SURFACE { - GDIOBJHDR BaseObject; + BASEOBJECT BaseObject; SURFOBJ SurfObj; FLONG flHooks; @@ -33,6 +33,14 @@ #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions +#define SURFACE_Lock(hBMObj) \ + ((PSURFACE) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +#define SURFACE_ShareLock(hBMObj) \ + ((PSURFACE) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)) +#define SURFACE_Unlock(pBMObj) \ + GDIOBJ_UnlockObjByPtr ((PBASEOBJECT)pBMObj) +#define SURFACE_ShareUnlock(pBMObj) \ + GDIOBJ_ShareUnlockObjByPtr ((PBASEOBJECT)pBMObj) #define SURFACE_LockBitmapBits(x) #define SURFACE_UnlockBitmapBits(x) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -5,9 +5,11 @@ #define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ #define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ #define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ +#define TAG_DC TAG('D', 'C', ' ', ' ') /* DC */ #define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng event allocation */ #define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ #define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ +#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ #define TAG_GSEM TAG('G', 's', 'e', 'm') /* Gdi Semaphore */ #define TAG_SURFOBJ TAG('S', 'R', 'F', 'O') /* surface object */ #define TAG_PALETTE TAG('G', 'l', 'a', '8') Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -22,6 +22,7 @@ struct msg_queue *queue; /* main message queue */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ + LONG GDIHandleCount; /* kernelmode GDI handles count */ } PROCESSINFO; #include <pshpack1.h> Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Aug 1 00:08:01 2009 @@ -26,6 +26,8 @@ HANDLE GlobalUserHeap = NULL; PSECTION_OBJECT GlobalUserHeapSection = NULL; +PGDI_HANDLE_TABLE GdiHandleTable = NULL; +PSECTION_OBJECT GdiTableSection = NULL; /* PRIVATE FUNCTIONS *********************************************************/ @@ -333,7 +335,15 @@ init_directories(); /* Initialize GDI objects implementation */ - if (!GDIOBJ_Init()) return STATUS_UNSUCCESSFUL; + GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); + if (GdiHandleTable == NULL) + { + DPRINT1("Failed to initialize the GDI handle table.\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Initialize handle-mapping */ + GDI_InitHandleMapping(); /* Init video driver implementation */ InitDcImpl();

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