Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56545: [GDI32_APITEST] Add more tests for GetDIBColorTable
by tkreuzer＠svn.reactos.org 08 May '12

08 May '12

Author: tkreuzer Date: Tue May 8 23:15:49 2012 New Revision: 56545 URL: http://svn.reactos.org/svn/reactos?rev=56545&view=rev Log: [GDI32_APITEST] Add more tests for GetDIBColorTable Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Tue May 8 23:15:49 2012 @@ -30,6 +30,8 @@ cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); ok_long(cColors, 2); ok_err(0); + ok_long(aulColors[0], 0x000000); + ok_long(aulColors[1], 0xffffff); hbmp = CreateBitmap(1, 1, 1, 1, NULL); ok(hbmp != 0, "\n"); @@ -38,6 +40,8 @@ cColors = GetDIBColorTable(hdc, 0, 257, (RGBQUAD*)aulColors); ok_long(cColors, 2); ok_err(0); + ok_long(aulColors[0], 0x000000); + ok_long(aulColors[1], 0xffffff); SelectObject(hdc, hbmpOld); DeleteObject(hbmp);

1 0

[tkreuzer] 56544: Sync with trunk r56543
by tkreuzer＠svn.reactos.org 08 May '12

08 May '12

Author: tkreuzer Date: Tue May 8 18:11:09 2012 New Revision: 56544 URL: http://svn.reactos.org/svn/reactos?rev=56544&view=rev Log: Sync with trunk r56543 Added: branches/dib_rewrite/include/ddk/netioddk.h - copied unchanged from r56543, trunk/reactos/include/ddk/netioddk.h branches/dib_rewrite/include/psdk/netiodef.h - copied unchanged from r56543, trunk/reactos/include/psdk/netiodef.h branches/dib_rewrite/include/psdk/nldef.h - copied unchanged from r56543, trunk/reactos/include/psdk/nldef.h branches/dib_rewrite/lib/3rdparty/libwine/isinf.c - copied unchanged from r56543, trunk/reactos/lib/3rdparty/libwine/isinf.c branches/dib_rewrite/lib/3rdparty/libwine/isnan.c - copied unchanged from r56543, trunk/reactos/lib/3rdparty/libwine/isnan.c branches/dib_rewrite/lib/sdk/crt/oldnames-msvcrt.S - copied unchanged from r56543, trunk/reactos/lib/sdk/crt/oldnames-msvcrt.S branches/dib_rewrite/win32ss/gdi/eng/mapping.h - copied unchanged from r56543, trunk/reactos/win32ss/gdi/eng/mapping.h Removed: branches/dib_rewrite/dll/directx/wine/wined3d/powf.c branches/dib_rewrite/dll/directx/wine/wined3d/sqrtf.c branches/dib_rewrite/importlibs/libcoldname.a branches/dib_rewrite/importlibs/libgcc.a branches/dib_rewrite/importlibs/libmingw32.a branches/dib_rewrite/importlibs/libmingwex.a branches/dib_rewrite/importlibs/libsupc++.a branches/dib_rewrite/importlibs/oldnames.lib Modified: branches/dib_rewrite/ (props changed) branches/dib_rewrite/COPYING branches/dib_rewrite/base/shell/cmd/copy.c branches/dib_rewrite/base/shell/cmd/echo.c branches/dib_rewrite/base/shell/cmd/type.c branches/dib_rewrite/boot/bootdata/hivedef_i386.inf branches/dib_rewrite/boot/bootdata/packages/reactos.dff.in branches/dib_rewrite/cmake/CMakeMacros.cmake branches/dib_rewrite/cmake/gcc.cmake branches/dib_rewrite/cmake/msvc.cmake branches/dib_rewrite/dll/cpl/powercfg/lang/it-IT.rc branches/dib_rewrite/dll/directx/wine/wined3d/CMakeLists.txt branches/dib_rewrite/dll/win32/advapi32/advapi32.spec branches/dib_rewrite/dll/win32/advapi32/sec/lsa.c branches/dib_rewrite/dll/win32/advapi32/sec/sec.c branches/dib_rewrite/dll/win32/fusion/CMakeLists.txt branches/dib_rewrite/dll/win32/jscript/CMakeLists.txt branches/dib_rewrite/dll/win32/jscript/array.c branches/dib_rewrite/dll/win32/kernel32/client/path.c branches/dib_rewrite/dll/win32/lsasrv/CMakeLists.txt branches/dib_rewrite/dll/win32/lsasrv/database.c branches/dib_rewrite/dll/win32/lsasrv/lsarpc.c branches/dib_rewrite/dll/win32/lsasrv/lsasrv.h branches/dib_rewrite/dll/win32/lsasrv/policy.c branches/dib_rewrite/dll/win32/shell32/lang/it-IT.rc branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtdev.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpnp.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpwr.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtrwr.c branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtusb.c branches/dib_rewrite/drivers/filters/mountmgr/point.c branches/dib_rewrite/drivers/network/tcpip/datalink/lan.c branches/dib_rewrite/include/crt/mingw32/intrin_x86.h branches/dib_rewrite/include/ddk/wdm.h branches/dib_rewrite/include/ndk/rtlfuncs.h branches/dib_rewrite/include/psdk/mstcpip.h branches/dib_rewrite/include/psdk/ntdef.h branches/dib_rewrite/include/psdk/ntsecapi.h branches/dib_rewrite/include/psdk/winnt.h branches/dib_rewrite/include/psdk/winuser.h branches/dib_rewrite/include/reactos/wine/config.h branches/dib_rewrite/include/reactos/wine/port.h branches/dib_rewrite/include/reactos/wine/test.h branches/dib_rewrite/include/xdk/rtlfuncs.h branches/dib_rewrite/lib/3rdparty/libwine/CMakeLists.txt branches/dib_rewrite/lib/drivers/lwip/src/include/arch/cc.h branches/dib_rewrite/lib/rtl/mem.c branches/dib_rewrite/lib/rtl/path.c branches/dib_rewrite/lib/sdk/crt/include/internal/wine/msvcrt.h branches/dib_rewrite/lib/sdk/crt/oldnames.cmake branches/dib_rewrite/ntoskrnl/cache/section/data.c branches/dib_rewrite/ntoskrnl/cache/section/newmm.h branches/dib_rewrite/ntoskrnl/include/internal/mm.h branches/dib_rewrite/ntoskrnl/mm/ARM3/expool.c branches/dib_rewrite/ntoskrnl/mm/ARM3/section.c branches/dib_rewrite/ntoskrnl/mm/ARM3/virtual.c branches/dib_rewrite/ntoskrnl/mm/i386/page.c branches/dib_rewrite/ntoskrnl/mm/rmap.c branches/dib_rewrite/ntoskrnl/mm/section.c branches/dib_rewrite/win32ss/gdi/eng/eng.h branches/dib_rewrite/win32ss/gdi/eng/engbrush.c branches/dib_rewrite/win32ss/gdi/eng/lineto.c branches/dib_rewrite/win32ss/gdi/eng/mapping.c branches/dib_rewrite/win32ss/gdi/eng/mem.c branches/dib_rewrite/win32ss/gdi/eng/mouse.c branches/dib_rewrite/win32ss/gdi/eng/pdevobj.c branches/dib_rewrite/win32ss/gdi/eng/rlecomp.c branches/dib_rewrite/win32ss/gdi/eng/surface.c branches/dib_rewrite/win32ss/gdi/eng/surface.h branches/dib_rewrite/win32ss/gdi/ntgdi/bitblt.c branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.c branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.h branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c branches/dib_rewrite/win32ss/gdi/ntgdi/brush.h branches/dib_rewrite/win32ss/gdi/ntgdi/coord.c branches/dib_rewrite/win32ss/gdi/ntgdi/coord.h branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c branches/dib_rewrite/win32ss/gdi/ntgdi/dcstate.c branches/dib_rewrite/win32ss/gdi/ntgdi/dib.h branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/drawing.c branches/dib_rewrite/win32ss/gdi/ntgdi/fillshap.c branches/dib_rewrite/win32ss/gdi/ntgdi/gdibatch.c branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c branches/dib_rewrite/win32ss/gdi/ntgdi/intgdi.h branches/dib_rewrite/win32ss/gdi/ntgdi/line.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h branches/dib_rewrite/win32ss/gdi/ntgdi/pen.c branches/dib_rewrite/win32ss/gdi/ntgdi/region.c branches/dib_rewrite/win32ss/gdi/ntgdi/stockobj.c branches/dib_rewrite/win32ss/include/ntgdityp.h branches/dib_rewrite/win32ss/include/ntuser.h branches/dib_rewrite/win32ss/pch.h branches/dib_rewrite/win32ss/reactx/ntddraw/dxeng.c branches/dib_rewrite/win32ss/user/ntuser/caret.c branches/dib_rewrite/win32ss/user/ntuser/class.c branches/dib_rewrite/win32ss/user/ntuser/clipboard.c branches/dib_rewrite/win32ss/user/ntuser/desktop.c branches/dib_rewrite/win32ss/user/ntuser/focus.c branches/dib_rewrite/win32ss/user/ntuser/hook.c branches/dib_rewrite/win32ss/user/ntuser/keyboard.c branches/dib_rewrite/win32ss/user/ntuser/main.c branches/dib_rewrite/win32ss/user/ntuser/message.c branches/dib_rewrite/win32ss/user/ntuser/misc/file.c branches/dib_rewrite/win32ss/user/ntuser/misc/registry.c branches/dib_rewrite/win32ss/user/ntuser/msgqueue.c branches/dib_rewrite/win32ss/user/ntuser/simplecall.c branches/dib_rewrite/win32ss/user/ntuser/window.h branches/dib_rewrite/win32ss/user/user32/include/ntwrapper.h branches/dib_rewrite/win32ss/user/user32/windows/dialog.c branches/dib_rewrite/win32ss/user/user32/windows/messagebox.c branches/dib_rewrite/win32ss/win32kp.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/dib_rewrite/COPYING URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/COPYING?rev=56544&r… Modified: branches/dib_rewrite/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/copy… Modified: branches/dib_rewrite/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/echo… Modified: branches/dib_rewrite/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/base/shell/cmd/type… Modified: branches/dib_rewrite/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/boot/bootdata/hived… Modified: branches/dib_rewrite/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/boot/bootdata/packa… Modified: branches/dib_rewrite/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/CMakeMacros.c… Modified: branches/dib_rewrite/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/gcc.cmake?rev… Modified: branches/dib_rewrite/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/cmake/msvc.cmake?re… Modified: branches/dib_rewrite/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/cpl/powercfg/la… Modified: branches/dib_rewrite/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Removed: branches/dib_rewrite/dll/directx/wine/wined3d/powf.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Removed: branches/dib_rewrite/dll/directx/wine/wined3d/sqrtf.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/directx/wine/wi… Modified: branches/dib_rewrite/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/advapi32/… Modified: branches/dib_rewrite/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/fusion/CM… Modified: branches/dib_rewrite/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/jscript/C… Modified: branches/dib_rewrite/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/jscript/a… Modified: branches/dib_rewrite/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/kernel32/… Modified: branches/dib_rewrite/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/CM… Modified: branches/dib_rewrite/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/da… Modified: branches/dib_rewrite/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/ls… Modified: branches/dib_rewrite/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/ls… Modified: branches/dib_rewrite/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/lsasrv/po… Modified: branches/dib_rewrite/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/dll/win32/shell32/l… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtdev.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpnp.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtpwr.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtrwr.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/bluetooth/fbtusb/fbtusb.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/bluetooth/f… Modified: branches/dib_rewrite/drivers/filters/mountmgr/point.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/filters/mou… Modified: branches/dib_rewrite/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/drivers/network/tcp… Removed: branches/dib_rewrite/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libcoldn… Removed: branches/dib_rewrite/importlibs/libgcc.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libgcc.a… Removed: branches/dib_rewrite/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libmingw… Removed: branches/dib_rewrite/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libmingw… Removed: branches/dib_rewrite/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/libsupc%… Removed: branches/dib_rewrite/importlibs/oldnames.lib URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/importlibs/oldnames… Modified: branches/dib_rewrite/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/crt/mingw32… Modified: branches/dib_rewrite/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/ddk/wdm.h?r… Modified: branches/dib_rewrite/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/ndk/rtlfunc… Modified: branches/dib_rewrite/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/mstcpi… Modified: branches/dib_rewrite/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/ntdef.… Modified: branches/dib_rewrite/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/ntseca… Modified: branches/dib_rewrite/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/winnt.… Modified: branches/dib_rewrite/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/psdk/winuse… Modified: branches/dib_rewrite/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/reactos/win… Modified: branches/dib_rewrite/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/include/xdk/rtlfunc… Modified: branches/dib_rewrite/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/3rdparty/libwin… Modified: branches/dib_rewrite/lib/drivers/lwip/src/include/arch/cc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/drivers/lwip/sr… Modified: branches/dib_rewrite/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/rtl/mem.c?rev=5… Modified: branches/dib_rewrite/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/rtl/path.c?rev=… Modified: branches/dib_rewrite/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/sdk/crt/include… Modified: branches/dib_rewrite/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/lib/sdk/crt/oldname… Modified: branches/dib_rewrite/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/cache/sect… Modified: branches/dib_rewrite/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/cache/sect… Modified: branches/dib_rewrite/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/include/in… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/ex… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/se… Modified: branches/dib_rewrite/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/ARM3/vi… Modified: branches/dib_rewrite/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/i386/pa… Modified: branches/dib_rewrite/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/rmap.c?… Modified: branches/dib_rewrite/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/ntoskrnl/mm/section… Modified: branches/dib_rewrite/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/eng… Modified: branches/dib_rewrite/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/eng… Modified: branches/dib_rewrite/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/lin… Modified: branches/dib_rewrite/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/map… Modified: branches/dib_rewrite/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mem… Modified: branches/dib_rewrite/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/mou… Modified: branches/dib_rewrite/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/pde… Modified: branches/dib_rewrite/win32ss/gdi/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/rle… Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur… Modified: branches/dib_rewrite/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/sur… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/c… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/c… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/f… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/g… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/g… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/i… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/l… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/p… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/r… Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/s… Modified: branches/dib_rewrite/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/include/ntg… Modified: branches/dib_rewrite/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/include/ntu… Modified: branches/dib_rewrite/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/pch.h?rev=5… Modified: branches/dib_rewrite/win32ss/reactx/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/reactx/ntdd… Modified: branches/dib_rewrite/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/misc/registry.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/ntuser… Modified: branches/dib_rewrite/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/user/user32… Modified: branches/dib_rewrite/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/win32kp.h?r…

