Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[tfaber] 56434: [KMTESTS/RTL] - Add a small RtlException test, mainly to check that a stack overflow really throws STATUS_STACK_OVERFLOW, not STATUS_ACCESS_VIOLATION.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 27 08:36:58 2012 New Revision: 56434 URL: http://svn.reactos.org/svn/reactos?rev=56434&view=rev Log: [KMTESTS/RTL] - Add a small RtlException test, mainly to check that a stack overflow really throws STATUS_STACK_OVERFLOW, not STATUS_ACCESS_VIOLATION. Added: trunk/rostests/kmtests/rtl/RtlException.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Apr 27 08:36:58 2012 @@ -10,6 +10,7 @@ list(APPEND COMMON_SOURCE example/GuardedMemory.c rtl/RtlAvlTree.c + rtl/RtlException.c rtl/RtlMemory.c rtl/RtlSplayTree.c rtl/RtlUnicodeString.c) Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Fri Apr 27 08:36:58 2012 @@ -10,6 +10,7 @@ KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_RtlAvlTree; +KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlUnicodeString; @@ -20,6 +21,7 @@ { "Example", Test_Example }, { "IoDeviceObject", Test_IoDeviceObject }, { "RtlAvlTree", Test_RtlAvlTree }, + { "RtlException", Test_RtlException }, { "RtlMemory", Test_RtlMemory }, { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Apr 27 08:36:58 2012 @@ -38,6 +38,7 @@ KMT_TESTFUNC Test_ObTypeNoClean; KMT_TESTFUNC Test_ObTypes; KMT_TESTFUNC Test_RtlAvlTree; +KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlSplayTree; @@ -74,6 +75,7 @@ { "-ObTypeNoClean", Test_ObTypeNoClean }, { "ObTypes", Test_ObTypes }, { "RtlAvlTreeKM", Test_RtlAvlTree }, + { "RtlExceptionKM", Test_RtlException }, { "RtlMemoryKM", Test_RtlMemory }, { "RtlSplayTreeKM", Test_RtlSplayTree }, { NULL, NULL } Added: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c (added) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Fri Apr 27 08:36:58 2012 @@ -1,0 +1,61 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Exception test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) + +START_TEST(RtlException) +{ + NTSTATUS ExceptionStatus; + PCHAR Buffer[128]; + CHAR Value; + + /* Access a valid pointer - must not trigger SEH */ + StartSeh() + RtlFillMemory(Buffer, sizeof(Buffer), 0x12); + EndSeh(STATUS_SUCCESS); + + /* Read from a NULL pointer - must cause an access violation */ + StartSeh() + Value = *(volatile CHAR *)NULL; + EndSeh(STATUS_ACCESS_VIOLATION); + + /* Write to a NULL pointer - must cause an access violation */ + StartSeh() + *(volatile CHAR *)NULL = 5; + EndSeh(STATUS_ACCESS_VIOLATION); + + /* TODO: Find where MmBadPointer is defined - gives an unresolved external */ +#if 0 //def KMT_KERNEL_MODE + /* Read from MmBadPointer - must cause an access violation */ + StartSeh() + Value = *(volatile CHAR *)MmBadPointer; + EndSeh(STATUS_ACCESS_VIOLATION); + + /* Write to MmBadPointer - must cause an access violation */ + StartSeh() + *(volatile CHAR *)MmBadPointer = 5; + EndSeh(STATUS_ACCESS_VIOLATION); +#endif + + /* We cannot test this in kernel mode easily - the stack is just "somewhere" + * in system space, and there's no guard page below it */ +#ifdef KMT_USER_MODE + /* Overflow the stack - must cause a special exception */ + StartSeh() + PCHAR Pointer; + + while (1) + { + Pointer = _alloca(1024); + *Pointer = 5; + } + EndSeh(STATUS_STACK_OVERFLOW); +#endif +} Propchange: trunk/rostests/kmtests/rtl/RtlException.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 8 months

[tkreuzer] 56433: [WIN32K] - add missing DBG_DECREASE_LOCK_COUNT() when deleting an object that was exclusively locked. Fixes strange hang in comctl32_winetest. The question is: why does changing a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 26 21:48:06 2012 New Revision: 56433 URL: http://svn.reactos.org/svn/reactos?rev=56433&view=rev Log: [WIN32K] - add missing DBG_DECREASE_LOCK_COUNT() when deleting an object that was exclusively locked. Fixes strange hang in comctl32_winetest. The question is: why does changing a variable, which is never checked cause such trouble? - Don't pass the DC's clip object to IntEngCopyBits, when querying a pixel - make acExclusiveLockCount[] 0x20 bytes long, just to be really sure, that (x & 0x1F) does never overflow it. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/user/ntuser/win32.h 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] Thu Apr 26 21:48:06 2012 @@ -1156,7 +1156,7 @@ /* Call the copy bits function */ bResult = IntEngCopyBits(&psurfDest->SurfObj, &psurfSrc->SurfObj, - pdc->rosdc.CombinedClip, + NULL, &exlo.xlo, &rclDest, &ptlSrc); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Thu Apr 26 21:48:06 2012 @@ -880,6 +880,7 @@ /* Release the pushlock and reenable APCs */ ExReleasePushLockExclusive(&pobj->pushlock); KeLeaveCriticalRegion(); + DBG_DECREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), pobj->hHmgr); } } Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Thu Apr 26 21:48:06 2012 @@ -108,7 +108,7 @@ SINGLE_LIST_ENTRY ReferencesList; ULONG cExclusiveLocks; #if DBG - USHORT acExclusiveLockCount[GDIObjTypeTotal]; + USHORT acExclusiveLockCount[GDIObjTypeTotal + 1]; #endif } THREADINFO;

