Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56485: [GDI32_APITEST] Add tests for SetBrushOrgEx
by tkreuzer＠svn.reactos.org 03 May '12

03 May '12

Author: tkreuzer Date: Thu May 3 18:54:19 2012 New Revision: 56485 URL: http://svn.reactos.org/svn/reactos?rev=56485&view=rev Log: [GDI32_APITEST] Add tests for SetBrushOrgEx Added: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c (with props) Added: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c (added) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Thu May 3 18:54:19 2012 @@ -1,0 +1,76 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetBrushOrgEx + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) +{ + BOOL bResult; + + SetLastError(0); + + _SEH2_TRY + { + bResult = SetBrushOrgEx(hdc, x, y, ppt); + } + _SEH2_EXCEPT(1) + { + bResult = -1; + } + _SEH2_END; + + ok(bResult == bExp, "line %ld: Wrong result, expected %ld, got %ld\n", + ulLine, bExp, bResult); + ok(GetLastError() == dwErrExp,"line %ld: Wrong error, expected %lx, got %lx\n", + ulLine, dwErrExp, GetLastError()); +} + +#define TEST_SET(hdc, x, y, ppt, bExp, dwErrExp) \ + Test_Set(__LINE__, hdc, x, y, ppt, bExp, dwErrExp) + +void Test_SetBrushOrgEx() +{ + HDC hdc; + POINT ptOldOrg; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "could not ceate DC\n"); + + TEST_SET(0, 0, 0, NULL, 0, ERROR_INVALID_HANDLE); + TEST_SET(0, 0, 0, (LPPOINT)-1, 0, ERROR_INVALID_HANDLE); + TEST_SET(0, 0, 0, &ptOldOrg, 0, ERROR_INVALID_HANDLE); + TEST_SET(hdc, 1, 2, &ptOldOrg, 1, 0); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, 1); + ok_long(ptOldOrg.y, 2); + + ptOldOrg.x = 0; ptOldOrg.y = 0; + TEST_SET(hdc, 1, 2, (LPPOINT)-1, -1, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + + + TEST_SET(hdc, -10000, -20000000, &ptOldOrg, 1, 0); + ok_long(ptOldOrg.x, 0); + ok_long(ptOldOrg.y, 0); + SetBrushOrgEx(hdc, 0, 0, &ptOldOrg); + ok_long(ptOldOrg.x, -10000); + ok_long(ptOldOrg.y, -20000000); + + +} + +START_TEST(SetBrushOrgEx) +{ + Test_SetBrushOrgEx(); +} + Propchange: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 56484: [TCPIP] - Update the cached link and IP information when a link status change occurs
by cgutman＠svn.reactos.org 03 May '12

03 May '12

Author: cgutman Date: Thu May 3 18:38:59 2012 New Revision: 56484 URL: http://svn.reactos.org/svn/reactos?rev=56484&view=rev Log: [TCPIP] - Update the cached link and IP information when a link status change occurs Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu May 3 18:38:59 2012 @@ -734,6 +734,10 @@ Context->Adapter->CompletingReset = FALSE; + /* Update the IP and link status information cached in TCP */ + TCPUpdateInterfaceIPInformation(Interface); + TCPUpdateInterfaceLinkStatus(Interface); + /* We're done here if the adapter isn't connected */ if (Context->State != LAN_STATE_STARTED) {

1 0

[tkreuzer] 56483: [WIN32K] Remove debug break point. Thanks to r3ddr4g0n for noticing.
by tkreuzer＠svn.reactos.org 03 May '12

03 May '12

Author: tkreuzer Date: Thu May 3 15:19:47 2012 New Revision: 56483 URL: http://svn.reactos.org/svn/reactos?rev=56483&view=rev Log: [WIN32K] Remove debug break point. Thanks to r3ddr4g0n for noticing. Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Thu May 3 15:19:47 2012 @@ -374,8 +374,6 @@ PSURFACE psurf; HSURF hsurf; -__debugbreak(); - /* Allocate a surface */ psurf = SURFACE_AllocSurface(STYPE_DEVICE, sizl.cx,

1 0

[tkreuzer] 56482: [WIN32K] Only set the surface's bitmap bits when iType == STYPE_BITMAP. Fixes booting with vbox drivers installed.
by tkreuzer＠svn.reactos.org 03 May '12

