Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[jgardou] 63927: [CMAKE] - Try a ninja (the warrior) technique to finally get the dependencies on reactos.cab right
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 16:47:58 2014 New Revision: 63927 URL: http://svn.reactos.org/svn/reactos?rev=63927&view=rev Log: [CMAKE] - Try a ninja (the warrior) technique to finally get the dependencies on reactos.cab right Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Aug 23 16:47:58 2014 @@ -377,11 +377,11 @@ # generate reactos.cab before anything else get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) - # begin with reactos.inf. It doesn't depend on anything so that it's always generated (that's for optional modules) + # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do. add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf - DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf) + DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab

1 0

[hbelusca] 63926: [CONSRV]: Add some accelerators and fix few french strings. TO TRANSLATORS: Please add accelerators for the other languages!
by hbelusca＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: hbelusca Date: Sat Aug 23 16:38:22 2014 New Revision: 63926 URL: http://svn.reactos.org/svn/reactos?rev=63926&view=rev Log: [CONSRV]: Add some accelerators and fix few french strings. TO TRANSLATORS: Please add accelerators for the other languages! Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] Sat Aug 23 16:38:22 2014 @@ -2,15 +2,15 @@ STRINGTABLE BEGIN - IDS_EDIT "Edit" + IDS_EDIT "&Edit" IDS_MARK "Mark" IDS_COPY "Copy\tEnter" IDS_PASTE "Paste" IDS_SELECTALL "Select All" IDS_SCROLL "Scroll" IDS_FIND "Find..." - IDS_DEFAULTS "Defaults" - IDS_PROPERTIES "Properties" + IDS_DEFAULTS "&Defaults" + IDS_PROPERTIES "&Properties" /* IDS_SCROLLHERE "Scroll here" IDS_SCROLLTOP "Scroll top" Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] Sat Aug 23 16:38:22 2014 @@ -1,18 +1,16 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -/* Fixme : Translation could be really improved, with context - La traduction pourrait rÃ©ellement Ãªtre amÃ©liorÃ©e grÃ¢ce au contexte */ STRINGTABLE BEGIN - IDS_EDIT "Ãditer" - IDS_MARK "Marquer" - IDS_COPY "Copier\tEntrÃ©e" - IDS_PASTE "Coller" - IDS_SELECTALL "Tout sÃ©lectionner" - IDS_SCROLL "DÃ©filer" - IDS_FIND "Trouver..." - IDS_DEFAULTS "DÃ©fauts" - IDS_PROPERTIES "PropriÃ©tÃ©s" + IDS_EDIT "Ãd&ition" + IDS_MARK "&Marquer" + IDS_COPY "&Copier\tEntrÃ©e" + IDS_PASTE "C&oller" + IDS_SELECTALL "SÃ©lectionner &tout" + IDS_SCROLL "&DÃ©filer" + IDS_FIND "&Rechercher..." + IDS_DEFAULTS "&DÃ©fauts" + IDS_PROPERTIES "&PropriÃ©tÃ©s" /* IDS_SCROLLHERE "DÃ©filer ici" IDS_SCROLLTOP "DÃ©filer tout en haut"

1 0

[hbelusca] 63925: [FONTS] Updated UniVGA font by Roy Tam, thanks ; ) CORE-7706
by hbelusca＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: hbelusca Date: Sat Aug 23 16:22:12 2014 New Revision: 63925 URL: http://svn.reactos.org/svn/reactos?rev=63925&view=rev Log: [FONTS] Updated UniVGA font by Roy Tam, thanks ;) CORE-7706 Modified: trunk/reactos/media/fonts/UniVGA16.ttf Modified: trunk/reactos/media/fonts/UniVGA16.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/UniVGA16.ttf?r… ============================================================================== Binary files - no diff available.

1 0

[jgardou] 63924: [CMAKE] - Make a conditional copy of reactos.inf when it is really modified, make reactos.acb depend on it. Hopefully the last commit so that windows buildbot gets really fixed
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 15:53:58 2014 New Revision: 63924 URL: http://svn.reactos.org/svn/reactos?rev=63924&view=rev Log: [CMAKE] - Make a conditional copy of reactos.inf when it is really modified, make reactos.acb depend on it. Hopefully the last commit so that windows buildbot gets really fixed Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Aug 23 15:53:58 2014 @@ -376,10 +376,17 @@ function(create_iso_lists) # generate reactos.cab before anything else get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) + + # begin with reactos.inf. It doesn't depend on anything so that it's always generated (that's for optional modules) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf -N -P ${REACTOS_SOURCE_DIR} - DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf native-cabman ${_filelist}) + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman ${_filelist}) add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) add_dependencies(reactos_cab reactos_cab_inf)

1 0