12 years, 8 months

[tfaber] 56432: [WINED3D] - Do not rely on undefined behavior to get values easily accessible as constants. - Quick build fix. Will be sent to Wine, possibly modified.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 26 17:20:53 2012 New Revision: 56432 URL: http://svn.reactos.org/svn/reactos?rev=56432&view=rev Log: [WINED3D] - Do not rely on undefined behavior to get values easily accessible as constants. - Quick build fix. Will be sent to Wine, possibly modified. Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Thu Apr 26 17:20:53 2012 @@ -23,6 +23,4 @@ add_subdirectory(d3dx9_41) add_subdirectory(d3dx9_42) add_subdirectory(ddraw) -if(NOT MSVC) - add_subdirectory(wined3d) -endif() +add_subdirectory(wined3d) Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Thu Apr 26 17:20:53 2012 @@ -1042,7 +1042,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Thu Apr 26 17:20:53 2012 @@ -199,8 +199,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if(m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; /* NAN */ } } @@ -221,8 +221,8 @@ } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if (m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; /* NAN */ } }

12 years, 8 months

[tfaber] 56431: [CMAKE] - Enable MSVC build for Wine DirectX libraries, which mostly work just fine.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 26 16:51:27 2012 New Revision: 56431 URL: http://svn.reactos.org/svn/reactos?rev=56431&view=rev Log: [CMAKE] - Enable MSVC build for Wine DirectX libraries, which mostly work just fine. Modified: trunk/reactos/base/applications/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Thu Apr 26 16:51:27 2012 @@ -4,9 +4,7 @@ add_subdirectory(charmap) add_subdirectory(cmdutils) add_subdirectory(control) -if(NOT MSVC) - add_subdirectory(dxdiag) # FIXME: msvc build. -endif() +add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) add_subdirectory(fontview) Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Thu Apr 26 16:51:27 2012 @@ -4,9 +4,9 @@ add_subdirectory(d3d8thk) endif() #add_subdirectory(bdaplgin) #disabled in trunk -#add_subdirectory(d3d8) #disabled in trunk -#add_subdirectory(d3d9) #disabled in trunk -#add_subdirectory(ddraw) #disabled in trunk +#add_subdirectory(d3d8) #disabled in trunk, see wine subfolder +#add_subdirectory(d3d9) #disabled in trunk, see wine subfolder +#add_subdirectory(ddraw) #disabled in trunk, see wine subfolder add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dinput8) Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Thu Apr 26 16:51:27 2012 @@ -1,14 +1,15 @@ -if(NOT MSVC) add_subdirectory(d3d8) add_subdirectory(d3d9) add_subdirectory(d3dx9_24) -add_subdirectory(d3dx9_25) -add_subdirectory(d3dx9_26) -add_subdirectory(d3dx9_27) -add_subdirectory(d3dx9_28) -add_subdirectory(d3dx9_29) -add_subdirectory(d3dx9_30) +if(NOT MSVC) + add_subdirectory(d3dx9_25) + add_subdirectory(d3dx9_26) + add_subdirectory(d3dx9_27) + add_subdirectory(d3dx9_28) + add_subdirectory(d3dx9_29) + add_subdirectory(d3dx9_30) +endif() add_subdirectory(d3dx9_31) add_subdirectory(d3dx9_32) add_subdirectory(d3dx9_33) @@ -22,5 +23,6 @@ add_subdirectory(d3dx9_41) add_subdirectory(d3dx9_42) add_subdirectory(ddraw) -add_subdirectory(wined3d) +if(NOT MSVC) + add_subdirectory(wined3d) endif() Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Thu Apr 26 16:51:27 2012 @@ -23,7 +23,7 @@ add_library(d3dx9_36 SHARED ${SOURCE}) set_module_type(d3dx9_36 win32dll) -target_link_libraries(d3dx9_36 wine) +target_link_libraries(d3dx9_36 uuid wine) add_importlibs(d3dx9_36 d3d9 Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Thu Apr 26 16:51:27 2012 @@ -2,10 +2,6 @@ add_definitions( -D__WINESRC__ -DUSE_WIN32_OPENGL) - -if(MSVC) - add_definitions(/FIwine/typeof.h) -endif() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -16,7 +12,6 @@ list(APPEND SOURCE clipper.c ddraw.c - ddraw.rc device.c executebuffer.c light.c @@ -31,7 +26,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) -add_library(ddraw SHARED ${SOURCE}) +add_library(ddraw SHARED + ${SOURCE} + ddraw.rc) + +if(MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(ddraw "/FIwine/typeof.h") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") +endif() + set_module_type(ddraw win32dll) target_link_libraries(ddraw @@ -53,4 +57,3 @@ add_dependencies(ddraw wineheaders) add_pch(ddraw ddraw_private.h) add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) -

12 years, 8 months