03 May '12

Author: tkreuzer Date: Thu May 3 14:39:53 2012 New Revision: 56482 URL: http://svn.reactos.org/svn/reactos?rev=56482&view=rev Log: [WIN32K] Only set the surface's bitmap bits when iType == STYPE_BITMAP. Fixes booting with vbox drivers installed. Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Thu May 3 14:39:53 2012 @@ -257,25 +257,26 @@ RtlZeroMemory(pso->pvBits, cjBits); } } + + /* Set pvScan0 and lDelta */ + if (fjBitmap & BMF_TOPDOWN) + { + /* Topdown is the normal way */ + pso->pvScan0 = pso->pvBits; + pso->lDelta = cjWidth; + } + else + { + /* Inversed bitmap (bottom up) */ + pso->pvScan0 = ((PCHAR)pso->pvBits + pso->cjBits - cjWidth); + pso->lDelta = -(LONG)cjWidth; + } } else { /* There are no bitmap bits */ - pso->pvBits = NULL; - } - - /* Set pvScan0 and lDelta */ - if (fjBitmap & BMF_TOPDOWN) - { - /* Topdown is the normal way */ - pso->pvScan0 = pso->pvBits; - pso->lDelta = cjWidth; - } - else - { - /* Inversed bitmap (bottom up) */ - pso->pvScan0 = ((PCHAR)pso->pvBits + pso->cjBits - cjWidth); - pso->lDelta = -(LONG)cjWidth; + pso->pvScan0 = pso->pvBits = NULL; + pso->lDelta = 0; } /* Assign a default palette and increment its reference count */ @@ -373,6 +374,8 @@ PSURFACE psurf; HSURF hsurf; +__debugbreak(); + /* Allocate a surface */ psurf = SURFACE_AllocSurface(STYPE_DEVICE, sizl.cx,

1 0

[tkreuzer] 56481: [WIN32K] Revert a part of 56478.
by tkreuzer＠svn.reactos.org 03 May '12

03 May '12

Author: tkreuzer Date: Thu May 3 11:14:11 2012 New Revision: 56481 URL: http://svn.reactos.org/svn/reactos?rev=56481&view=rev Log: [WIN32K] Revert a part of 56478. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu May 3 11:14:11 2012 @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window == (PWND)HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != (PWND)HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

1 0

[akhaldi] 56480: [WINED3D] * Fix msvc x64 build. See issue #7032 for more details.
by akhaldi＠svn.reactos.org 02 May '12

02 May '12

Author: akhaldi Date: Wed May 2 22:48:35 2012 New Revision: 56480 URL: http://svn.reactos.org/svn/reactos?rev=56480&view=rev Log: [WINED3D] * Fix msvc x64 build. See issue #7032 for more details. Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed May 2 22:48:35 2012 @@ -37,12 +37,6 @@ wined3d_main.c ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) -if(ARCH MATCHES amd64) -list(APPEND SOURCE - powf.c - sqrtf.c) -endif() - add_library(wined3d SHARED ${SOURCE} version.rc)

1 0

[fireball] 56479: [LICENSE] - Add the linking exception text to the official ReactOS licensing text. Previously, the exception text was only available at the ReactOS website with no references from...
by fireball＠svn.reactos.org 02 May '12

02 May '12

Author: fireball Date: Wed May 2 21:36:27 2012 New Revision: 56479 URL: http://svn.reactos.org/svn/reactos?rev=56479&view=rev Log: [LICENSE] - Add the linking exception text to the official ReactOS licensing text. Previously, the exception text was only available at the ReactOS website with no references from the source code. Modified: trunk/reactos/COPYING Modified: trunk/reactos/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/COPYING?rev=56479&r1=56478… ============================================================================== --- trunk/reactos/COPYING [iso-8859-1] (original) +++ trunk/reactos/COPYING [iso-8859-1] Wed May 2 21:36:27 2012 @@ -337,3 +337,12 @@ consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. + + +ReactOS may be used, runtime linked, and distributed with non-free software +(meaning that such software has no obligations to open-source, or render +free, their non-free code) such as commercial device drivers and commercial +applications. This exception does not alter any other responsibilities of +the licensee under the GPL (meaning that such software must still obey +the GPL for the free ("open-sourced") code that has been integrated into +the said software).