1 0

[tkreuzer] 56543: [WIN32K] Fix crashes due to CreateDIBitmap tests
by tkreuzer＠svn.reactos.org 08 May '12

08 May '12

Author: tkreuzer Date: Tue May 8 16:21:27 2012 New Revision: 56543 URL: http://svn.reactos.org/svn/reactos?rev=56543&view=rev Log: [WIN32K] Fix crashes due to CreateDIBitmap tests 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] Tue May 8 16:21:27 2012 @@ -406,6 +406,8 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + + if (!bmi) return 0; SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -1380,6 +1382,7 @@ if(pjInit && (fInit == CBM_INIT)) { + if (cjMaxBits == 0) return NULL; safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) {

1 0

[tkreuzer] 56542: [GDI32_APITEST] Add more tests for CreateDIBitmap and CreateDIBPatternBrushPt
by tkreuzer＠svn.reactos.org 08 May '12

08 May '12

Author: tkreuzer Date: Tue May 8 15:49:04 2012 New Revision: 56542 URL: http://svn.reactos.org/svn/reactos?rev=56542&view=rev Log: [GDI32_APITEST] Add more tests for CreateDIBitmap and CreateDIBPatternBrushPt Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Tue May 8 15:49:04 2012 @@ -57,7 +57,7 @@ /* Create a DIB brush with palette indices */ hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); - ok(hbr != 0, "CreateSolidBrush failed, skipping tests.\n"); + ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); if (!hbr) return; /* Select the brush into the dc */ @@ -135,6 +135,33 @@ } +void Test_CreateDIBPatternBrushPt_RLE8() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE ajBuffer[20]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RLE8, 20, 1, 1, 4, 0}, + {0, 1, 2, 7}, + {4,0, 0,2,0,1,0,2,3,1, 2,1, 2,2, 1,3,1,0,1,2, }, + }; + HBRUSH hbr; + + HDC hdc = CreateCompatibleDC(0); + HBITMAP hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed, skipping tests.\n"); + + /* Create a DIB brush with palette indices */ + hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); + ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); + if (!hbr) return; + + +} + START_TEST(CreateDIBPatternBrush) { @@ -142,5 +169,6 @@ Test_CreateDIBPatternBrush(); Test_CreateDIBPatternBrushPt(); + Test_CreateDIBPatternBrushPt_RLE8(); } Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Tue May 8 15:49:04 2012 @@ -8,6 +8,300 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> +#include "init.h" + +#define CBM_CREATDIB 2 + +BOOL +GetExpected( + DWORD *pdwError, + HDC hdc, + const BITMAPINFOHEADER *lpbmih, + DWORD fdwInit, + const VOID *lpbInit, + const BITMAPINFO *lpbmi, + UINT fuUsage) +{ + if (fuUsage > 2) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + + if (fuUsage != 0) + { + if (hdc == (HDC)-1) + { + return FALSE; + } + } + + if (fdwInit & CBM_INIT) + { + if (!lpbmih) + { + if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + } + else + { + if (lpbInit) + { + if (lpbInit == (PVOID)0xC0000000) return FALSE; + if (!lpbmi || (lpbmi == (PVOID)0xC0000000)) return FALSE; + if (lpbmi->bmiHeader.biSize == 0) return FALSE; + if (fuUsage == 2) return FALSE; + } + } + } + + + if (fdwInit & CBM_CREATDIB) + { + if (fuUsage == 2) return FALSE; + if ((fuUsage == DIB_PAL_COLORS) && !hdc) + { + return FALSE; + } + + if ((fdwInit & CBM_INIT)) + { + if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; + } + + if ((!lpbmi) || (lpbmi == (PVOID)0xc0000000) || (lpbmi->bmiHeader.biSize == 0)) + { + return FALSE; + } + + return TRUE; + } + + if (lpbmih && (lpbmih != (PVOID)0xc0000000) && (lpbmih->biSize != 0)) + { + if (hdc == (HDC)-1) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + } + + + if ((lpbmih == NULL) || + (lpbmih == (PVOID)0xC0000000) || + (lpbmih->biSize == 0)) + { + return FALSE; + } + + if (lpbmi == (PVOID)0xc0000000) return FALSE; + + + return TRUE; +} + + +void +Test_CreateDIBitmap_Params(void) +{ + HBITMAP hbmp; + HDC hdc; + BITMAPINFO bmi = + {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BITMAPINFO bmiBroken = + {{0, -2, -4, 55, 42, 21, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BYTE ajBits[10]; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, NULL, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(NULL, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, &bmiBroken, DIB_PAL_COLORS); + ok(hbmp != 0, "\n"); + + hbmp = CreateDIBitmap(NULL, NULL, 2, NULL, &bmi, 0); + ok(hbmp != 0, "\n"); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, NULL, CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, NULL, CBM_INIT, NULL, &bmiBroken, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, &bmi, 2); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, ajBits, NULL, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, (PVOID)0xc0000000, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + _SEH2_TRY + { + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, 0, ajBits, (PVOID)0xc0000000, DIB_PAL_COLORS); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hbmp = (HBITMAP)-1; + } + _SEH2_END; + ok(hbmp == (HBITMAP)-1, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, NULL, NULL, 5); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap((HDC)-1, &bmi.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(0xbadbad00); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &bmiBroken.bmiHeader, CBM_INIT, NULL, &bmi, DIB_PAL_COLORS); + ok(hbmp == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + if (1) + { + ULONG i1, i2, i3, i4, i5, i6; + HDC ahdc[3] = {0, hdc, (HDC)-1}; + PBITMAPINFOHEADER apbih[4] = {NULL, &bmi.bmiHeader, &bmiBroken.bmiHeader, (PVOID)0xC0000000}; + ULONG afInitf[12] = {0, 1, 2, 3, CBM_INIT, 4, 5, 6, 7, 8, 0x10, 0x20}; + PVOID apvBits[3] = {NULL, ajBits, (PVOID)0xc0000000}; + PBITMAPINFO apbmi[4] = {NULL, &bmi, &bmiBroken, (PVOID)0xC0000000}; + ULONG aiUsage[5] = {0, 1, 2, 3, 23}; + DWORD dwExpError; + BOOL bExpSuccess; + + for (i1 = 0; i1 < 3; i1++) + { + for (i2 = 0; i2 < 4; i2++) + { + for (i3 = 0; i3 < 8; i3++) + { + for (i4 = 0; i4 < 3; i4++) + { + for (i5 = 0; i5 < 4; i5++) + { + for (i6 = 0; i6 < 5; i6++) + { + SetLastError(0xbadbad00); + dwExpError = 0xbadbad00; + + bExpSuccess = GetExpected(&dwExpError, ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + + _SEH2_TRY + { + hbmp = CreateDIBitmap(ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hbmp = (HBITMAP)0; + } + _SEH2_END; + + if (bExpSuccess) + { + ok(hbmp != 0, "Expected success for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + i1, i2, i3, i4, i5, i6, + ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + else + { + ok(hbmp == 0, "Expected failure for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + i1, i2, i3, i4, i5, i6, + ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + + // ok(GetLastError() == dwExpError, "Expected error %ld got %ld for (%ld,%ld,%ld,%ld,%ld,%ld) CreateDIBitmap(%p, %p, 0x%lx, %p, %p, %ld)\n", + // dwExpError, GetLastError(), i1, i2, i3, i4, i5, i6, + // ahdc[i1], apbih[i2], afInitf[i3], apvBits[i4], apbmi[i5], aiUsage[i6]); + } + } + } + } + } + } + } + + +} + +void +Test_CreateDIBitmap_DIB_PAL_COLORS(void) +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD bmiColors[8]; + } bmibuffer; + BITMAPINFO *pbmi = (PVOID)&bmibuffer; + HBITMAP hbmp; + ULONG bits[16] = {0}; + HDC hdc; + HPALETTE hpalOld; + USHORT i; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + /* Select a palette */ + hpalOld = SelectPalette(hdc, ghpal, FALSE); + ok(hpalOld != NULL, "error=%ld\n", GetLastError()); + + /* Initialize a BITMAPINFO */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = -2; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 8; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 1; + pbmi->bmiHeader.biYPelsPerMeter = 1; + pbmi->bmiHeader.biClrUsed = 8; + pbmi->bmiHeader.biClrImportant = 0; + + for( i = 0; i < 8; i++ ) + { + bmibuffer.bmiColors[i] = i; + } + + /* Create the bitmap */ + hbmp = CreateDIBitmap(hdc, &pbmi->bmiHeader, CBM_INIT, bits, pbmi, DIB_PAL_COLORS); + ok(hbmp != 0, "failed\n"); + + SelectObject(hdc, hbmp); + + +} void Test_CreateDIBitmap1(void) @@ -51,7 +345,8 @@ bmi.bmiHeader.biCompression = BI_RLE8; bmi.bmiHeader.biBitCount = 8; bmi.bmiHeader.biSizeImage = 8; - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, rlebits, &bmi, DIB_RGB_COLORS); + bmi.bmiHeader.biClrUsed = 1; + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, rlebits, &bmi, DIB_PAL_COLORS); ok(hbmp != 0, "failed\n"); ok(GetLastError() == 0, "GetLastError() == %ld\n", GetLastError()); @@ -68,10 +363,92 @@ } - +void Test_CreateDIBitmap_RLE8() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE ajBuffer[20]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RLE8, 20, 1, 1, 4, 0}, + {0, 1, 2, 7}, + {4,0, 0,2,0,1,0,2,3,1, 2,1, 2,2, 1,3,1,0,1,2, }, + }; + HDC hdc; + HBITMAP hbmp; + + hdc = CreateCompatibleDC(0); + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 2; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 1; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + PackedDIB.bmiHeader.biSizeImage = 0; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp == 0, "CreateDIBitmap succeeded, expeted failure\n"); + ok_err(0xbadbad00); + + /* Test a line that is too long */ + PackedDIB.bmiHeader.biSizeImage = 20; + PackedDIB.ajBuffer[0] = 17; + hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed\n"); + ok_err(0xbadbad00); + DeleteObject(hbmp); + + +} + +void +Test_CreateDIBitmap_CBM_CREATDIB(void) +{ + HBITMAP hbmp; + HDC hdc; + BITMAPINFO bmi = + {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; + BYTE ajBits[10]; + BITMAP bitmap; + + hdc = CreateCompatibleDC(0); + ok(hdc != 0, "failed\n"); + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_CREATDIB, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + + ok_long(GetObject(hbmp, sizeof(DIBSECTION), &bitmap), sizeof(BITMAP)); + ok_int(bitmap.bmType, 0); + ok_int(bitmap.bmWidth, 4); + ok_int(bitmap.bmHeight, 4); + ok_int(bitmap.bmWidthBytes, 4); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 8); + ok_ptr(bitmap.bmBits, 0); + +} START_TEST(CreateDIBitmap) { + InitStuff(); + Test_CreateDIBitmap_Params(); Test_CreateDIBitmap1(); -} - + Test_CreateDIBitmap_DIB_PAL_COLORS(); + Test_CreateDIBitmap_RLE8(); + Test_CreateDIBitmap_CBM_CREATDIB(); +} +