[tkreuzer] 56430: [WIN32K] Fix palette index wraparound when initializing a DIB palette with DIB_PAL_COLORS. Fixes gdi32_winetest::palette

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 26 16:32:01 2012 New Revision: 56430 URL: http://svn.reactos.org/svn/reactos?rev=56430&view=rev Log: [WIN32K] Fix palette index wraparound when initializing a DIB palette with DIB_PAL_COLORS. Fixes gdi32_winetest::palette Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c 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] Thu Apr 26 16:32:01 2012 @@ -1744,9 +1744,6 @@ nNumColors = min(nNumColors, lpbmi->bmiHeader.biClrUsed); } - /* Don't have more colors than we need */ - nNumColors = min(ppal->NumColors, nNumColors); - ppalEntries = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * nNumColors, TAG_COLORMAP); if (ppalEntries == NULL) { @@ -1758,17 +1755,7 @@ for (i = 0; i < nNumColors; i++) { - if (*lpIndex < ppal->NumColors) - { - ppalEntries[i] = ppal->IndexedColors[*lpIndex]; - } - else - { - ppalEntries[i].peRed = 0; - ppalEntries[i].peGreen = 0; - ppalEntries[i].peBlue = 0; - ppalEntries[i].peFlags = 0; - } + ppalEntries[i] = ppal->IndexedColors[*lpIndex % ppal->NumColors]; lpIndex++; }

12 years, 8 months