1 0

[tkreuzer] 56478: [WIN32K] A pointer is not a handle. A handle is not a pointer. At least in most cases. Defining STRICT in win32k revealed horrible things...
by tkreuzer＠svn.reactos.org 02 May '12

02 May '12

Author: tkreuzer Date: Wed May 2 19:29:33 2012 New Revision: 56478 URL: http://svn.reactos.org/svn/reactos?rev=56478&view=rev Log: [WIN32K] A pointer is not a handle. A handle is not a pointer. At least in most cases. Defining STRICT in win32k revealed horrible things... Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/mouse.c trunk/reactos/win32ss/gdi/eng/pdevobj.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/reactx/ntddraw/dxeng.c trunk/reactos/win32ss/user/ntuser/caret.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/misc/registry.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -165,7 +165,7 @@ psurfRealize = SURFACE_ShareLockSurface(hbmpRealize); /* Already delete the pattern bitmap (will be kept until dereferenced) */ - EngDeleteSurface(hbmpRealize); + EngDeleteSurface((HSURF)hbmpRealize); if (!psurfRealize) { Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -477,11 +477,11 @@ failure: /* Cleanup surfaces */ - if (hbmMask) EngDeleteSurface(hbmMask); + if (hbmMask) EngDeleteSurface((HSURF)hbmMask); if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask); - if (hbmColor) EngDeleteSurface(hbmColor); + if (hbmColor) EngDeleteSurface((HSURF)hbmColor); if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); - if (hbmSave) EngDeleteSurface(hbmSave); + if (hbmSave) EngDeleteSurface((HSURF)hbmSave); if (psurfSave) SURFACE_ShareUnlockSurface(psurfSave); return SPS_ERROR; Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -832,7 +832,7 @@ for (ppdev = gppdevList; ppdev; ppdev = ppdev->ppdevNext) { /* Compare with the given HDEV */ - if (ppdev == hdev) + if (ppdev == (PPDEVOBJ)hdev) { /* Found the PDEV! Get it's dhpdev and break */ dhpdev = ppdev->dhpdev; Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -138,7 +138,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hDCDest; ahDC[1] = hDCSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -286,7 +286,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hdcDst; ahDC[1] = hdcSrc ; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -440,7 +440,7 @@ DPRINT("Locking DCs\n"); ahDC[0] = hdcDest; ahDC[1] = UsesSource ? hdcSrc : NULL; - if (!GDIOBJ_bLockMultipleObjects(2, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); @@ -635,7 +635,7 @@ ahDC[0] = hDCDest; ahDC[1] = UsesSource ? hDCSrc : NULL; ahDC[2] = UsesMask ? hDCMask : NULL; - if (!GDIOBJ_bLockMultipleObjects(3, ahDC, apObj, GDIObjType_DC_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { DPRINT1("Invalid dc handle (dest=0x%08x, src=0x%08x) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -3346,7 +3346,7 @@ ahrgn[0] = hrgnDst; ahrgn[1] = hrgnSrc1; ahrgn[2] = iMode != RGN_COPY ? hrgnSrc2 : NULL; - if (!GDIOBJ_bLockMultipleObjects(3, ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) + if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahrgn, (PVOID*)aprgn, GDIObjType_RGN_TYPE)) { DPRINT1("NtGdiCombineRgn: %p, %p, %p, %d\n", hrgnDst, hrgnSrc1, hrgnSrc2, iMode); Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=56478&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed May 2 19:29:33 2012 @@ -11,6 +11,7 @@ /* INCLUDES ******************************************************************/ #define _NO_COM +#define STRICT /* DDK/NDK/SDK headers */ #undef NTDDI_VERSION Modified: trunk/reactos/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/ntddraw/dxe… ============================================================================== --- trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/ntddraw/dxeng.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -533,7 +533,7 @@ DPRINT1("hDev : 0x%08lx\n",hDev); - Resource = ppdev->hsemDevLock; + Resource = (PERESOURCE)ppdev->hsemDevLock; if (Resource) { @@ -564,7 +564,7 @@ DxEngUnlockHdev(HDEV hDev) { PPDEVOBJ ppdev = (PPDEVOBJ)hDev; - PERESOURCE Resource = ppdev->hsemDevLock; + PERESOURCE Resource = (PERESOURCE)ppdev->hsemDevLock; DPRINT1("ReactX Calling : DxEngUnlockHdev \n"); @@ -674,7 +674,7 @@ APIENTRY DxEngIsHdevLockedByCurrentThread(HDEV hDev) { // Based on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. - PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock; + PERESOURCE pSem = (PERESOURCE)(((PPDEVOBJ)hDev)->hsemDevLock); return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Caret functions @@ -164,7 +164,8 @@ if(ThreadQueue->CaretInfo->Visible) { - IntKillTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, TRUE); + PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + IntKillTimer(pwnd, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); ThreadQueue->CaretInfo->Visible = 0; @@ -247,7 +248,8 @@ if (ThreadQueue->CaretInfo->Visible) { - IntKillTimer(hWnd, IDCARETTIMER, TRUE); + PWND pwnd = UserGetWindowObject(hWnd); + IntKillTimer(pwnd, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); } Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -15,7 +15,7 @@ CS_GLOBALCLASS|CS_DBLCLKS, NULL, 0, - IDC_ARROW, + (HICON)IDC_ARROW, (HBRUSH)(COLOR_BACKGROUND + 1), FNID_DESKTOP, ICLS_DESKTOP @@ -24,7 +24,7 @@ CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_SWITCH, ICLS_SWITCH @@ -33,7 +33,7 @@ CS_DBLCLKS|CS_SAVEBITS, NULL, // Use User32 procs sizeof(LONG), - IDC_ARROW, + (HICON)IDC_ARROW, (HBRUSH)(COLOR_MENU + 1), FNID_MENU, ICLS_MENU @@ -42,7 +42,7 @@ CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC, NULL, // Use User32 procs sizeof(SBWND)-sizeof(WND), - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_SCROLLBAR, ICLS_SCROLLBAR @@ -51,7 +51,7 @@ 0, NULL, // Use User32 procs 0, - IDC_ARROW, + (HICON)IDC_ARROW, 0, FNID_ICONTITLE, ICLS_ICONTITLE @@ -60,7 +60,7 @@ CS_GLOBALCLASS, NULL, // Use User32 procs 0, - IDC_ARROW, + (HICON)IDC_ARROW, NULL, FNID_MESSAGEWND, ICLS_HWNDMESSAGE Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -173,7 +173,7 @@ { pMemObj->cbData = sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage; memcpy(pMemObj->Data, &bi, sizeof(BITMAPINFOHEADER)); - NtGdiGetDIBitsInternal(hdc, pMemObj->Data, 0, bm.bmHeight, (LPBYTE)pMemObj->Data + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); + NtGdiGetDIBitsInternal(hdc, hBm, 0, bm.bmHeight, (LPBYTE)pMemObj->Data + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); IntAddFormatedData(pWinStaObj, CF_DIB, hMem, TRUE, TRUE); } @@ -478,7 +478,7 @@ NtUserCloseClipboard(VOID) { BOOL bRet; - + UserEnterExclusive(); bRet = UserCloseClipboard(); UserLeave(); @@ -714,7 +714,7 @@ pWinStaObj = IntGetWinStaForCbAccess(); if (!pWinStaObj) goto cleanup; - + if (pWinStaObj->pClipBase == NULL) { iRet = 0; @@ -1002,7 +1002,7 @@ cleanup: if(pWinStaObj) ObDereferenceObject(pWinStaObj); - + UserLeave(); return hWndNext; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -237,7 +237,7 @@ pwstrDesktop = wcschr(DesktopPath->Buffer, L'\\'); if(pwstrDesktop != NULL) { - *pwstrDesktop = 0; + *pwstrDesktop = 0; pwstrDesktop++; pwstrWinsta = DesktopPath->Buffer; } @@ -245,7 +245,7 @@ { pwstrDesktop = DesktopPath->Buffer; pwstrWinsta = NULL; - } + } TRACE("IntParseDesktopPath pwstrWinsta:%S pwstrDesktop:%S\n", pwstrWinsta, pwstrDesktop); } @@ -279,7 +279,7 @@ if(!pwstrDesktop) pwstrDesktop = L"Default"; } - + if(*hWinSta == NULL) { swprintf(wstrWinstaFullName, L"%wZ\\%ws", &gustrWindowStationsDir, pwstrWinsta); @@ -371,7 +371,7 @@ (PVOID*)Object, NULL); - TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", + TRACE("IntValidateDesktopHandle: handle:0x%x obj:0x%x access:0x%x Status:0x%x\n", Desktop, *Object, DesiredAccess, Status); if (!NT_SUCCESS(Status)) @@ -1042,7 +1042,7 @@ /* * Try to open already existing desktop */ - + Status = ObOpenObjectByName( ObjectAttributes, ExDesktopObjectType, @@ -1087,7 +1087,7 @@ KernelMode, (PVOID)&DesktopObject, NULL); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("Failed to reference desktop object\n"); RETURN(NULL); @@ -1243,7 +1243,7 @@ { ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); } - if (!NoHooks && ptiCurrent) + if (!NoHooks && ptiCurrent) { ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -1355,7 +1355,7 @@ dwDesiredAccess, ExDesktopObjectType, UserMode, - &hdesk); + (PHANDLE)&hdesk); ObDereferenceObject(pdesk); @@ -1818,12 +1818,12 @@ return FALSE; } } - + pdeskOld = pti->rpdesk; hdeskOld = pti->hdesk; pctiOld = pti->pcti; - /* do the switch */ + /* do the switch */ if(pdesk != NULL) { pti->rpdesk = pdesk; @@ -1855,7 +1855,7 @@ pci->pDeskInfo = NULL; pci->pClientThreadInfo = NULL; } - + /* clean up the old desktop */ if(pdeskOld != NULL) { Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -15,7 +15,7 @@ typedef struct _HOOKPACK { - PHOOK pHk; + PHOOK pHk; LPARAM lParam; PVOID pHookStructs; } HOOKPACK, *PHOOKPACK; @@ -42,7 +42,7 @@ { if(!Unload && !(ppi->W32PF_flags & W32PF_APIHOOKLOADED)) { - /* A callback in user mode can trigger UserLoadApiHook to be called and + /* A callback in user mode can trigger UserLoadApiHook to be called and as a result IntLoadHookModule will be called recursively. To solve this we set the flag that means that the appliaction has loaded the api hook before the callback and in case of error we remove it */ @@ -80,11 +80,11 @@ } /* -IntHookModuleUnloaded: -Sends a internal message to all threads of the requested desktop -and notifies them that a global hook was destroyed -and an injected module must be unloaded. -As a result, IntLoadHookModule will be called for all the threads that +IntHookModuleUnloaded: +Sends a internal message to all threads of the requested desktop +and notifies them that a global hook was destroyed +and an injected module must be unloaded. +As a result, IntLoadHookModule will be called for all the threads that will receive the special purpose internal message. */ BOOL @@ -106,7 +106,7 @@ /* FIXME: Do some more security checks here */ /* FIXME: The first check is a reactos specific hack for system threads */ - if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && + if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && ptiCurrent->ppi != ppiCsr) { if(ptiCurrent->ppi->W32PF_flags & W32PF_APIHOOKLOADED) @@ -129,8 +129,8 @@ return TRUE; } -BOOL -FASTCALL +BOOL +FASTCALL UserLoadApiHook() { return IntLoadHookModule(WH_APIHOOK, 0, FALSE); @@ -436,7 +436,7 @@ break; case HCBT_ACTIVATE: - Size = sizeof(CBTACTIVATESTRUCT); + Size = sizeof(CBTACTIVATESTRUCT); break; case HCBT_CREATEWND: /* Handle ANSI? */ @@ -876,8 +876,8 @@ } } - if (!BadChk) - { + if (!BadChk) + { lResult = co_HOOK_CallHookNext(Hook, Code, wParam, (LPARAM)(lParam ? &EventMsg : NULL)); if (lParam) @@ -917,14 +917,14 @@ case WH_FOREGROUNDIDLE: case WH_KEYBOARD: case WH_SHELL: - lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); break; default: ERR("Unsupported HOOK Id -> %d\n",Hook->HookId); break; } - return lResult; + return lResult; } PHOOK @@ -932,7 +932,7 @@ IntGetHookObject(HHOOK hHook) { PHOOK Hook; - + if (!hHook) { EngSetLastError(ERROR_INVALID_HOOK_HANDLE); @@ -1274,7 +1274,7 @@ continue; } UserRefObjectCo(Hook, &Ref); - + /* Hook->Thread is null, we hax around this with Hook->head.pti. */ ptiHook = Hook->head.pti; @@ -1421,7 +1421,7 @@ HHOOK APIENTRY -NtUserSetWindowsHookAW( int idHook, +NtUserSetWindowsHookAW( int idHook, HOOKPROC lpfn, BOOL Ansi) { @@ -1523,7 +1523,7 @@ RETURN( NULL); } - if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && + if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && (HookId == WH_GETMESSAGE || HookId == WH_CALLWNDPROC || HookId == WH_CBT || @@ -1539,7 +1539,7 @@ } } else /* System-global hook */ - { + { ptiHook = pti; // gptiCurrent; if ( !Mod && (HookId == WH_GETMESSAGE || @@ -1570,7 +1570,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, &Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); if (!Hook) { Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -750,7 +750,7 @@ if (hbm) GreDeleteObject(hbm); if (hdc) - UserReleaseDC(hWnd, hdc, FALSE); + UserReleaseDC(pWnd, hdc, FALSE); } /* Modified: trunk/reactos/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/registry.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -33,7 +33,7 @@ NULL); /* Open the key */ - Status = ZwOpenKey(&hkey, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey((PHANDLE)&hkey, KEY_READ, &ObjectAttributes); if (NT_SUCCESS(Status)) { *phkey = hkey; @@ -198,7 +198,7 @@ NULL); /* Open the key */ - Status = ZwOpenKey(&hkey, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey((PHANDLE)&hkey, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) { return FALSE; @@ -292,7 +292,7 @@ Status = RtlAppendUnicodeToString(&usKeyName, pwszKeyName); if (!NT_SUCCESS(Status)) { - DPRINT1("RtlAppendUnicodeToString failed with Status=%lx, buf:%d,%d\n", + DPRINT1("RtlAppendUnicodeToString failed with Status=%lx, buf:%d,%d\n", Status, usKeyName.Length, usKeyName.MaximumLength); return FALSE; } @@ -305,7 +305,7 @@ NULL); /* Open or create the key */ - Status = ZwCreateKey(&hkey, + Status = ZwCreateKey((PHANDLE)&hkey, KEY_READ | KEY_WRITE, &ObjectAttributes, 0, Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -117,7 +117,7 @@ /* Get the screen DC */ if(!(hdcScreen = IntGetScreenDC())) { - return (HCURSOR)0; + return NULL; } OldCursor = MessageQueue->CursorObject; @@ -517,7 +517,7 @@ if (co_HOOK_CallHooks(WH_MOUSE_LL, HC_ACTION, Msg->message, (LPARAM) &MouseHookData)) return; } - + /* Get the desktop window */ pwndDesktop = UserGetDesktopWindow(); if (!pwndDesktop) return; @@ -1727,8 +1727,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1790,8 +1790,8 @@ 3: handle to the window whose messages are to be retrieved. */ if ( ( !Window || // 1 - ( Window == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 - ( Window != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 + ( Window->head.h == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window->head.h != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed May 2 19:29:33 2012 @@ -188,7 +188,7 @@ RtlZeroMemory(psmwp->acvr, count * sizeof(CVR)); psmwp->bHandle = TRUE; psmwp->ccvr = 0; // actualCount - psmwp->ccvrAlloc = count; // suggestedCount + psmwp->ccvrAlloc = count; // suggestedCount RETURN((DWORD_PTR)hDwp); } @@ -634,7 +634,7 @@ UserRefObjectCo(Window, &Ref); HelpId = IntGetProp(Window, gpsi->atomContextHelpIdProp); - + UserDerefObjectCo(Window); UserLeave(); return (DWORD)HelpId->Data; @@ -665,7 +665,7 @@ switch (Routine) { case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: - return IntKillTimer(hWnd, (UINT_PTR)Param, TRUE); + return IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE); case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID: { @@ -702,7 +702,7 @@ UserRefObjectCo(pWnd, &Ref); if (pWnd->head.pti->ppi == PsGetCurrentProcessWin32Process() && - pWnd->cbwndExtra == DLGWINDOWEXTRA && + pWnd->cbwndExtra == DLGWINDOWEXTRA && !(pWnd->state & WNDS_SERVERSIDEWINDOWPROC)) { if (Param) @@ -716,7 +716,7 @@ pWnd->state &= ~WNDS_DIALOGWINDOW; } } - + UserDerefObjectCo(pWnd); UserLeave(); return 0;