[hbelusca] 63923: Sync to trunk revision 63922.
by hbelusca＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: hbelusca Date: Sat Aug 23 15:51:37 2014 New Revision: 63923 URL: http://svn.reactos.org/svn/reactos?rev=63923&view=rev Log: Sync to trunk revision 63922. Added: branches/condrv_restructure/include/crt/ivec.h - copied unchanged from r63922, trunk/reactos/include/crt/ivec.h branches/condrv_restructure/include/psdk/bthdef.h - copied unchanged from r63922, trunk/reactos/include/psdk/bthdef.h branches/condrv_restructure/include/psdk/stralign.h - copied unchanged from r63922, trunk/reactos/include/psdk/stralign.h Modified: branches/condrv_restructure/ (props changed) branches/condrv_restructure/base/applications/rapps/misc.c branches/condrv_restructure/base/shell/explorer/shell/shellfs.cpp branches/condrv_restructure/base/shell/explorer/shell/winfs.cpp branches/condrv_restructure/base/shell/explorer/shell/winfs.h branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt branches/condrv_restructure/cmake/CMakeMacros.cmake branches/condrv_restructure/cmake/gcc.cmake branches/condrv_restructure/dll/cpl/appwiz/addons.c branches/condrv_restructure/dll/win32/shell32/defcontextmenu.cpp branches/condrv_restructure/dll/win32/shell32/folders/admintools.cpp branches/condrv_restructure/dll/win32/shell32/folders/admintools.h branches/condrv_restructure/dll/win32/shell32/folders/cpanel.cpp branches/condrv_restructure/dll/win32/shell32/folders/cpanel.h branches/condrv_restructure/dll/win32/shell32/folders/desktop.cpp branches/condrv_restructure/dll/win32/shell32/folders/desktop.h branches/condrv_restructure/dll/win32/shell32/folders/fonts.cpp branches/condrv_restructure/dll/win32/shell32/folders/fonts.h branches/condrv_restructure/dll/win32/shell32/folders/fs.cpp branches/condrv_restructure/dll/win32/shell32/folders/fs.h branches/condrv_restructure/dll/win32/shell32/folders/mycomp.cpp branches/condrv_restructure/dll/win32/shell32/folders/mycomp.h branches/condrv_restructure/dll/win32/shell32/folders/mydocuments.cpp branches/condrv_restructure/dll/win32/shell32/folders/mydocuments.h branches/condrv_restructure/dll/win32/shell32/folders/netplaces.cpp branches/condrv_restructure/dll/win32/shell32/folders/netplaces.h branches/condrv_restructure/dll/win32/shell32/folders/printers.cpp branches/condrv_restructure/dll/win32/shell32/folders/printers.h branches/condrv_restructure/dll/win32/shell32/folders/recyclebin.cpp branches/condrv_restructure/dll/win32/shell32/folders/recyclebin.h branches/condrv_restructure/dll/win32/shell32/shlview.cpp branches/condrv_restructure/drivers/filesystems/npfs/seinfo.c branches/condrv_restructure/drivers/filesystems/npfs/waitsup.c branches/condrv_restructure/drivers/network/ndisuio/main.c branches/condrv_restructure/drivers/network/ndisuio/ndisuio.h branches/condrv_restructure/drivers/network/ndisuio/protocol.c branches/condrv_restructure/drivers/network/tcpip/tcpip/fileobjs.c branches/condrv_restructure/hal/halx86/generic/dma.c branches/condrv_restructure/include/psdk/driverspecs.h branches/condrv_restructure/include/psdk/shobjidl.idl branches/condrv_restructure/include/psdk/shtypes.idl branches/condrv_restructure/lib/drivers/ip/transport/rawip/rawip.c branches/condrv_restructure/lib/drivers/ip/transport/udp/udp.c branches/condrv_restructure/ntoskrnl/cc/copy.c branches/condrv_restructure/ntoskrnl/cc/fs.c branches/condrv_restructure/ntoskrnl/cc/view.c branches/condrv_restructure/ntoskrnl/config/cmsysini.c branches/condrv_restructure/ntoskrnl/include/internal/cc.h branches/condrv_restructure/ntoskrnl/io/iomgr/device.c branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpmgr.c branches/condrv_restructure/toolchain-gcc.cmake branches/condrv_restructure/win32ss/gdi/gdi32/objects/bitmap.c branches/condrv_restructure/win32ss/gdi/gdi32/objects/utils.c branches/condrv_restructure/win32ss/gdi/ntgdi/dibobj.c branches/condrv_restructure/win32ss/user/ntuser/misc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/condrv_restructure/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e… Modified: branches/condrv_restructure/base/shell/explorer/shell/winfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e… Modified: branches/condrv_restructure/base/shell/explorer/shell/winfs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e… Modified: branches/condrv_restructure/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat… Modified: branches/condrv_restructure/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/cmake/CMakeM… Modified: branches/condrv_restructure/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/cmake/gcc.cm… Modified: branches/condrv_restructure/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/appw… Modified: branches/condrv_restructure/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/admintools.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/cpanel.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/cpanel.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/fonts.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/mycomp.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/netplaces.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/printers.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/printers.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/folders/recyclebin.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/netw… Modified: branches/condrv_restructure/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/netw… Modified: branches/condrv_restructure/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/netw… Modified: branches/condrv_restructure/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/netw… Modified: branches/condrv_restructure/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/hal/halx86/g… Modified: branches/condrv_restructure/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… Modified: branches/condrv_restructure/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… Modified: branches/condrv_restructure/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… Modified: branches/condrv_restructure/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/drivers/… Modified: branches/condrv_restructure/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/drivers/… Modified: branches/condrv_restructure/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/cc/… Modified: branches/condrv_restructure/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/cc/… Modified: branches/condrv_restructure/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/cc/… Modified: branches/condrv_restructure/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/con… Modified: branches/condrv_restructure/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/inc… Modified: branches/condrv_restructure/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/toolchain-gc… Modified: branches/condrv_restructure/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…

1 0

[jgardou] 63922: [WIN32K] - Remove left-over assert
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 15:20:44 2014 New Revision: 63922 URL: http://svn.reactos.org/svn/reactos?rev=63922&view=rev Log: [WIN32K] - Remove left-over assert 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] Sat Aug 23 15:20:44 2014 @@ -604,7 +604,6 @@ /* HACK: If this is a RLE bitmap, only the relevant pixels must be set. */ if ((bmi->bmiHeader.biCompression == BI_RLE8) || (bmi->bmiHeader.biCompression == BI_RLE4)) { - ASSERT(ScanLines == bmi->bmiHeader.biHeight); hMaskBitmap = IntGdiCreateMaskFromRLE(bmi->bmiHeader.biWidth, ScanLines, bmi->bmiHeader.biCompression,

1 0