[tkreuzer] 56429: [WIN32K] - Implement TranslateCOLORREF, based on IntHandleSpecialColorType, but now returning both the translated color and the resulting RGB color, correctly handling DIBINDEX, w...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 26 16:19:22 2012 New Revision: 56429 URL: http://svn.reactos.org/svn/reactos?rev=56429&view=rev Log: [WIN32K] - Implement TranslateCOLORREF, based on IntHandleSpecialColorType, but now returning both the translated color and the resulting RGB color, correctly handling DIBINDEX, which will use the given value without translation. - Rewrite NtGdiSetPixel using IntPatBlt - Rewrite NtGdiGetPixel using IntEngCopyBits - Fix EXLATEOBJ_iXlateTable to return 0, when the palette index is too big, instead of wrapping around - Remove old debugcode Added: trunk/reactos/win32ss/gdi/ntgdi/patblt.c - copied, changed from r56411, trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/xlate.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/dcobjs.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] Thu Apr 26 16:19:22 2012 @@ -47,7 +47,7 @@ else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) { /* Set the RGB color */ - EBRUSHOBJ_vSetSolidBrushColor(pebo, pbrush->BrushAttr.lbColor); + EBRUSHOBJ_vSetSolidRGBColor(pebo, pbrush->BrushAttr.lbColor); } else { @@ -62,7 +62,7 @@ VOID FASTCALL -EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, COLORREF crColor) +EBRUSHOBJ_vSetSolidRGBColor(EBRUSHOBJ *pebo, COLORREF crColor) { ULONG iSolidColor; EXLATEOBJ exlo; Modified: trunk/reactos/win32ss/gdi/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlate.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlate.c [iso-8859-1] Thu Apr 26 16:19:22 2012 @@ -49,10 +49,7 @@ FASTCALL EXLATEOBJ_iXlateTable(PEXLATEOBJ pexlo, ULONG iColor) { - if (iColor >= pexlo->xlo.cEntries) - { - iColor %= pexlo->xlo.cEntries; - } + if (iColor >= pexlo->xlo.cEntries) return 0; return pexlo->xlo.pulXlate[iColor]; } 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] Thu Apr 26 16:19:22 2012 @@ -16,6 +16,79 @@ #define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) #define ROP_TO_ROP4(Rop) ((Rop) >> 16) + +ULONG +TranslateCOLORREF(PDC pdc, COLORREF *pcrColor) +{ + PPALETTE ppalDC, ppalSurface; + ULONG index, ulColor, iBitmapFormat; + COLORREF crColor = *pcrColor; + EXLATEOBJ exlo; + + switch (crColor >> 24) + { + case 0x00: /* RGB color */ + break; + + case 0x01: /* PALETTEINDEX */ + index = crColor & 0xFFFFFF; + ppalDC = pdc->dclevel.ppal; + if (index >= ppalDC->NumColors) index = 0; + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + *pcrColor = crColor; + break; + + case 0x02: /* PALETTERGB */ + + /* First find the nearest index in the dc palette */ + ppalDC = pdc->dclevel.ppal; + index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + *pcrColor = crColor; + break; + + case 0x10: /* DIBINDEX */ + /* Mask the value to match the target bpp */ + iBitmapFormat = pdc->dclevel.pSurface->SurfObj.iBitmapFormat; + if (iBitmapFormat == BMF_1BPP) index = crColor & 0x1; + else if (iBitmapFormat == BMF_4BPP) index = crColor & 0xf; + else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; + else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; + else index = crColor & 0xFFFFFF; + + /* Translate the color to RGB for the caller */ + ppalSurface = pdc->dclevel.pSurface->ppal; + if (index < ppalSurface->NumColors) + *pcrColor = PALETTE_ulGetRGBColorFromIndex(ppalSurface, index); + else + *pcrColor = 0; + return index; + + default: + DPRINT("Unsupported color type %d passed\n", crColor >> 24); + return 0; + } + + /* Initialize an XLATEOBJ from RGB to the target surface */ + EXLATEOBJ_vInitialize(&exlo, + &gpalRGB, + pdc->dclevel.pSurface->ppal, + 0, + pdc->pdcattr->crBackgroundClr, + pdc->pdcattr->crForegroundClr); + + /* Translate the color to the target format */ + ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); + + /* Cleanup and return the RGB value */ + EXLATEOBJ_vCleanup(&exlo); + return ulColor; +} + BOOL APIENTRY NtGdiAlphaBlend( @@ -874,17 +947,17 @@ _In_ INT y, _In_ INT cx, _In_ INT cy, - _In_ DWORD rop4) + _In_ DWORD dwRop) { BOOL bResult; PDC pdc; /* Mask away everything except foreground rop index */ - rop4 = rop4 & 0x00FF0000; - rop4 |= rop4 << 8; + dwRop = dwRop & 0x00FF0000; + dwRop |= dwRop << 8; /* Check if the rop uses a source */ - if (ROP_USES_SOURCE(rop4)) + if (ROP_USES_SOURCE(dwRop)) { /* This is not possible */ return 0; @@ -911,7 +984,7 @@ DC_vUpdateFillBrush(pdc); /* Call the internal function */ - bResult = IntPatBlt(pdc, x, y, cx, cy, rop4, &pdc->eboFill); + bResult = IntPatBlt(pdc, x, y, cx, cy, dwRop, &pdc->eboFill); /* Unlock the DC and return the result */ DC_UnlockDc(pdc); @@ -969,3 +1042,137 @@ return Ret; } + + +COLORREF +APIENTRY +NtGdiSetPixel( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _In_ COLORREF crColor) +{ + PDC pdc; + ULONG iOldColor, iSolidColor; + BOOL bResult; + PEBRUSHOBJ pebo; + ULONG ulDirty; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return -1; + } + + /* Check if the DC has no surface (empty mem or info DC) */ + if (pdc->dclevel.pSurface == NULL) + { + /* Fail! */ + DC_UnlockDc(pdc); + return -1; + } + + /* Translate the color to the target format and get the RGB value */ + iSolidColor = TranslateCOLORREF(pdc, &crColor); + + /* Use the DC's text brush, which is always a solid brush */ + pebo = &pdc->eboText; + + /* Save the old solid color and set the one for the pixel */ + iOldColor = EBRUSHOBJ_iSetSolidColor(pebo, iSolidColor); + + /* Save dirty flags and reset dirty text brush flag */ + ulDirty = pdc->pdcattr->ulDirty_; + pdc->pdcattr->ulDirty_ &= ~DIRTY_TEXT; + + /* Call the internal function */ + bResult = IntPatBlt(pdc, x, y, 1, 1, PATCOPY, pebo); + + /* Restore old text brush color and dirty flags */ + EBRUSHOBJ_iSetSolidColor(pebo, iOldColor); + pdc->pdcattr->ulDirty_ = ulDirty; + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* Return the new RGB color or -1 on failure */ + return bResult ? crColor : -1; +} + +COLORREF +APIENTRY +NtGdiGetPixel( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y) +{ + PDC pdc; + ULONG ulRGBColor; + BOOL bResult = FALSE; + POINTL ptlSrc; + PSURFACE psurfSrc, psurfDest; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return -1; + } + + /* Check if the DC has no surface (empty mem or info DC) */ + psurfSrc = pdc->dclevel.pSurface; + if (psurfSrc == NULL) + { + /* Fail! */ + DC_UnlockDc(pdc); + return -1; + } + + /* Get the logical coordinates */ + ptlSrc.x = x; + ptlSrc.y = y; + + /* Translate coordinates to device coordinates */ + IntLPtoDP(pdc, &ptlSrc, 1); + ptlSrc.x += pdc->ptlDCOrig.x; + ptlSrc.y += pdc->ptlDCOrig.y; + + /* Allocate a surface */ + psurfDest = SURFACE_AllocSurface(STYPE_BITMAP, 1, 1, BMF_32BPP); + if (psurfDest) + { + /* Set the bitmap bits */ + if (SURFACE_bSetBitmapBits(psurfDest, 0, 0, &ulRGBColor)) + { + RECTL rclDest = {0, 0, 1, 1}; + EXLATEOBJ exlo; + + /* Translate from the source palette to RGB color */ + EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, &gpalRGB, 0, 0, 0); + + /* Call the copy bits function */ + bResult = IntEngCopyBits(&psurfDest->SurfObj, + &psurfSrc->SurfObj, + pdc->rosdc.CombinedClip, + &exlo.xlo, + &rclDest, + &ptlSrc); + + /* Cleanup the XLATEOBJ */ + EXLATEOBJ_vCleanup(&exlo); + } + + /* Delete the surface */ + GDIOBJ_vDeleteObject(&psurfDest->BaseObject); + } + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* Return the new RGB color or -1 on failure */ + return bResult ? ulRGBColor : -1; +} + Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Thu Apr 26 16:19:22 2012 @@ -385,103 +385,6 @@ return Ret; } -COLORREF APIENTRY -NtGdiGetPixel(HDC hDC, INT XPos, INT YPos) -{ - PDC dc = NULL; - COLORREF Result = (COLORREF)CLR_INVALID; // Default to failure - BOOL bInRect = FALSE; - SURFACE *psurf; - SURFOBJ *pso; - EXLATEOBJ exlo; - HBITMAP hBmpTmp; - - dc = DC_LockDc(hDC); - - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return Result; - } - - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - return Result; - } - - XPos += dc->ptlDCOrig.x; - YPos += dc->ptlDCOrig.y; - if ((dc->rosdc.CombinedClip == NULL) || - (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos))) - { - bInRect = TRUE; - psurf = dc->dclevel.pSurface; - if (psurf) - { - pso = &psurf->SurfObj; - EXLATEOBJ_vInitialize(&exlo, psurf->ppal, &gpalRGB, 0, 0xffffff, 0); - // Check if this DC has a DIB behind it... - if (pso->pvScan0) // STYPE_BITMAP == pso->iType - { - ASSERT(pso->lDelta); - Result = XLATEOBJ_iXlate(&exlo.xlo, - DibFunctionsForBitmapFormat[pso->iBitmapFormat].DIB_GetPixel(pso, XPos, YPos)); - } - - EXLATEOBJ_vCleanup(&exlo); - } - } - DC_UnlockDc(dc); - - // If Result is still CLR_INVALID, then the "quick" method above didn't work - if (bInRect && Result == CLR_INVALID) - { - // FIXME: create a 1x1 32BPP DIB, and blit to it - HDC hDCTmp = NtGdiCreateCompatibleDC(hDC); - if (hDCTmp) - { - static const BITMAPINFOHEADER bih = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0 }; - BITMAPINFO bi; - RtlMoveMemory(&(bi.bmiHeader), &bih, sizeof(bih)); - hBmpTmp = NtGdiCreateDIBitmapInternal(hDC, - bi.bmiHeader.biWidth, - bi.bmiHeader.biHeight, - 0, - NULL, - &bi, - DIB_RGB_COLORS, - bi.bmiHeader.biBitCount, - bi.bmiHeader.biSizeImage, - 0, - 0); - - //HBITMAP hBmpTmp = GreCreateBitmap(1, 1, 1, 32, NULL); - if (hBmpTmp) - { - HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); - if (hBmpOld) - { - NtGdiBitBlt(hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0); - NtGdiSelectBitmap(hDCTmp, hBmpOld); - - // Our bitmap is no longer selected, so we can access it's stuff... - psurf = SURFACE_ShareLockSurface(hBmpTmp); - if (psurf) - { - // Dont you need to convert something here? - Result = *(COLORREF*)psurf->SurfObj.pvScan0; - SURFACE_ShareUnlockSurface(psurf); - } - } - GreDeleteObject(hBmpTmp); - } - NtGdiDeleteObjectApp(hDCTmp); - } - } - - return Result; -} VOID FASTCALL @@ -652,116 +555,6 @@ return Ret; } - -VOID IntHandleSpecialColorType(HDC hDC, COLORREF* Color) -{ - PDC pdc = NULL; - RGBQUAD quad; - PALETTEENTRY palEntry; - UINT index; - - switch (*Color >> 24) - { - case 0x10: /* DIBINDEX */ - if (IntGetDIBColorTable(hDC, LOWORD(*Color), 1, &quad) == 1) - { - *Color = RGB(quad.rgbRed, quad.rgbGreen, quad.rgbBlue); - } - else - { - /* Out of color table bounds - use black */ - *Color = RGB(0, 0, 0); - } - break; - case 0x02: /* PALETTERGB */ - pdc = DC_LockDc(hDC); - if (pdc->dclevel.hpal != NtGdiGetStockObject(DEFAULT_PALETTE)) - { - index = NtGdiGetNearestPaletteIndex(pdc->dclevel.hpal, *Color); - IntGetPaletteEntries(pdc->dclevel.hpal, index, 1, &palEntry); - *Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue); - } - else - { - /* Use the pure color */ - *Color = *Color & 0x00FFFFFF; - } - DC_UnlockDc(pdc); - break; - case 0x01: /* PALETTEINDEX */ - pdc = DC_LockDc(hDC); - if (IntGetPaletteEntries(pdc->dclevel.hpal, LOWORD(*Color), 1, &palEntry) == 1) - { - *Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue); - } - else - { - /* Index does not exist, use zero index */ - IntGetPaletteEntries(pdc->dclevel.hpal, 0, 1, &palEntry); - *Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue); - } - DC_UnlockDc(pdc); - break; - default: - DPRINT("Unsupported color type %d passed\n", *Color >> 24); - break; - } -} - -BOOL APIENTRY -GdiSetPixelV( - HDC hDC, - INT X, - INT Y, - COLORREF Color) -{ - HBRUSH hBrush; - HGDIOBJ OldBrush; - - if ((Color & 0xFF000000) != 0) - { - IntHandleSpecialColorType(hDC, &Color); - } - - hBrush = NtGdiCreateSolidBrush(Color, NULL); - if (hBrush == NULL) - return FALSE; - - OldBrush = NtGdiSelectBrush(hDC, hBrush); - if (OldBrush == NULL) - { - GreDeleteObject(hBrush); - return FALSE; - } - - NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); - NtGdiSelectBrush(hDC, OldBrush); - GreDeleteObject(hBrush); - - return TRUE; -} - -COLORREF APIENTRY -NtGdiSetPixel( - HDC hDC, - INT X, - INT Y, - COLORREF Color) -{ - DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); - - if (GdiSetPixelV(hDC,X,Y,Color)) - { - Color = NtGdiGetPixel(hDC,X,Y); - DPRINT("1 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); - return Color; - } - - Color = (COLORREF)CLR_INVALID; - DPRINT("2 NtGdiSetPixel X %ld Y %ld C %ld\n", X, Y, Color); - return Color; -} - /* Internal Functions */ 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] Thu Apr 26 16:19:22 2012 @@ -104,7 +104,7 @@ VOID FASTCALL -EBRUSHOBJ_vSetSolidBrushColor(EBRUSHOBJ *pebo, COLORREF crColor); +EBRUSHOBJ_vSetSolidRGBColor(EBRUSHOBJ *pebo, COLORREF crColor); VOID NTAPI @@ -129,6 +129,15 @@ #define BRUSHOBJ_psoPattern(pbo) \ EBRUSHOBJ_psoPattern(CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject)) +ULONG +FORCEINLINE +EBRUSHOBJ_iSetSolidColor(EBRUSHOBJ *pebo, ULONG iSolidColor) +{ + ULONG iOldColor = pebo->BrushObject.iSolidColor; + pebo->BrushObject.iSolidColor = iSolidColor; + return iOldColor; +} + BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Thu Apr 26 16:19:22 2012 @@ -51,7 +51,7 @@ { /* ROS HACK, should use surf xlate */ /* Update the eboFill's solid color */ - EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, pdcattr->crPenClr); + EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboFill, pdcattr->crPenClr); } /* Clear flags */ @@ -97,7 +97,7 @@ if (pdcattr->hpen == StockObjects[DC_PEN]) { /* Update the eboLine's solid color */ - EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, pdcattr->crPenClr); + EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboLine, pdcattr->crPenClr); } /* Clear flags */ @@ -116,7 +116,7 @@ EBRUSHOBJ_vUpdate(&pdc->eboText, pbrDefaultBrush, pdc); /* Update the eboText's solid color */ - EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboText, pdcattr->crForegroundClr); + EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboText, pdcattr->crForegroundClr); /* Clear flag */ pdcattr->ulDirty_ &= ~DIRTY_TEXT; @@ -132,7 +132,7 @@ EBRUSHOBJ_vUpdate(&pdc->eboBackground, pbrDefaultBrush, pdc); /* Update the eboBackground's solid color */ - EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboBackground, pdcattr->crBackgroundClr); + EBRUSHOBJ_vSetSolidRGBColor(&pdc->eboBackground, pdcattr->crBackgroundClr); /* Clear flag */ pdcattr->ulDirty_ &= ~DIRTY_BACKGROUND; Copied: trunk/reactos/win32ss/gdi/ntgdi/patblt.c (from r56411, trunk/reactos/win32ss/gdi/ntgdi/bitblt.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/patblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/patblt.c [iso-8859-1] Thu Apr 26 16:19:22 2012 @@ -885,8 +885,6 @@ return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); } -if ((XLeft == 0) && (YLeft == 0) && (Width == 592) && (Height == 362)) __debugbreak(); - dc = DC_LockDc(hDC); if (dc == NULL) {