1 0

[tkreuzer] 56477: [WIN32K] - Add some code stub and comments for realizing DIB brush palettes - Move some function prototypes
by tkreuzer＠svn.reactos.org 02 May '12

02 May '12

Author: tkreuzer Date: Wed May 2 18:55:23 2012 New Revision: 56477 URL: http://svn.reactos.org/svn/reactos?rev=56477&view=rev Log: [WIN32K] - Add some code stub and comments for realizing DIB brush palettes - Move some function prototypes Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Wed May 2 18:55:23 2012 @@ -38,6 +38,7 @@ pebo->ppalSurf = pebo->psurfTrg->ppal; GDIOBJ_vReferenceObjectByPointer(&pebo->ppalSurf->BaseObject); + //pebo->ppalDC = pdc->dclevel.ppal; if (pbrush->flAttrs & GDIBRUSH_IS_NULL) { @@ -194,6 +195,7 @@ PSURFACE psurfPattern, psurfMask; PPDEVOBJ ppdev = NULL; EXLATEOBJ exlo; + PPALETTE ppalPattern; /* All EBRUSHOBJs have a surface, see EBRUSHOBJ_vInit */ ASSERT(pebo->psurfTrg); @@ -214,9 +216,22 @@ /* FIXME: implement mask */ psurfMask = NULL; + /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ + if (pebo->pbrush->flAttrs & GDIBRUSH_IS_DIBPALCOLORS) + { + ASSERT(FALSE); + ppalPattern = 0; //CreateDIBPalette(psurfPattern->ppal, pebo->ppalDC); + // pebo->ppalDIB = ppalPattern; + } + else + { + /* The palette is already as it should be */ + ppalPattern = psurfPattern->ppal; + } + /* Initialize XLATEOBJ for the brush */ EXLATEOBJ_vInitialize(&exlo, - psurfPattern->ppal, + ppalPattern, pebo->psurfTrg->ppal, 0, pebo->crCurrentBack, Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Wed May 2 18:55:23 2012 @@ -141,3 +141,16 @@ BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD); +HBRUSH APIENTRY +IntGdiCreatePatternBrush( + HBITMAP hBitmap); + +HBRUSH APIENTRY +IntGdiCreateSolidBrush( + COLORREF Color); + +HBRUSH APIENTRY +IntGdiCreateNullBrush(VOID); + +VOID FASTCALL +IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color); Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Wed May 2 18:55:23 2012 @@ -4,20 +4,6 @@ extern HDC hSystemBM; extern HSEMAPHORE hsemDriverMgmt; - -HBRUSH APIENTRY -IntGdiCreatePatternBrush( - HBITMAP hBitmap); - -HBRUSH APIENTRY -IntGdiCreateSolidBrush( - COLORREF Color); - -HBRUSH APIENTRY -IntGdiCreateNullBrush(VOID); - -VOID FASTCALL -IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color); /* Line functions */