1 0

[tkreuzer] 56541: [WIN32] Add undocumented flag CBM_CREATDIB
by tkreuzer＠svn.reactos.org 08 May '12

08 May '12

Author: tkreuzer Date: Tue May 8 14:57:57 2012 New Revision: 56541 URL: http://svn.reactos.org/svn/reactos?rev=56541&view=rev Log: [WIN32] Add undocumented flag CBM_CREATDIB Modified: trunk/reactos/win32ss/include/ntgdityp.h Modified: trunk/reactos/win32ss/include/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdityp.h… ============================================================================== --- trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntgdityp.h [iso-8859-1] Tue May 8 14:57:57 2012 @@ -222,6 +222,9 @@ #define CLIPRGN 1 // GetClipRgn #define METARGN 2 // GetMetaRgn #define APIRGN 3 + +/* Undocumented flag for fdwInit in CreateDIBitmap */ +#define CBM_CREATDIB 2 /* TYPES *********************************************************************/

1 0

[arty] 56540: [NTOSKRNL] Fix a couple of omissions from my PAGEOP removal; Make sure to place a wait entry in the address space when faulting in bss pages. Restore the original entry in the final c...
by arty＠svn.reactos.org 08 May '12

08 May '12

Author: arty Date: Tue May 8 06:01:59 2012 New Revision: 56540 URL: http://svn.reactos.org/svn/reactos?rev=56540&view=rev Log: [NTOSKRNL] Fix a couple of omissions from my PAGEOP removal; Make sure to place a wait entry in the address space when faulting in bss pages. Restore the original entry in the final cases of section swap out, because the entry had been replaced with a wait and nothing else restores it. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue May 8 06:01:59 2012 @@ -60,8 +60,8 @@ #undef MmSetPageEntrySectionSegment #define MmSetPageEntrySectionSegment(S,O,E) do { \ - DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n", S,(O)->LowPart,E); \ - _MmSetPageEntrySectionSegment(S,O,E,__FILE__,__LINE__); \ + DPRINT("SetPageEntrySectionSegment(old,%x,%x,%x)\n",(S),(O)->LowPart,E); \ + _MmSetPageEntrySectionSegment((S),(O),(E),__FILE__,__LINE__); \ } while (0) extern MMSESSION MmSession; @@ -1211,6 +1211,7 @@ BOOLEAN HasSwapEntry; PVOID PAddress; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + SWAPENTRY SwapEntry; /* * There is a window between taking the page fault and locking the @@ -1277,7 +1278,6 @@ if (HasSwapEntry) { - SWAPENTRY SwapEntry; /* * Is it a wait entry? */ @@ -1307,6 +1307,7 @@ MmUnlockSectionSegment(Segment); MmDeletePageFileMapping(Process, Address, &SwapEntry); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockAddressSpace(AddressSpace); MI_SET_USAGE(MI_USAGE_SECTION); @@ -1389,6 +1390,9 @@ */ if (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) { + /* We'll be unlocking the address space below. Prevent us from being preempted + * in faulting in the page. */ + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockSectionSegment(Segment); MI_SET_USAGE(MI_USAGE_SECTION); if (Process) MI_SET_PROCESS2(Process->ImageFileName); @@ -1396,14 +1400,16 @@ Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + MmLockAddressSpace(AddressSpace); } if (!NT_SUCCESS(Status)) { KeBugCheck(MEMORY_MANAGEMENT); } + /* Remove the wait entry we placed, so that we can map the page */ + MmDeletePageFileMapping(Process, PAddress, &SwapEntry); Status = MmCreateVirtualMapping(Process, PAddress, Region->Protect, @@ -1411,9 +1417,9 @@ 1); if (!NT_SUCCESS(Status)) { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); + DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); KeBugCheck(MEMORY_MANAGEMENT); - return(Status); + return(Status); } MmInsertRmap(Page, Process, Address); @@ -2042,7 +2048,7 @@ Address); KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address); } - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(MC_USER, Page); MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } @@ -2189,6 +2195,8 @@ Status = MmCreatePageFileMapping(Process, Address, SwapEntry); + /* We had placed a wait entry upon entry ... replace it before leaving */ + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); MmUnlockSectionSegment(Context.Segment); MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) @@ -2202,6 +2210,7 @@ MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Context.Segment); Entry = MAKE_SWAP_SSE(SwapEntry); + /* We had placed a wait entry upon entry ... replace it before leaving */ MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); MmUnlockSectionSegment(Context.Segment); MmUnlockAddressSpace(AddressSpace);