12 years, 8 months

[tkreuzer] 56428: [WIN32K] Fix NtGdiPatBlt: ROPs with a source are not allowed, the background ROP is simply ignored.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 26 09:42:46 2012 New Revision: 56428 URL: http://svn.reactos.org/svn/reactos?rev=56428&view=rev Log: [WIN32K] Fix NtGdiPatBlt: ROPs with a source are not allowed, the background ROP is simply ignored. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c 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] Thu Apr 26 09:42:46 2012 @@ -866,53 +866,60 @@ return TRUE; } -BOOL APIENTRY +BOOL +APIENTRY NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP) -{ - DC *dc; - PDC_ATTR pdcattr; - BOOL ret; - - BOOL UsesSource = ROP_USES_SOURCE(ROP); - if (UsesSource) - { - /* In this case we call on GdiMaskBlt */ - return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); - } - - dc = DC_LockDc(hDC); - if (dc == NULL) + _In_ HDC hdcDest, + _In_ INT x, + _In_ INT y, + _In_ INT cx, + _In_ INT cy, + _In_ DWORD rop4) +{ + BOOL bResult; + PDC pdc; + + /* Mask away everything except foreground rop index */ + rop4 = rop4 & 0x00FF0000; + rop4 |= rop4 << 8; + + /* Check if the rop uses a source */ + if (ROP_USES_SOURCE(rop4)) + { + /* This is not possible */ + return 0; + } + + /* Lock the DC */ + pdc = DC_LockDc(hdcDest); + if (pdc == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - DPRINT1("NtGdiPatBlt on info DC!\n"); - /* Yes, Windows really returns TRUE in this case */ + + /* Check if the DC has no surface (empty mem or info DC) */ + if (pdc->dclevel.pSurface == NULL) + { + /* Nothing to do, Windows returns TRUE! */ + DC_UnlockDc(pdc); return TRUE; } - pdcattr = dc->pdcattr; - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(dc); - - ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, &dc->eboFill); - - DC_UnlockDc(dc); - - return ret; -} - -BOOL APIENTRY + /* Update the fill brush, if neccessary */ + if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pdc); + + /* Call the internal function */ + bResult = IntPatBlt(pdc, x, y, cx, cy, rop4, &pdc->eboFill); + + /* Unlock the DC and return the result */ + DC_UnlockDc(pdc); + return bResult; +} + +BOOL +APIENTRY NtGdiPolyPatBlt( HDC hDC, DWORD dwRop,