1 0

[tkreuzer] 56476: [WIN32K] - Fix a palette leak in DIB_CreateDIBSection - Remove PALETTE_AllocPalette and PALETTE_AllocPaletteIndexedRGB, use PALETTE_AllocPalWithHandle instead
by tkreuzer＠svn.reactos.org 02 May '12

02 May '12

Author: tkreuzer Date: Wed May 2 13:56:55 2012 New Revision: 56476 URL: http://svn.reactos.org/svn/reactos?rev=56476&view=rev Log: [WIN32K] - Fix a palette leak in DIB_CreateDIBSection - Remove PALETTE_AllocPalette and PALETTE_AllocPaletteIndexedRGB, use PALETTE_AllocPalWithHandle instead Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed May 2 13:56:55 2012 @@ -1599,7 +1599,14 @@ /* HACK */ if(hpal != (HPALETTE)0xFFFFFFFF) { - bmp->ppal = PALETTE_ShareLockPalette(hpal); + PPALETTE ppal = PALETTE_ShareLockPalette(hpal); + + if (ppal) + { + if (bmp->ppal) PALETTE_ShareUnlockPalette(bmp->ppal); + bmp->ppal = ppal; + } + /* Lazy delete hpal, it will be freed at surface release */ GreDeleteObject(hpal); } @@ -1771,10 +1778,11 @@ { WORD bits; ULONG ColorCount; - HPALETTE hPal; + HPALETTE hpal; + PPALETTE ppal; ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); - INT paletteType; + ULONG paletteType, i; // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1833,18 +1841,41 @@ ColorCount = bmi->bmiHeader.biClrUsed; } - if (PAL_INDEXED == paletteType) - { - hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)pdwColors); + if (paletteType == PAL_INDEXED) + { + RGBQUAD* pColors = (RGBQUAD*)((PBYTE)bmi + bmi->bmiHeader.biSize); + + /* Allocate a palette */ + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, + ColorCount, + NULL, + 0, 0, 0); + if (!ppal) return NULL; + + /* Copy all colors */ + for (i = 0; i < ColorCount; i++) + { + ppal->IndexedColors[i].peRed = pColors[i].rgbRed; + ppal->IndexedColors[i].peGreen = pColors[i].rgbGreen; + ppal->IndexedColors[i].peBlue = pColors[i].rgbBlue; + ppal->IndexedColors[i].peFlags = 0; + } + + /* Get palette handle and unlock the palette */ + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); } else { - hPal = PALETTE_AllocPalette(paletteType, 0, - NULL, - RedMask, GreenMask, BlueMask); - } - - return hPal; + ppal = PALETTE_AllocPalWithHandle(paletteType, 0, + NULL, + RedMask, GreenMask, BlueMask); + + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + } + + return hpal; } /* Converts a BITMAPCOREINFO to a BITMAPINFO structure, Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Wed May 2 13:56:55 2012 @@ -228,87 +228,6 @@ } return ppal; -} - -HPALETTE -FASTCALL -PALETTE_AllocPalette(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue) -{ - PPALETTE ppal; - HPALETTE hpal; - - ppal = PALETTE_AllocPalette2(Mode, NumColors, Colors, Red, Green, Blue); - if (!ppal) return NULL; - - hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_POWNED); - if (!hpal) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&ppal->BaseObject); - return NULL; - } - - PALETTE_UnlockPalette(ppal); - - return hpal; -} - -HPALETTE -FASTCALL -PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, - CONST RGBQUAD *Colors) -{ - HPALETTE NewPalette; - PPALETTE PalGDI; - UINT i; - - PalGDI = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, - sizeof(PALETTE), - BASEFLAG_LOOKASIDE); - if (!PalGDI) - { - DPRINT1("Could not allocate a palette.\n"); - return NULL; - } - - if (!GDIOBJ_hInsertObject(&PalGDI->BaseObject, GDI_OBJ_HMGR_POWNED)) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&PalGDI->BaseObject); - return NULL; - } - - NewPalette = PalGDI->BaseObject.hHmgr; - - PalGDI->flFlags = PAL_INDEXED; - - PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, - sizeof(PALETTEENTRY) * NumColors, - TAG_PALETTE); - if (NULL == PalGDI->IndexedColors) - { - GDIOBJ_vDeleteObject(&PalGDI->BaseObject); - return NULL; - } - - for (i = 0; i < NumColors; i++) - { - PalGDI->IndexedColors[i].peRed = Colors[i].rgbRed; - PalGDI->IndexedColors[i].peGreen = Colors[i].rgbGreen; - PalGDI->IndexedColors[i].peBlue = Colors[i].rgbBlue; - PalGDI->IndexedColors[i].peFlags = 0; - } - - PalGDI->NumColors = NumColors; - - PALETTE_UnlockPalette(PalGDI); - - return NewPalette; } BOOL Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Wed May 2 13:56:55 2012 @@ -156,9 +156,3 @@ ULONG Red, ULONG Green, ULONG Blue); - -HPALETTE -FASTCALL -PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, - CONST RGBQUAD *Colors); -

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