1 0

[jimtabor] 56539: - Fix build.
by jimtabor＠svn.reactos.org 08 May '12

08 May '12

Author: jimtabor Date: Tue May 8 05:57:09 2012 New Revision: 56539 URL: http://svn.reactos.org/svn/reactos?rev=56539&view=rev Log: - Fix build. Modified: trunk/reactos/win32ss/user/ntuser/focus.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Tue May 8 05:57:09 2012 @@ -141,7 +141,7 @@ List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())); if ( List ) { - if ( OldTid ) + if ( OldTID ) { for (phWnd = List; *phWnd; ++phWnd) {

1 0

[jimtabor] 56538: [Win32k] - Fix crash when sending activate application message and check if thread is in cleanup. Use kernel functions for thread data types.
by jimtabor＠svn.reactos.org 08 May '12

08 May '12

Author: jimtabor Date: Tue May 8 05:55:42 2012 New Revision: 56538 URL: http://svn.reactos.org/svn/reactos?rev=56538&view=rev Log: [Win32k] - Fix crash when sending activate application message and check if thread is in cleanup. Use kernel functions for thread data types. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Tue May 8 05:55:42 2012 @@ -84,6 +84,7 @@ USER_REFERENCE_ENTRY Ref, RefPrev; PWND Window, WindowPrev = NULL; HANDLE OldTID, NewTID; + PTHREADINFO ptiOld, ptiNew; if ((Window = UserGetWindowObject(hWnd))) { @@ -127,6 +128,8 @@ OldTID = WindowPrev ? IntGetWndThreadId(WindowPrev) : NULL; NewTID = Window ? IntGetWndThreadId(Window) : NULL; + ptiOld = WindowPrev ? WindowPrev->head.pti : NULL; + ptiNew = Window ? Window->head.pti : NULL; TRACE("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); @@ -136,27 +139,26 @@ HWND *List, *phWnd; List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())); - if (List) - { - if (OldTID) + if ( List ) + { + if ( OldTid ) { for (phWnd = List; *phWnd; ++phWnd) { cWindow = UserGetWindowObject(*phWnd); - - if (cWindow && (IntGetWndThreadId(cWindow) == OldTID)) + if (cWindow && cWindow->head.pti == ptiOld) { // FALSE if the window is being deactivated, // ThreadId that owns the window being activated. co_IntSendMessageNoWait(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); } } } - if (NewTID) + if ( NewTID ) { for (phWnd = List; *phWnd; ++phWnd) { cWindow = UserGetWindowObject(*phWnd); - if (cWindow && (IntGetWndThreadId(cWindow) == NewTID)) + if (cWindow && cWindow->head.pti == ptiNew) { // TRUE if the window is being activated, // ThreadId that owns the window being deactivated. co_IntSendMessageNoWait(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); @@ -306,9 +308,14 @@ IntSetFocusMessageQueue(Wnd->head.pti->MessageQueue); gptiForeground = Wnd->head.pti; fgRet = TRUE; - } - -//// Fix FG Bounce with regedit but breaks test_SFW todos + } +/* + Fix FG Bounce with regedit but breaks test_SFW todos: + Henri Verbeet, + What happens is that we get the WM_WINE_SETACTIVEWINDOW message sent by the + other thread after we already changed the foreground window back to our own + window. + */ if (hWndPrev != hWnd ) { if (PrevForegroundQueue && @@ -316,6 +323,13 @@ Wnd->head.pti->MessageQueue != PrevForegroundQueue && PrevForegroundQueue->spwndActive) { + //ERR("SFGW: Send NULL to 0x%x\n",hWndPrev); + if (pti->MessageQueue == PrevForegroundQueue) + { + //ERR("SFGW: TI same as Prev TI\n"); + co_IntSetActiveWindow(NULL, NULL, FALSE, TRUE); + } + else co_IntSendMessageNoWait(hWndPrev, WM_ASYNC_SETACTIVEWINDOW, 0, 0 ); } } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue May 8 05:55:42 2012 @@ -1498,7 +1498,8 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); - if (Win32Thread == NULL) + if (Win32Thread == NULL || + Win32Thread->TIF_flags & TIF_INCLEANUP) { RETURN(FALSE); } Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Tue May 8 05:55:42 2012 @@ -29,10 +29,10 @@ ((WndObj->head.pti) && (WndObj->head.pti == W32Thread)) #define IntGetWndThreadId(WndObj) \ - WndObj->head.pti->pEThread->Cid.UniqueThread + PsGetThreadId(WndObj->head.pti->pEThread) #define IntGetWndProcessId(WndObj) \ - WndObj->head.pti->pEThread->ThreadsProcess->UniqueProcessId + PsGetProcessId(WndObj->head.pti->ppi->peProcess) BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam);