12 years, 8 months

[tkreuzer] 56427: [WIN32K] Pass EBRUSHOBJ to IntPatBlt instead of the BRUSH. This way we can use the DC's eboFill, instead of initializing a new EBRUSHOBJ.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Apr 26 09:30:15 2012 New Revision: 56427 URL: http://svn.reactos.org/svn/reactos?rev=56427&view=rev Log: [WIN32K] Pass EBRUSHOBJ to IntPatBlt instead of the BRUSH. This way we can use the DC's eboFill, instead of initializing a new EBRUSHOBJ. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c 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] Thu Apr 26 09:30:15 2012 @@ -733,15 +733,15 @@ INT Width, INT Height, DWORD dwRop, - PBRUSH pbrush) + PEBRUSHOBJ pebo) { RECTL DestRect; SURFACE *psurf; - EBRUSHOBJ eboFill ; POINTL BrushOrigin; BOOL ret; - - ASSERT(pbrush); + PBRUSH pbrush = pebo->pbrush; + + ASSERT(pebo); FIXUP_ROP(dwRop); @@ -790,11 +790,6 @@ psurf = pdc->dclevel.pSurface; - if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc); - - EBRUSHOBJ_vInit(&eboFill, pbrush, pdc); - ret = IntEngBitBlt( &psurf->SurfObj, NULL, @@ -804,13 +799,11 @@ &DestRect, NULL, NULL, - &eboFill.BrushObject, + &pebo->BrushObject, &BrushOrigin, ROP_TO_ROP4(dwRop)); DC_vFinishBlit(pdc, NULL); - - EBRUSHOBJ_vCleanup(&eboFill); return ret; } @@ -826,6 +819,7 @@ INT i; PBRUSH pbrush; PDC pdc; + EBRUSHOBJ eboFill; pdc = DC_LockDc(hDC); if (!pdc) @@ -844,8 +838,13 @@ for (i = 0; i < cRects; i++) { pbrush = BRUSH_ShareLockBrush(pRects->hBrush); - if(pbrush != NULL) - { + + /* Check if we could lock the brush */ + if (pbrush != NULL) + { + /* Initialize a brush object */ + EBRUSHOBJ_vInit(&eboFill, pbrush, pdc); + IntPatBlt( pdc, pRects->r.left, @@ -853,7 +852,10 @@ pRects->r.right, pRects->r.bottom, dwRop, - pbrush); + &eboFill); + + /* Cleanup the brush object and unlock the brush */ + EBRUSHOBJ_vCleanup(&eboFill); BRUSH_ShareUnlockBrush(pbrush); } pRects++; @@ -873,7 +875,6 @@ INT Height, DWORD ROP) { - PBRUSH pbrush; DC *dc; PDC_ATTR pdcattr; BOOL ret; @@ -884,8 +885,6 @@ /* In this case we call on GdiMaskBlt */ return NtGdiMaskBlt(hDC, XLeft, YLeft, Width, Height, 0,0,0,0,0,0,ROP,0); } - -if ((XLeft == 0) && (YLeft == 0) && (Width == 592) && (Height == 362)) __debugbreak(); dc = DC_LockDc(hDC); if (dc == NULL) @@ -906,17 +905,8 @@ if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); - pbrush = BRUSH_ShareLockBrush(pdcattr->hbrush); - if (pbrush == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - DC_UnlockDc(dc); - return FALSE; - } - - ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, pbrush); - - BRUSH_ShareUnlockBrush(pbrush); + ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, &dc->eboFill); + DC_UnlockDc(dc); return ret;