[jgardou] 63921: [CMAKE] - make reactos_cab_inf an unconditional target. Should fix windows testbot
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 14:40:00 2014 New Revision: 63921 URL: http://svn.reactos.org/svn/reactos?rev=63921&view=rev Log: [CMAKE] - make reactos_cab_inf an unconditional target. Should fix windows testbot Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sat Aug 23 14:40:00 2014 @@ -31,17 +31,13 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn ) -# And now we build reactos.inf -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf +add_custom_target( + reactos_cab_inf COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) -# reactos.cab generation will be made later (cf. CMakeMacros.cmake - create iso lists) -add_custom_target(reactos_cab_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) - add_cd_file( - TARGET reactos_cab + TARGET reactos_cab_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[jgardou] 63920: [WIN32K] - Improve the "infamous RLE hack" in SetDIBitsToDevice by using a mask bitmap corresponding to the valid RLE data [GDI32] - Improve some input checks
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 14:20:16 2014 New Revision: 63920 URL: http://svn.reactos.org/svn/reactos?rev=63920&view=rev Log: [WIN32K] - Improve the "infamous RLE hack" in SetDIBitsToDevice by using a mask bitmap corresponding to the valid RLE data [GDI32] - Improve some input checks Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/utils.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Sat Aug 23 14:20:16 2014 @@ -671,8 +671,7 @@ if (ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS + 1) return 0; - pConvertedInfo = ConvertBitmapInfo(lpbmi, ColorUse, &ConvertedInfoSize, - FALSE); + pConvertedInfo = ConvertBitmapInfo(lpbmi, ColorUse, &ConvertedInfoSize, FALSE); if (!pConvertedInfo) return 0; @@ -720,6 +719,15 @@ } } #endif + + if ((pConvertedInfo->bmiHeader.biCompression == BI_RLE8) || + (pConvertedInfo->bmiHeader.biCompression == BI_RLE4)) + { + /* For compressed data, we must set the whole thing */ + StartScan = 0; + ScanLines = pConvertedInfo->bmiHeader.biHeight; + } + cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO) lpbmi, ScanLines); pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); Modified: trunk/reactos/win32ss/gdi/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/utils.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/utils.c [iso-8859-1] Sat Aug 23 14:20:16 2014 @@ -296,6 +296,35 @@ RtlCopyMemory((PVOID)NewDataPtr, (PVOID)OldDataPtr, DataSize); } } + else + { + /* Verify some data validity */ + switch (BitmapInfo->bmiHeader.biCompression) + { + case BI_RLE8: + if (BitmapInfo->bmiHeader.biBitCount != 8) + return NULL; + if (BitmapInfo->bmiHeader.biHeight < 0) + return NULL; + break; + case BI_RLE4: + if (BitmapInfo->bmiHeader.biBitCount != 4) + return NULL; + if (BitmapInfo->bmiHeader.biHeight < 0) + return NULL; + break; + default: + break; + } + + /* Non "standard" formats must have a valid size set */ + if ((BitmapInfo->bmiHeader.biCompression != BI_RGB) && + (BitmapInfo->bmiHeader.biCompression != BI_BITFIELDS)) + { + if (BitmapInfo->bmiHeader.biSizeImage == 0) + return NULL; + } + } Size = NewBitmapInfo->bmiHeader.biSize; if (ColorSpec == DIB_RGB_COLORS) 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] Sat Aug 23 14:20:16 2014 @@ -375,6 +375,115 @@ return result; } +static +HBITMAP +IntGdiCreateMaskFromRLE( + DWORD Width, + DWORD Height, + ULONG Compression, + const BYTE* Bits, + DWORD BitsSize) +{ + HBITMAP Mask; + DWORD x, y; + SURFOBJ* SurfObj; + UINT i = 0; + BYTE Data, NumPixels, ToSkip; + + ASSERT((Compression == BI_RLE8) || (Compression == BI_RLE4)); + + /* Create the bitmap */ + Mask = GreCreateBitmapEx(Width, Height, 0, BMF_1BPP, 0, 0, NULL, 0); + if (!Mask) + return NULL; + + SurfObj = EngLockSurface((HSURF)Mask); + if (!SurfObj) + { + GreDeleteObject(Mask); + return NULL; + } + ASSERT(SurfObj->pvBits != NULL); + + x = y = 0; + + while (i < BitsSize) + { + NumPixels = Bits[i]; + Data = Bits[i + 1]; + i += 2; + + if (NumPixels != 0) + { + if ((x + NumPixels) > Width) + NumPixels = Width - x; + + if (NumPixels == 0) + continue; + + DIB_1BPP_HLine(SurfObj, x, x + NumPixels, y, 1); + x += NumPixels; + continue; + } + + if (Data < 3) + { + switch (Data) + { + case 0: + /* End of line */ + y++; + if (y == Height) + goto done; + x = 0; + break; + case 1: + /* End of file */ + goto done; + case 2: + /* Jump */ + if (i >= (BitsSize - 1)) + goto done; + x += Bits[i]; + if (x > Width) + x = Width; + y += Bits[i + 1]; + if (y >= Height) + goto done; + i += 2; + break; + } + /* Done for this run */ + continue; + } + + /* Embedded data into the RLE */ + NumPixels = Data; + if (Compression == BI_RLE8) + ToSkip = NumPixels; + else + ToSkip = (NumPixels / 2) + (NumPixels & 1); + + if ((i + ToSkip) > BitsSize) + goto done; + ToSkip = (ToSkip + 1) & ~1; + + if ((x + NumPixels) > Width) + NumPixels = Width - x; + + if (NumPixels != 0) + { + DIB_1BPP_HLine(SurfObj, x, x + NumPixels, y, 1); + x += NumPixels; + } + i += ToSkip; + } + +done: + EngUnlockSurface(SurfObj); + return Mask; +} + W32KAPI INT APIENTRY @@ -399,8 +508,8 @@ INT ret = 0; NTSTATUS Status = STATUS_SUCCESS; PDC pDC; - HBITMAP hSourceBitmap = NULL; - SURFOBJ *pDestSurf, *pSourceSurf = NULL; + HBITMAP hSourceBitmap = NULL, hMaskBitmap = NULL; + SURFOBJ *pDestSurf, *pSourceSurf = NULL, *pMaskSurf = NULL; SURFACE *pSurf; RECTL rcDest; POINTL ptSource; @@ -492,6 +601,29 @@ goto Exit; } + /* HACK: If this is a RLE bitmap, only the relevant pixels must be set. */ + if ((bmi->bmiHeader.biCompression == BI_RLE8) || (bmi->bmiHeader.biCompression == BI_RLE4)) + { + ASSERT(ScanLines == bmi->bmiHeader.biHeight); + hMaskBitmap = IntGdiCreateMaskFromRLE(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biCompression, + Bits, + cjMaxBits); + if (!hMaskBitmap) + { + EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + goto Exit; + } + pMaskSurf = EngLockSurface((HSURF)hMaskBitmap); + if (!pMaskSurf) + { + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + } + /* Create a palette for the DIB */ ppalDIB = CreateDIBPalette(bmi, pDC, ColorUse); if (!ppalDIB) @@ -529,15 +661,15 @@ ptSource.x, ptSource.y, SourceSize.cx, SourceSize.cy); Status = IntEngBitBlt(pDestSurf, pSourceSurf, - NULL, + pMaskSurf, &pDC->co.ClipObj, &exlo.xlo, &rcDest, &ptSource, + pMaskSurf ? &ptSource : NULL, NULL, NULL, - NULL, - ROP4_FROM_INDEX(R3_OPINDEX_SRCCOPY)); + pMaskSurf ? ROP4_MASK : ROP4_FROM_INDEX(R3_OPINDEX_SRCCOPY)); /* Cleanup EXLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); @@ -555,6 +687,8 @@ if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); + if (pMaskSurf) EngUnlockSurface(pMaskSurf); + if (hMaskBitmap) EngDeleteSurface((HSURF)hMaskBitmap); DC_UnlockDc(pDC); Exit2: ExFreePoolWithTag(pbmiSafe, 'pmTG');