1 0

[tkreuzer] 56537: [WIN32K] Don't assert on DIB brushes with BR_IS_DIBPALCOLORS, since we already handle this properly.
by tkreuzer＠svn.reactos.org 07 May '12

07 May '12

Author: tkreuzer Date: Mon May 7 22:57:41 2012 New Revision: 56537 URL: http://svn.reactos.org/svn/reactos?rev=56537&view=rev Log: [WIN32K] Don't assert on DIB brushes with BR_IS_DIBPALCOLORS, since we already handle this properly. Modified: trunk/reactos/win32ss/gdi/eng/engbrush.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] Mon May 7 22:57:41 2012 @@ -309,7 +309,7 @@ /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ if (pbr->flAttrs & BR_IS_DIBPALCOLORS) { - ASSERT(FALSE); + /* Create a palette with the colors from the DC */ ppalPattern = FixupDIBBrushPalette(psurfPattern->ppal, pebo->ppalDC); pebo->ppalDIB = ppalPattern; }

1 0

[tkreuzer] 56536: [WIN32K] - Implement EngMapSectionView and EngUnmapSectionView. Use EngUnmapSectionView in SURFACE_Cleanup.
by tkreuzer＠svn.reactos.org 07 May '12

07 May '12

Author: tkreuzer Date: Mon May 7 22:41:10 2012 New Revision: 56536 URL: http://svn.reactos.org/svn/reactos?rev=56536&view=rev Log: [WIN32K] - Implement EngMapSectionView and EngUnmapSectionView. Use EngUnmapSectionView in SURFACE_Cleanup. Added: trunk/reactos/win32ss/gdi/eng/mapping.h (with props) Modified: trunk/reactos/win32ss/gdi/eng/eng.h trunk/reactos/win32ss/gdi/eng/mapping.c trunk/reactos/win32ss/gdi/eng/surface.c trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] Mon May 7 22:41:10 2012 @@ -25,18 +25,4 @@ VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); ULONGLONG APIENTRY EngGetTickCount(VOID); -BOOL -APIENTRY -EngFreeSectionMem( - IN PVOID pvSection OPTIONAL, - IN PVOID pvMappedBase OPTIONAL); - -PVOID -APIENTRY -EngAllocSectionMem( - OUT PVOID *ppvSection, - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag); - VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG iFormat); Modified: trunk/reactos/win32ss/gdi/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mapping.c [iso-8859-1] Mon May 7 22:41:10 2012 @@ -15,44 +15,76 @@ #define MmMapViewInSessionSpace MmMapViewInSystemSpace #define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace -typedef struct _ENGSECTION -{ - PVOID pvSectionObject; - PVOID pvMappedBase; - SIZE_T cjViewSize; - ULONG ulTag; -} ENGSECTION, *PENGSECTION; - -typedef struct _FILEVIEW -{ - LARGE_INTEGER LastWriteTime; - PVOID pvKView; - PVOID pvViewFD; - SIZE_T cjView; - PVOID pSection; -} FILEVIEW, *PFILEVIEW; - -typedef struct _FONTFILEVIEW -{ - FILEVIEW; - DWORD reserved[2]; - PWSTR pwszPath; - SIZE_T ulRegionSize; - ULONG cKRefCount; - ULONG cRefCountFD; - PVOID pvSpoolerBase; - DWORD dwSpoolerPid; -} FONTFILEVIEW, *PFONTFILEVIEW; - -enum -{ - FVF_SYSTEMROOT = 1, - FVF_READONLY = 2, - FVF_FONTFILE = 4, -}; - HANDLE ghSystem32Directory; HANDLE ghRootDirectory; + +PVOID +NTAPI +EngMapSectionView( + _In_ HANDLE hSection, + _In_ SIZE_T cjSize, + _In_ ULONG cjOffset, + _Out_ PHANDLE phSecure) +{ + LARGE_INTEGER liSectionOffset; + PVOID pvBaseAddress; + NTSTATUS Status; + + /* Align the offset at allocation granularity and compensate for the size */ + liSectionOffset.QuadPart = cjOffset & ~(MM_ALLOCATION_GRANULARITY - 1); + cjSize += cjOffset & (MM_ALLOCATION_GRANULARITY - 1); + + /* Map the section */ + Status = ZwMapViewOfSection(hSection, + NtCurrentProcess(), + &pvBaseAddress, + 0, + cjSize, + &liSectionOffset, + &cjSize, + ViewShare, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwMapViewOfSection failed (0x%lx)\n", Status); + return NULL; + } + + /* Secure the section memory */ + *phSecure = EngSecureMem(pvBaseAddress, cjSize); + if (!*phSecure) + { + ZwUnmapViewOfSection(NtCurrentProcess(), pvBaseAddress); + return NULL; + } + + /* Return the address where the requested data starts */ + return (PUCHAR)pvBaseAddress + (cjOffset & (MM_ALLOCATION_GRANULARITY - 1)); +} + +VOID +NTAPI +EngUnmapSectionView( + _In_ PVOID pvBits, + _In_ ULONG cjOffset, + _In_ HANDLE hSecure) +{ + NTSTATUS Status; + + /* Unsecure the memory */ + EngUnsecureMem(hSecure); + + /* Calculate the real start of the section view */ + pvBits = (PUCHAR)pvBits - (cjOffset & (MM_ALLOCATION_GRANULARITY - 1)); + + /* Unmap the section view */ + Status = MmUnmapViewOfSection(PsGetCurrentProcess(), pvBits); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not unmap section view!\n"); + } +} PVOID @@ -156,7 +188,7 @@ } else { - DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", + DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", pSection->pvMappedBase, Status); } } Added: trunk/reactos/win32ss/gdi/eng/mapping.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mapping.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mapping.h (added) +++ trunk/reactos/win32ss/gdi/eng/mapping.h [iso-8859-1] Mon May 7 22:41:10 2012 @@ -1,0 +1,88 @@ + +typedef struct _ENGSECTION +{ + PVOID pvSectionObject; + PVOID pvMappedBase; + SIZE_T cjViewSize; + ULONG ulTag; +} ENGSECTION, *PENGSECTION; + +typedef struct _FILEVIEW +{ + LARGE_INTEGER LastWriteTime; + PVOID pvKView; + PVOID pvViewFD; + SIZE_T cjView; + PVOID pSection; +} FILEVIEW, *PFILEVIEW; + +typedef struct _FONTFILEVIEW +{ + FILEVIEW; + DWORD reserved[2]; + PWSTR pwszPath; + SIZE_T ulRegionSize; + ULONG cKRefCount; + ULONG cRefCountFD; + PVOID pvSpoolerBase; + DWORD dwSpoolerPid; +} FONTFILEVIEW, *PFONTFILEVIEW; + +enum +{ + FVF_SYSTEMROOT = 1, + FVF_READONLY = 2, + FVF_FONTFILE = 4, +}; + +PVOID +NTAPI +EngMapSectionView( + _In_ HANDLE hSection, + _In_ SIZE_T cjSize, + _In_ ULONG cjOffset, + _Out_ PHANDLE phSecure); + +VOID +NTAPI +EngUnmapSectionView( + _In_ PVOID pvBits, + _In_ ULONG cjOffset, + _In_ HANDLE hSecure); + +PVOID +NTAPI +EngCreateSection( + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag); + +BOOL +APIENTRY +EngMapSection( + IN PVOID pvSection, + IN BOOL bMap, + IN HANDLE hProcess, + OUT PVOID* pvBaseAddress); + +PVOID +APIENTRY +EngAllocSectionMem( + OUT PVOID *ppvSection, + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag); + +BOOL +APIENTRY +EngFreeSectionMem( + IN PVOID pvSection OPTIONAL, + IN PVOID pvMappedBase OPTIONAL); + +PFILEVIEW +NTAPI +EngLoadModuleEx( + LPWSTR pwsz, + ULONG cjSizeOfModule, + FLONG fl); + Propchange: trunk/reactos/win32ss/gdi/eng/mapping.h ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon May 7 22:41:10 2012 @@ -68,7 +68,6 @@ { PSURFACE psurf = (PSURFACE)ObjectBody; PVOID pvBits = psurf->SurfObj.pvBits; - NTSTATUS Status; /* Check if the surface has bits */ if (pvBits) @@ -79,20 +78,8 @@ /* Check if it is a DIB section */ if (psurf->hDIBSection) { - /* Unsecure the memory */ - EngUnsecureMem(psurf->hSecure); - - /* Calculate the real start of the section */ - pvBits = (PVOID)((ULONG_PTR)pvBits - psurf->dwOffset); - - /* Unmap the section */ - Status = MmUnmapViewOfSection(PsGetCurrentProcess(), pvBits); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not unmap section view!\n"); - // Should we BugCheck here? - ASSERT(FALSE); - } + /* Unmap the section view */ + EngUnmapSectionView(pvBits, psurf->dwOffset, psurf->hSecure); } else if (psurf->SurfObj.fjBitmap & BMF_USERMEM) { Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=5653… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Mon May 7 22:41:10 2012 @@ -49,6 +49,7 @@ #include "gdi/eng/xlateobj.h" #include "gdi/eng/floatobj.h" #include "gdi/eng/mouse.h" +#include "gdi/eng/mapping.h" #include "gdi/ntgdi/xformobj.h" #include "gdi/ntgdi/brush.h" #include "gdi/ntgdi/color.h"

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