12 years, 8 months

[tfaber] 56426: [RTL] - Accept NULL Buffer/Size in RtlGetFullPathName_Ustr - Fix NULL dereference in RtlGetFullPathName_UstrEx if no StaticString was given - Various other corrections to path funct...

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Apr 25 22:21:00 2012 New Revision: 56426 URL: http://svn.reactos.org/svn/reactos?rev=56426&view=rev Log: [RTL] - Accept NULL Buffer/Size in RtlGetFullPathName_Ustr - Fix NULL dereference in RtlGetFullPathName_UstrEx if no StaticString was given - Various other corrections to path functions. 17 test failures fixed overall. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=56426&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Apr 25 22:21:00 2012 @@ -57,20 +57,17 @@ PWCHAR Path; ULONG Chars; - /* Validate the input */ - if (!PathString) return RtlPathTypeUnknown; - Path = PathString->Buffer; Chars = PathString->Length / sizeof(WCHAR); /* Return if there are no characters */ - if (!Chars) return RtlPathTypeUnknown; + if (!Chars) return RtlPathTypeRelative; /* * The algorithm is similar to RtlDetermineDosPathNameType_U but here we * actually check for the path length before touching the characters */ - if ((Chars < 1) || (IS_PATH_SEPARATOR(Path[0]))) + if (IS_PATH_SEPARATOR(Path[0])) { if ((Chars < 2) || !(IS_PATH_SEPARATOR(Path[1]))) return RtlPathTypeRooted; /* \x */ if ((Chars < 3) || ((Path[2] != L'.') && (Path[2] != L'?'))) return RtlPathTypeUncAbsolute;/* \\x */ @@ -80,9 +77,9 @@ } else { - if ((Chars < 2) || (!(Path[0]) || (Path[1] != L':'))) return RtlPathTypeRelative; /* x */ - if ((Chars < 3) || (IS_PATH_SEPARATOR(Path[2]))) return RtlPathTypeDriveAbsolute; /* x:\ */ - return RtlPathTypeDriveRelative; /* x: */ + if ((Chars < 2) || (Path[1] != L':')) return RtlPathTypeRelative; /* x */ + if ((Chars < 3) || !(IS_PATH_SEPARATOR(Path[2]))) return RtlPathTypeDriveRelative; /* x: */ + return RtlPathTypeDriveAbsolute; /* x:\ */ } } @@ -308,8 +305,7 @@ /* Handle initial path type and failure case */ *PathType = RtlPathTypeUnknown; - if (!(Size) || !(Buffer) || !(FileName) || - !(FileName->Length) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; + if (!(FileName->Length) || (FileName->Buffer[0] == UNICODE_NULL)) return 0; /* Break filename into component parts */ FileNameBuffer = FileName->Buffer; @@ -737,9 +733,6 @@ NTSTATUS Status; FILE_BASIC_INFORMATION BasicInformation; - /* Validate the input */ - if (!FileName) return FALSE; - /* Get the NT Path */ Result = RtlDosPathNameToRelativeNtPathName_Ustr(FileName, &NtPathName, @@ -862,7 +855,7 @@ * This is, and has always been equal to, 269 characters, except in Wine * which claims this is 277. Go figure. */ - return (MAX_PATH + RtlpDosDevicesUncPrefix.Length + sizeof(ANSI_NULL)); + return MAX_PATH + RtlpDosDevicesUncPrefix.Length / sizeof(WCHAR) + sizeof(ANSI_NULL); } /* @@ -873,9 +866,6 @@ RtlDetermineDosPathNameType_U(IN PCWSTR Path) { DPRINT("RtlDetermineDosPathNameType_U %S\n", Path); - - /* Validate the input */ - if (!Path) return RtlPathTypeUnknown; /* Unlike the newer RtlDetermineDosPathNameType_U we assume 4 characters */ if (IS_PATH_SEPARATOR(Path[0])) @@ -1997,7 +1987,7 @@ Quickie: /* Free any buffers we should be freeing */ DPRINT("Status: %lx %S %S\n", Status, StaticBuffer, TempDynamicString.Buffer); - if ((StaticBuffer) && (StaticBuffer != StaticString->Buffer)) + if ((StaticString) && (StaticBuffer) && (StaticBuffer != StaticString->Buffer)) { RtlpFreeMemory(StaticBuffer, TAG_USTR); }