1 0

[jgardou] 63919: [FORMATTING] - Reformat/refactor some code. No changes.
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 10:20:18 2014 New Revision: 63919 URL: http://svn.reactos.org/svn/reactos?rev=63919&view=rev Log: [FORMATTING] - Reformat/refactor some code. No changes. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Sat Aug 23 10:20:18 2014 @@ -13,25 +13,38 @@ * 11/16/1999 (RJJ) lifted from wine */ -INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse, BOOL max) +INT +FASTCALL DIB_BitmapInfoSize( + const BITMAPINFO * info, + WORD coloruse, + BOOL max) { unsigned int colors, size, masks = 0; if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; - colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; - return sizeof(BITMAPCOREHEADER) + colors * - ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); - } - else /* assume BITMAPINFOHEADER */ - { - colors = max ? 1 << info->bmiHeader.biBitCount : info->bmiHeader.biClrUsed; - if (colors > 256) colors = 256; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *) info; + size = sizeof(BITMAPCOREHEADER); + if (core->bcBitCount <= 8) + { + colors = 1 << core->bcBitCount; + if (coloruse == DIB_RGB_COLORS) + size += colors * sizeof(RGBTRIPLE); + else + size += colors * sizeof(WORD); + } + return size; + } + else /* assume BITMAPINFOHEADER */ + { + colors = max ? (1 << info->bmiHeader.biBitCount) : info->bmiHeader.biClrUsed; + if (colors > 256) + colors = 256; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + if (info->bmiHeader.biCompression == BI_BITFIELDS) + masks = 3; + size = max(info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD)); return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } @@ -43,26 +56,32 @@ */ UINT FASTCALL -DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) +DIB_BitmapMaxBitsSize( + PBITMAPINFO Info, + UINT ScanLines) { UINT Ret; - if (!Info) return 0; - - if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; - Ret = WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, Core->bcBitCount) * ScanLines; + if (!Info) + return 0; + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER) Info; + Ret = WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, + Core->bcBitCount) * ScanLines; } else /* assume BITMAPINFOHEADER */ { - if (!(Info->bmiHeader.biCompression) || (Info->bmiHeader.biCompression == BI_BITFIELDS)) - { - Ret = WIDTH_BYTES_ALIGN32(Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes, Info->bmiHeader.biBitCount) * ScanLines; + if ((Info->bmiHeader.biCompression == BI_RGB) || (Info->bmiHeader.biCompression == BI_BITFIELDS)) + { + Ret = WIDTH_BYTES_ALIGN32( + Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes, + Info->bmiHeader.biBitCount) * ScanLines; } else { - Ret = Info->bmiHeader.biSizeImage; + Ret = Info->bmiHeader.biSizeImage; } } return Ret; @@ -75,61 +94,62 @@ */ INT WINAPI -DIB_GetBitmapInfo(const BITMAPINFOHEADER *header, - PLONG width, - PLONG height, - PWORD planes, - PWORD bpp, - PLONG compr, - PLONG size ) +DIB_GetBitmapInfo( + const BITMAPINFOHEADER *header, + PLONG width, + PLONG height, + PWORD planes, + PWORD bpp, + PLONG compr, + PLONG size) { if (header->biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; - *width = core->bcWidth; + BITMAPCOREHEADER *core = (BITMAPCOREHEADER *) header; + *width = core->bcWidth; *height = core->bcHeight; *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; return 0; } if (header->biSize == sizeof(BITMAPINFOHEADER)) { - *width = header->biWidth; + *width = header->biWidth; *height = header->biHeight; *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; return 1; } if (header->biSize == sizeof(BITMAPV4HEADER)) { - BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; - *width = v4hdr->bV4Width; + BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *) header; + *width = v4hdr->bV4Width; *height = v4hdr->bV4Height; *planes = v4hdr->bV4Planes; - *bpp = v4hdr->bV4BitCount; - *compr = v4hdr->bV4V4Compression; - *size = v4hdr->bV4SizeImage; + *bpp = v4hdr->bV4BitCount; + *compr = v4hdr->bV4V4Compression; + *size = v4hdr->bV4SizeImage; return 4; } if (header->biSize == sizeof(BITMAPV5HEADER)) { - BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; - *width = v5hdr->bV5Width; + BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *) header; + *width = v5hdr->bV5Width; *height = v5hdr->bV5Height; *planes = v5hdr->bV5Planes; - *bpp = v5hdr->bV5BitCount; - *compr = v5hdr->bV5Compression; - *size = v5hdr->bV5SizeImage; + *bpp = v5hdr->bV5BitCount; + *compr = v5hdr->bV5Compression; + *size = v5hdr->bV5SizeImage; return 5; } - DPRINT("(%lu): wrong size for header\n", header->biSize ); + DPRINT("(%lu): wrong size for header\n", header->biSize); return -1; } @@ -138,26 +158,32 @@ */ int WINAPI -GdiGetBitmapBitsSize(BITMAPINFO *lpbmi) +GdiGetBitmapBitsSize( + BITMAPINFO *lpbmi) { UINT Ret; - if (!lpbmi) return 0; - - if ( lpbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)lpbmi; - Ret = WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, Core->bcBitCount) * Core->bcHeight; + if (!lpbmi) + return 0; + + if (lpbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER) lpbmi; + Ret = + WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, + Core->bcBitCount) * Core->bcHeight; } else /* assume BITMAPINFOHEADER */ { if (!(lpbmi->bmiHeader.biCompression) || (lpbmi->bmiHeader.biCompression == BI_BITFIELDS)) { - Ret = WIDTH_BYTES_ALIGN32(lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes, lpbmi->bmiHeader.biBitCount) * abs(lpbmi->bmiHeader.biHeight); + Ret = WIDTH_BYTES_ALIGN32( + lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes, + lpbmi->bmiHeader.biBitCount) * abs(lpbmi->bmiHeader.biHeight); } else { - Ret = lpbmi->bmiHeader.biSizeImage; + Ret = lpbmi->bmiHeader.biSizeImage; } } return Ret; @@ -166,7 +192,8 @@ /* * @implemented */ -HBITMAP WINAPI +HBITMAP +WINAPI CreateDIBSection( HDC hDC, CONST BITMAPINFO *BitmapInfo, @@ -178,32 +205,29 @@ PBITMAPINFO pConvertedInfo; UINT ConvertedInfoSize; HBITMAP hBitmap = NULL; - PVOID bmBits = NULL; - - pConvertedInfo = ConvertBitmapInfo(BitmapInfo, Usage, - &ConvertedInfoSize, FALSE); + PVOID bmBits = NULL; + + pConvertedInfo = ConvertBitmapInfo(BitmapInfo, Usage, &ConvertedInfoSize, + FALSE); + if (pConvertedInfo) { // Verify header due to converted may == info. - if ( pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( pConvertedInfo->bmiHeader.biCompression == BI_JPEG || - pConvertedInfo->bmiHeader.biCompression == BI_PNG ) + if (pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + if (pConvertedInfo->bmiHeader.biCompression == BI_JPEG + || pConvertedInfo->bmiHeader.biCompression == BI_PNG) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } } bmBits = Bits; - hBitmap = NtGdiCreateDIBSection( hDC, - hSection, - dwOffset, - pConvertedInfo, - Usage, - ConvertedInfoSize, - 0, // fl - 0, // dwColorSpace - &bmBits); + hBitmap = NtGdiCreateDIBSection(hDC, hSection, dwOffset, pConvertedInfo, Usage, + ConvertedInfoSize, 0, // fl + 0, // dwColorSpace + &bmBits); + if (BitmapInfo != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); @@ -213,26 +237,27 @@ } } - if (Bits) *Bits = bmBits; + if (Bits) + *Bits = bmBits; return hBitmap; } - /* * @implemented */ BOOL WINAPI -BitBlt(HDC hdcDest, /* handle to destination DC */ - int nXOriginDest, /* x-coord of destination upper-left corner */ - int nYOriginDest, /* y-coord of destination upper-left corner */ - int nWidthDest, /* width of destination rectangle */ - int nHeightDest, /* height of destination rectangle */ - HDC hdcSrc, /* handle to source DC */ - int nXSrc, /* x-coordinate of source upper-left corner */ - int nYSrc, /* y-coordinate of source upper-left corner */ - DWORD dwRop) /* raster operation code */ +BitBlt( + HDC hdcDest, /* handle to destination DC */ + int nXOriginDest, /* x-coord of destination upper-left corner */ + int nYOriginDest, /* y-coord of destination upper-left corner */ + int nWidthDest, /* width of destination rectangle */ + int nHeightDest, /* height of destination rectangle */ + HDC hdcSrc, /* handle to source DC */ + int nXSrc, /* x-coordinate of source upper-left corner */ + int nYSrc, /* y-coordinate of source upper-left corner */ + DWORD dwRop) /* raster operation code */ { /* use patBlt for no source blt Like windows does */ if (!ROP_USES_SOURCE(dwRop)) @@ -240,57 +265,50 @@ return PatBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, dwRop); } - return NtGdiBitBlt(hdcDest, - nXOriginDest, - nYOriginDest, - nWidthDest, - nHeightDest, - hdcSrc, - nXSrc, - nYSrc, - dwRop, - 0, - 0); + return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, nXSrc, + nYSrc, dwRop, 0, 0); } /* * @implemented */ -BOOL WINAPI +BOOL +WINAPI StretchBlt( - HDC hdcDest, /* handle to destination DC */ + HDC hdcDest, /* handle to destination DC */ int nXOriginDest, /* x-coord of destination upper-left corner */ int nYOriginDest, /* y-coord of destination upper-left corner */ - int nWidthDest, /* width of destination rectangle */ - int nHeightDest, /* height of destination rectangle */ - HDC hdcSrc, /* handle to source DC */ - int nXOriginSrc, /* x-coord of source upper-left corner */ - int nYOriginSrc, /* y-coord of source upper-left corner */ - int nWidthSrc, /* width of source rectangle */ - int nHeightSrc, /* height of source rectangle */ - DWORD dwRop) /* raster operation code */ + int nWidthDest, /* width of destination rectangle */ + int nHeightDest, /* height of destination rectangle */ + HDC hdcSrc, /* handle to source DC */ + int nXOriginSrc, /* x-coord of source upper-left corner */ + int nYOriginSrc, /* y-coord of source upper-left corner */ + int nWidthSrc, /* width of source rectangle */ + int nHeightSrc, /* height of source rectangle */ + DWORD dwRop) /* raster operation code */ { if ((nWidthDest != nWidthSrc) || (nHeightDest != nHeightSrc)) { - return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, - nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, - nWidthSrc, nHeightSrc, dwRop, 0); - } - - return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, - nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, dwRop, 0, 0); + return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop, 0); + } + + return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, + nXOriginSrc, nYOriginSrc, dwRop, 0, 0); } /* * @implemented */ -HBITMAP WINAPI -CreateBitmap(INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - CONST VOID* pUnsafeBits) +HBITMAP +WINAPI +CreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + CONST VOID* pUnsafeBits) { if (Width && Height) { @@ -306,22 +324,19 @@ /* * @implemented */ -HBITMAP WINAPI -CreateBitmapIndirect(const BITMAP *pbm) +HBITMAP +WINAPI +CreateBitmapIndirect( + const BITMAP *pbm) { HBITMAP bitmap = NULL; /* Note windows xp/2003 does not check if pbm is NULL or not */ - if ( (pbm->bmWidthBytes != 0) && - (!(pbm->bmWidthBytes & 1)) ) - - { - - bitmap = CreateBitmap(pbm->bmWidth, - pbm->bmHeight, - pbm->bmPlanes, - pbm->bmBitsPixel, - pbm->bmBits); + if ((pbm->bmWidthBytes != 0) && (!(pbm->bmWidthBytes & 1))) + + { + bitmap = CreateBitmap(pbm->bmWidth, pbm->bmHeight, pbm->bmPlanes, pbm->bmBitsPixel, + pbm->bmBits); } else { @@ -331,33 +346,34 @@ return bitmap; } -HBITMAP WINAPI +HBITMAP +WINAPI CreateDiscardableBitmap( - HDC hDC, - INT Width, - INT Height) -{ - return CreateCompatibleBitmap(hDC, Width, Height); -} - - -HBITMAP WINAPI + HDC hDC, + INT Width, + INT Height) +{ + return CreateCompatibleBitmap(hDC, Width, Height); +} + +HBITMAP +WINAPI CreateCompatibleBitmap( - HDC hDC, - INT Width, - INT Height) + HDC hDC, + INT Width, + INT Height) { PDC_ATTR pDc_Attr; - if (!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + if (!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID) & pDc_Attr)) return NULL; - if ( !Width || !Height ) + if (!Width || !Height) return GetStockObject(DEFAULT_BITMAP); if (!(pDc_Attr->ulDirty_ & DC_DIBSECTION)) { - return NtGdiCreateCompatibleBitmap(hDC, Width, Height); + return NtGdiCreateCompatibleBitmap(hDC, Width, Height); } else { @@ -368,15 +384,15 @@ BITMAPINFOHEADER bmih; RGBQUAD rgbquad[256]; } buffer; - DIBSECTION* pDIBs = (DIBSECTION*)&buffer; - BITMAPINFO* pbmi = (BITMAPINFO*)&buffer.bmih; + DIBSECTION* pDIBs = (DIBSECTION*) &buffer; + BITMAPINFO* pbmi = (BITMAPINFO*) &buffer.bmih; hBmp = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_BITMAP); - if ( GetObjectA(hBmp, sizeof(DIBSECTION), pDIBs) != sizeof(DIBSECTION) ) + if (GetObjectA(hBmp, sizeof(DIBSECTION), pDIBs) != sizeof(DIBSECTION)) return NULL; - if ( pDIBs->dsBm.bmBitsPixel <= 8 ) + if (pDIBs->dsBm.bmBitsPixel <= 8) GetDIBColorTable(hDC, 0, 256, buffer.rgbquad); pDIBs->dsBmih.biWidth = Width; @@ -386,7 +402,6 @@ } return NULL; } - INT WINAPI @@ -402,7 +417,7 @@ UINT cjBmpScanSize; UINT cjInfoSize; - if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC) || !lpbmi) + if (!hDC || !GdiIsHandleValid((HGDIOBJ) hDC) || !lpbmi) { GdiSetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -412,12 +427,12 @@ /* Caller must provide maximum size possible */ cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage, TRUE); - if ( lpvBits ) - { - if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || - lpbmi->bmiHeader.biCompression == BI_PNG ) + if (lpvBits) + { + if (lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + if (lpbmi->bmiHeader.biCompression == BI_JPEG + || lpbmi->bmiHeader.biCompression == BI_PNG) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -425,15 +440,8 @@ } } - return NtGdiGetDIBitsInternal(hDC, - hbmp, - uStartScan, - cScanLines, - lpvBits, - lpbmi, - uUsage, - cjBmpScanSize, - cjInfoSize); + return NtGdiGetDIBitsInternal(hDC, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, uUsage, + cjBmpScanSize, cjInfoSize); } /* @@ -441,12 +449,13 @@ */ HBITMAP WINAPI -CreateDIBitmap( HDC hDC, - const BITMAPINFOHEADER *Header, - DWORD Init, - LPCVOID Bits, - const BITMAPINFO *Data, - UINT ColorUse) +CreateDIBitmap( + HDC hDC, + const BITMAPINFOHEADER *Header, + DWORD Init, + LPCVOID Bits, + const BITMAPINFO *Data, + UINT ColorUse) { LONG width, height, compr, dibsize; WORD planes, bpp; @@ -488,7 +497,8 @@ } /* Check if the Compr is incompatible */ - if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) return 0; + if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) + return 0; /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) @@ -498,7 +508,8 @@ } /* Negative width is not allowed */ - if (width < 0) return 0; + if (width < 0) + return 0; /* Top-down DIBs have a negative height. */ height = abs(height); @@ -506,11 +517,11 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - if(Data) + if (Data) { _SEH2_TRY { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *)Data); + cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); InfoSize += Data->bmiHeader.biSize; } @@ -521,29 +532,21 @@ _SEH2_END } - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { GdiSetLastError(ERROR_INVALID_PARAMETER); return NULL; } - DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); - - if ( !width || !height ) + DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, + cjBmpScanSize); + + if (!width || !height) hBmp = GetStockObject(DEFAULT_BITMAP); else { - hBmp = NtGdiCreateDIBitmapInternal(hDC, - width, - height, - Init, - (LPBYTE)Bits, - (LPBITMAPINFO)Data, - ColorUse, - InfoSize, - cjBmpScanSize, - 0, - 0); + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, + (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); } return hBmp; } @@ -553,13 +556,14 @@ */ INT WINAPI -SetDIBits(HDC hDC, - HBITMAP hBitmap, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) +SetDIBits( + HDC hDC, + HBITMAP hBitmap, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) { HDC hDCc, SavehDC, nhDC; DWORD dwWidth, dwHeight; @@ -568,14 +572,15 @@ INT LinesCopied = 0; BOOL newDC = FALSE; - if ( !lpvBits || (GDI_HANDLE_GET_TYPE(hBitmap) != GDI_OBJECT_TYPE_BITMAP) ) - return 0; - - if ( lpbmi ) - { - if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) - { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || lpbmi->bmiHeader.biCompression == BI_PNG ) + if (!lpvBits || (GDI_HANDLE_GET_TYPE(hBitmap) != GDI_OBJECT_TYPE_BITMAP)) + return 0; + + if (lpbmi) + { + if (lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + if (lpbmi->bmiHeader.biCompression == BI_JPEG + || lpbmi->bmiHeader.biCompression == BI_PNG) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -585,24 +590,25 @@ hDCc = NtGdiGetDCforBitmap(hBitmap); // hDC can be NULL, so, get it from the bitmap. SavehDC = hDCc; - if ( !hDCc ) // No DC associated with bitmap, Clone or Create one. + if (!hDCc) // No DC associated with bitmap, Clone or Create one. { nhDC = CreateCompatibleDC(hDC); - if ( !nhDC ) return 0; + if (!nhDC) + return 0; newDC = TRUE; SavehDC = nhDC; } - else if ( !SaveDC(hDCc) ) + else if (!SaveDC(hDCc)) return 0; hOldBitmap = SelectObject(SavehDC, hBitmap); - if ( hOldBitmap ) - { - if ( hDC ) - hPal = SelectPalette(SavehDC, (HPALETTE)GetCurrentObject(hDC, OBJ_PAL), FALSE); - - if ( lpbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + if (hOldBitmap) + { + if (hDC) + hPal = SelectPalette(SavehDC, (HPALETTE) GetCurrentObject(hDC, OBJ_PAL), FALSE); + + if (lpbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) { PBITMAPCOREINFO pbci = (PBITMAPCOREINFO) lpbmi; dwWidth = pbci->bmciHeader.bcWidth; @@ -614,25 +620,16 @@ dwHeight = abs(lpbmi->bmiHeader.biHeight); } - LinesCopied = SetDIBitsToDevice(SavehDC, - 0, - 0, - dwWidth, - dwHeight, - 0, - 0, - uStartScan, - cScanLines, - (void *)lpvBits, - (LPBITMAPINFO)lpbmi, - fuColorUse); - - if ( hDC ) SelectPalette(SavehDC, hPal, FALSE); + LinesCopied = SetDIBitsToDevice(SavehDC, 0, 0, dwWidth, dwHeight, 0, 0, uStartScan, + cScanLines, (void *) lpvBits, (LPBITMAPINFO) lpbmi, fuColorUse); + + if (hDC) + SelectPalette(SavehDC, hPal, FALSE); SelectObject(SavehDC, hOldBitmap); } - if ( newDC ) + if (newDC) DeleteDC(SavehDC); else RestoreDC(SavehDC, -1); @@ -666,16 +663,16 @@ INT LinesCopied = 0; UINT cjBmpScanSize = 0; BOOL Hit = FALSE; - PVOID pvSafeBits = (PVOID)Bits; - - if ( !ScanLines || !lpbmi || !Bits ) - return 0; - - if ( ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS+1 ) - return 0; - - pConvertedInfo = ConvertBitmapInfo(lpbmi, ColorUse, - &ConvertedInfoSize, FALSE); + PVOID pvSafeBits = (PVOID) Bits; + + if (!ScanLines || !lpbmi || !Bits) + return 0; + + if (ColorUse && ColorUse != DIB_PAL_COLORS && ColorUse != DIB_PAL_COLORS + 1) + return 0; + + pConvertedInfo = ConvertBitmapInfo(lpbmi, ColorUse, &ConvertedInfoSize, + FALSE); if (!pConvertedInfo) return 0; @@ -684,18 +681,18 @@ if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetDIBitsToDevice( hdc, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - Bits, - lpbmi, - ColorUse); + return MFDRV_SetDIBitsToDevice( hdc, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + Bits, + lpbmi, + ColorUse); else { PLDC pLDC = GdiGetLDC(hdc); @@ -707,76 +704,66 @@ if (pLDC->iType == LDC_EMFLDC) { return EMFDRV_SetDIBitsToDevice(hdc, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - Bits, - lpbmi, - ColorUse); + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + Bits, + lpbmi, + ColorUse); } return 0; } } #endif - cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, ScanLines); - - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits) - { - _SEH2_TRY - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END - - if (Hit) - { - // We don't die, we continue on with a allocated safe pointer to kernel - // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,Bits,cjBmpScanSize); - } - DPRINT("SetDIBitsToDevice Allocate Bits %u!!!\n", cjBmpScanSize); - } - - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO) lpbmi, ScanLines); + + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + { + _SEH2_TRY + { + RtlCopyMemory(pvSafeBits, Bits, cjBmpScanSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END + + if (Hit) + { + // We don't die, we continue on with a allocated safe pointer to kernel + // space..... + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n", + pConvertedInfo, Bits, cjBmpScanSize); + } + DPRINT("SetDIBitsToDevice Allocate Bits %u!!!\n", cjBmpScanSize); + } + + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID) & pDc_Attr)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } /* - if ( !pDc_Attr || // DC is Public - ColorUse == DIB_PAL_COLORS || - ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || - pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ - { - LinesCopied = NtGdiSetDIBitsToDeviceInternal( hdc, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)pvSafeBits, - (LPBITMAPINFO)pConvertedInfo, - ColorUse, - cjBmpScanSize, - ConvertedInfoSize, - TRUE, - NULL); - } - if ( Bits != pvSafeBits) + if ( !pDc_Attr || // DC is Public + ColorUse == DIB_PAL_COLORS || + ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ + { + LinesCopied = NtGdiSetDIBitsToDeviceInternal(hdc, XDest, YDest, Width, Height, XSrc, YSrc, + StartScan, ScanLines, (LPBYTE) pvSafeBits, (LPBITMAPINFO) pConvertedInfo, ColorUse, + cjBmpScanSize, ConvertedInfoSize, + TRUE, + NULL); + } + if (Bits != pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpbmi != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); @@ -784,25 +771,25 @@ return LinesCopied; } - /* * @unimplemented */ int WINAPI -StretchDIBits(HDC hdc, - int XDest, - int YDest, - int nDestWidth, - int nDestHeight, - int XSrc, - int YSrc, - int nSrcWidth, - int nSrcHeight, - CONST VOID *lpBits, - CONST BITMAPINFO *lpBitsInfo, - UINT iUsage, - DWORD dwRop) +StretchDIBits( + HDC hdc, + int XDest, + int YDest, + int nDestWidth, + int nDestHeight, + int XSrc, + int YSrc, + int nSrcWidth, + int nSrcHeight, + CONST VOID *lpBits, + CONST BITMAPINFO *lpBitsInfo, + UINT iUsage, + DWORD dwRop) { PDC_ATTR pDc_Attr; @@ -819,19 +806,19 @@ if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) - return MFDRV_StretchBlt( hdc, - XDest, - YDest, - nDestWidth, - nDestHeight, - XSrc, - YSrc, - nSrcWidth, - nSrcHeight, - lpBits, - lpBitsInfo, - iUsage, - dwRop); + return MFDRV_StretchBlt( hdc, + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + lpBits, + lpBitsInfo, + iUsage, + dwRop); else { PLDC pLDC = GdiGetLDC(hdc); @@ -843,40 +830,40 @@ if (pLDC->iType == LDC_EMFLDC) { return EMFDRV_StretchBlt(hdc, - XDest, - YDest, - nDestWidth, - nDestHeight, - XSrc, - YSrc, - nSrcWidth, - nSrcHeight, - lpBits, - lpBitsInfo, - iUsage, - dwRop); + XDest, + YDest, + nDestWidth, + nDestHeight, + XSrc, + YSrc, + nSrcWidth, + nSrcHeight, + lpBits, + lpBitsInfo, + iUsage, + dwRop); } return 0; } } #endif - pConvertedInfo = ConvertBitmapInfo(lpBitsInfo, iUsage, - &ConvertedInfoSize, FALSE); + pConvertedInfo = ConvertBitmapInfo(lpBitsInfo, iUsage, &ConvertedInfoSize, + FALSE); if (!pConvertedInfo) { return 0; } - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *)pConvertedInfo); - - if ( lpBits ) + cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) pConvertedInfo); + + if (lpBits) { pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); if (pvSafeBits) { _SEH2_TRY { - RtlCopyMemory( pvSafeBits, lpBits, cjBmpScanSize ); + RtlCopyMemory(pvSafeBits, lpBits, cjBmpScanSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -888,42 +875,31 @@ { // We don't die, we continue on with a allocated safe pointer to kernel // space..... - DPRINT1("StretchDIBits fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,lpBits,cjBmpScanSize); + DPRINT1("StretchDIBits fail to read BitMapInfo: %p or Bits: %p & Size: %u\n", + pConvertedInfo, lpBits, cjBmpScanSize); } DPRINT("StretchDIBits Allocate Bits %u!!!\n", cjBmpScanSize); } } - if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID) & pDc_Attr)) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } /* - if ( !pDc_Attr || - iUsage == DIB_PAL_COLORS || - ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && - (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || - pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ - { - LinesCopied = NtGdiStretchDIBitsInternal( hdc, - XDest, - YDest, - nDestWidth, - nDestHeight, - XSrc, - YSrc, - nSrcWidth, - nSrcHeight, - pvSafeBits, - pConvertedInfo, - (DWORD)iUsage, - dwRop, - ConvertedInfoSize, - cjBmpScanSize, - NULL); - } - if ( pvSafeBits ) + if ( !pDc_Attr || + iUsage == DIB_PAL_COLORS || + ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && + (pConvertedInfo->bmiHeader.biCompression == BI_JPEG || + pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ + { + LinesCopied = NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, + YSrc, nSrcWidth, nSrcHeight, pvSafeBits, pConvertedInfo, (DWORD) iUsage, dwRop, + ConvertedInfoSize, cjBmpScanSize, + NULL); + } + if (pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpBitsInfo != pConvertedInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo);