12 years, 8 months

[tkreuzer] 56425: [WIN32K] Make sure a bitmap is compatible with the dc before selecting it.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 25 19:25:48 2012 New Revision: 56425 URL: http://svn.reactos.org/svn/reactos?rev=56425&view=rev Log: [WIN32K] Make sure a bitmap is compatible with the dc before selecting it. Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Wed Apr 25 19:25:48 2012 @@ -265,6 +265,7 @@ PSURFACE psurfNew, psurfOld; HRGN hVisRgn; HDC hdcOld; + ULONG cBitsPixel; ASSERT_NOGDILOCKS(); /* Verify parameters */ @@ -329,24 +330,36 @@ return NULL; } - /* Set the bitmap's hdc and check if it was set before */ - hdcOld = InterlockedCompareExchangePointer((PVOID*)&psurfNew->hdc, hdc, 0); - if (hdcOld != NULL) - { - /* The bitmap is already selected into a different DC */ - ASSERT(hdcOld != hdc); - + /* Check if the bitmap is compatile with the dc */ + cBitsPixel = gajBitsPerFormat[psurfNew->SurfObj.iBitmapFormat]; + if ((cBitsPixel != 1) && + (cBitsPixel != pdc->ppdev->gdiinfo.cBitsPixel) && + (psurfNew->hSecure == NULL)) + { /* Dereference the bitmap, unlock the DC and fail. */ SURFACE_ShareUnlockSurface(psurfNew); DC_UnlockDc(pdc); return NULL; } + /* Set the bitmap's hdc and check if it was set before */ + hdcOld = InterlockedCompareExchangePointer((PVOID*)&psurfNew->hdc, hdc, 0); + if (hdcOld != NULL) + { + /* The bitmap is already selected into a different DC */ + ASSERT(hdcOld != hdc); + + /* Dereference the bitmap, unlock the DC and fail. */ + SURFACE_ShareUnlockSurface(psurfNew); + DC_UnlockDc(pdc); + return NULL; + } + /* Copy the bitmap size */ pdc->dclevel.sizl = psurfNew->SurfObj.sizlBitmap; /* Check if the bitmap is a dibsection */ - if(psurfNew->hSecure) + if (psurfNew->hSecure) { /* Set DIBSECTION attribute */ pdc->pdcattr->ulDirty_ |= DC_DIBSECTION;

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2012