1 0

[jgardou] 63918: [INCLUDE/CRT] - import ivec.h from mingw-w64 [INCLUDE/PSDK] - import bthdef and stralign.h from mingw-w64
by jgardou＠svn.reactos.org 23 Aug '14

23 Aug '14

Author: jgardou Date: Sat Aug 23 10:19:57 2014 New Revision: 63918 URL: http://svn.reactos.org/svn/reactos?rev=63918&view=rev Log: [INCLUDE/CRT] - import ivec.h from mingw-w64 [INCLUDE/PSDK] - import bthdef and stralign.h from mingw-w64 Added: trunk/reactos/include/crt/ivec.h (with props) trunk/reactos/include/psdk/bthdef.h (with props) trunk/reactos/include/psdk/stralign.h (with props) Added: trunk/reactos/include/crt/ivec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ivec.h?rev=639… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/include/crt/ivec.h ------------------------------------------------------------------------------ charset = UTF-8" Propchange: trunk/reactos/include/crt/ivec.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/crt/ivec.h ------------------------------------------------------------------------------ svn:mime-type = "text/plain Added: trunk/reactos/include/psdk/bthdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bthdef.h?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/include/psdk/bthdef.h ------------------------------------------------------------------------------ charset = UTF-8" Propchange: trunk/reactos/include/psdk/bthdef.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/bthdef.h ------------------------------------------------------------------------------ svn:mime-type = "text/plain Added: trunk/reactos/include/psdk/stralign.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stralign.h?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/include/psdk/stralign.h ------------------------------------------------------------------------------ charset = UTF-8" Propchange: trunk/reactos/include/psdk/stralign.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/stralign.h ------------------------------------------------------------------------------ svn:mime-type = "text/plain

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2014