Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 47698: Sync trunk head (r47697).
by akhaldi＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: akhaldi Date: Tue Jun 8 22:04:37 2010 New Revision: 47698 URL: http://svn.reactos.org/svn/reactos?rev=47698&view=rev Log: Sync trunk head (r47697). Modified: branches/header-work/ (props changed) branches/header-work/dll/win32/comctl32/animate.c branches/header-work/dll/win32/comctl32/comboex.c branches/header-work/dll/win32/comctl32/comctl32.h branches/header-work/dll/win32/comctl32/comctl32.rbuild branches/header-work/dll/win32/comctl32/comctl32undoc.c branches/header-work/dll/win32/comctl32/comctl_Bg.rc branches/header-work/dll/win32/comctl32/comctl_Cs.rc branches/header-work/dll/win32/comctl32/comctl_De.rc branches/header-work/dll/win32/comctl32/comctl_El.rc branches/header-work/dll/win32/comctl32/comctl_En.rc branches/header-work/dll/win32/comctl32/comctl_Eo.rc branches/header-work/dll/win32/comctl32/comctl_Es.rc branches/header-work/dll/win32/comctl32/comctl_Fr.rc branches/header-work/dll/win32/comctl32/comctl_Hu.rc branches/header-work/dll/win32/comctl32/comctl_It.rc branches/header-work/dll/win32/comctl32/comctl_Ja.rc branches/header-work/dll/win32/comctl32/comctl_Ko.rc branches/header-work/dll/win32/comctl32/comctl_Lt.rc branches/header-work/dll/win32/comctl32/comctl_Nl.rc branches/header-work/dll/win32/comctl32/comctl_No.rc branches/header-work/dll/win32/comctl32/comctl_Pl.rc branches/header-work/dll/win32/comctl32/comctl_Pt.rc branches/header-work/dll/win32/comctl32/comctl_Ro.rc branches/header-work/dll/win32/comctl32/comctl_Ru.rc branches/header-work/dll/win32/comctl32/comctl_Si.rc branches/header-work/dll/win32/comctl32/comctl_Sk.rc branches/header-work/dll/win32/comctl32/comctl_Sv.rc branches/header-work/dll/win32/comctl32/comctl_Th.rc branches/header-work/dll/win32/comctl32/comctl_Tr.rc branches/header-work/dll/win32/comctl32/comctl_Uk.rc branches/header-work/dll/win32/comctl32/comctl_Zh.rc branches/header-work/dll/win32/comctl32/commctrl.c branches/header-work/dll/win32/comctl32/datetime.c branches/header-work/dll/win32/comctl32/dpa.c branches/header-work/dll/win32/comctl32/draglist.c branches/header-work/dll/win32/comctl32/header.c branches/header-work/dll/win32/comctl32/idb_hist_large.bmp branches/header-work/dll/win32/comctl32/idb_hist_small.bmp branches/header-work/dll/win32/comctl32/idb_std_large.bmp branches/header-work/dll/win32/comctl32/idb_std_small.bmp branches/header-work/dll/win32/comctl32/idb_view_large.bmp branches/header-work/dll/win32/comctl32/idb_view_small.bmp branches/header-work/dll/win32/comctl32/imagelist.c branches/header-work/dll/win32/comctl32/imagelist.h branches/header-work/dll/win32/comctl32/ipaddress.c branches/header-work/dll/win32/comctl32/listview.c branches/header-work/dll/win32/comctl32/monthcal.c branches/header-work/dll/win32/comctl32/rsrc.rc branches/header-work/dll/win32/kernel32/misc/console.c branches/header-work/drivers/wdm/audio/legacy/wdmaud/control.c branches/header-work/hal/halx86/generic/legacy/bus/bushndlr.c branches/header-work/hal/halx86/generic/legacy/bus/isabus.c branches/header-work/hal/halx86/generic/legacy/bus/pcibus.c branches/header-work/hal/halx86/generic/legacy/bus/sysbus.c branches/header-work/hal/halx86/generic/legacy/bussupp.c branches/header-work/hal/halx86/include/bus.h branches/header-work/hal/halx86/include/halp.h branches/header-work/hal/halx86/mp/processor_mp.c branches/header-work/include/psdk/commctrl.h branches/header-work/include/reactos/subsys/csrss/csrss.h branches/header-work/subsystems/win32/csrss/win32csr/coninput.c branches/header-work/subsystems/win32/csrss/win32csr/conio.h branches/header-work/subsystems/win32/csrss/win32csr/conoutput.c branches/header-work/subsystems/win32/csrss/win32csr/guiconsole.c branches/header-work/subsystems/win32/csrss/win32csr/lineinput.c branches/header-work/subsystems/win32/csrss/win32csr/tuiconsole.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/… Modified: branches/header-work/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/l… Modified: branches/header-work/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/isabus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bus/sysbus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… Modified: branches/header-work/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… Modified: branches/header-work/hal/halx86/mp/processor_mp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/proce… Modified: branches/header-work/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/commct… Modified: branches/header-work/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/sub… Modified: branches/header-work/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs… Modified: branches/header-work/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/cs…

1 0

[tkreuzer] 47697: [PSDK] Merge 47681 and 47682 from header branch - Add missing file headers - Fix defintition of POINTER_64 - by Amine Khaldi
by tkreuzer＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: tkreuzer Date: Tue Jun 8 16:31:31 2010 New Revision: 47697 URL: http://svn.reactos.org/svn/reactos?rev=47697&view=rev Log: [PSDK] Merge 47681 and 47682 from header branch - Add missing file headers - Fix defintition of POINTER_64 - by Amine Khaldi Modified: trunk/reactos/ (props changed) trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/usb.h trunk/reactos/include/psdk/usb100.h trunk/reactos/include/psdk/usb200.h trunk/reactos/include/psdk/usbcamdi.h trunk/reactos/include/psdk/usbdi.h trunk/reactos/include/psdk/usbioctl.h trunk/reactos/include/psdk/usbiodef.h trunk/reactos/include/psdk/usbrpmif.h trunk/reactos/include/psdk/usbuser.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 8 16:31:31 2010 @@ -1,4 +1,4 @@ -/branches/header-work:45691-46463 +/branches/header-work:45691-46463,47681-47682 /branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -13,6 +13,32 @@ #ifndef __int64 #define __int64 long long #endif +#endif + +#if defined(_MSC_VER) && (_MSC_VER < 1300) +#error Old MSVC compiler version. +#endif + +#ifdef _MAC +#error Not supported. +#endif + +#if !defined(MIDL_PASS) && !defined(RC_INVOKED) + #define POINTER_64 __ptr64 + #if defined(_WIN64) + #define POINTER_32 __ptr32 + #else + #define POINTER_32 + #endif +#else + #define POINTER_64 + #define POINTER_32 +#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */ + +#if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64) + typedef unsigned __int64 POINTER_64_INT; +#else + typedef unsigned long POINTER_64_INT; #endif #if defined(_WIN64) Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -19,8 +19,6 @@ #define __GNU_EXTENSION #endif #endif - -typedef unsigned long POINTER_64; // FIXME! HACK!!! /* Pseudo Modifiers for Input Parameters */ Modified: trunk/reactos/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=476… ============================================================================== --- trunk/reactos/include/psdk/usb.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,6 +1,26 @@ +/* + * usb.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: trunk/reactos/include/psdk/usb100.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb100.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/usb100.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb100.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB 1.0 support * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb200.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb200.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,6 +1,26 @@ +/* + * usb200.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: trunk/reactos/include/psdk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbcamdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB Camera driver interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbdi.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/usbdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -5,7 +5,7 @@ * * FIXME : Obsolete header.. Use usb.h instead. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB IOCTL interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: trunk/reactos/include/psdk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbiodef.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,3 +1,23 @@ +/* + * usbiodef.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #define USB_SUBMIT_URB 0 Modified: trunk/reactos/include/psdk/usbrpmif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbrpmif.h?re… ============================================================================== --- trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -1,3 +1,23 @@ +/* + * usbrpmif.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Amine Khaldi <amine.khaldi(a)reactos.org> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #include "windef.h" Modified: trunk/reactos/include/psdk/usbuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/usbuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usbuser.h [iso-8859-1] Tue Jun 8 16:31:31 2010 @@ -3,7 +3,7 @@ * * USB user mode IOCTL interface * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>

1 0

[gedmurphy] 47696: Move UTF8 to the bottom of the file. Thanks to Christoph for the tip
by gedmurphy＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: gedmurphy Date: Tue Jun 8 13:09:32 2010 New Revision: 47696 URL: http://svn.reactos.org/svn/reactos?rev=47696&view=rev Log: Move UTF8 to the bottom of the file. Thanks to Christoph for the tip Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Tue Jun 8 13:09:32 2010 @@ -92,27 +92,29 @@ #include "comctl_Bg.rc" #include "comctl_Cs.rc" -#include "comctl_De.rc" #include "comctl_El.rc" +#include "comctl_Eo.rc" #include "comctl_En.rc" -#include "comctl_Eo.rc" #include "comctl_Es.rc" -#include "comctl_Fr.rc" #include "comctl_Hu.rc" #include "comctl_It.rc" -#include "comctl_Ja.rc" #include "comctl_Ko.rc" -#include "comctl_Lt.rc" #include "comctl_Nl.rc" #include "comctl_No.rc" #include "comctl_Pl.rc" -#include "comctl_Pt.rc" -#include "comctl_Ro.rc" -#include "comctl_Ru.rc" -#include "comctl_Si.rc" #include "comctl_Sk.rc" #include "comctl_Sv.rc" #include "comctl_Th.rc" #include "comctl_Tr.rc" #include "comctl_Uk.rc" + +/* UTF-8 */ +#include "comctl_De.rc" +#include "comctl_Fr.rc" +#include "comctl_Ja.rc" +#include "comctl_Lt.rc" +#include "comctl_Pt.rc" +#include "comctl_Ro.rc" +#include "comctl_Ru.rc" +#include "comctl_Si.rc" #include "comctl_Zh.rc"

1 0

[gedmurphy] 47695: Part 1 of the comctl32 sync. I'll do it in 2 stages for testing purposes as it's a very large patch. This part includes alpha support for imagelists and tango icons for the common toolbars I'll do the second part later today. It has a propsheet bug and I'm a bit busy at the mo.
by gedmurphy＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: gedmurphy Date: Tue Jun 8 12:21:26 2010 New Revision: 47695 URL: http://svn.reactos.org/svn/reactos?rev=47695&view=rev Log: Part 1 of the comctl32 sync. I'll do it in 2 stages for testing purposes as it's a very large patch. This part includes alpha support for imagelists and tango icons for the common toolbars I'll do the second part later today. It has a propsheet bug and I'm a bit busy at the mo. Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_El.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Lt.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ro.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sk.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/comctl_Zh.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/draglist.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp trunk/reactos/dll/win32/comctl32/idb_std_large.bmp trunk/reactos/dll/win32/comctl32/idb_std_small.bmp trunk/reactos/dll/win32/comctl32/idb_view_large.bmp trunk/reactos/dll/win32/comctl32/idb_view_small.bmp trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/imagelist.h trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… Modified: trunk/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/idb_hist_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Modified: trunk/reactos/dll/win32/comctl32/idb_hist_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_his… Modified: trunk/reactos/dll/win32/comctl32/idb_std_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Modified: trunk/reactos/dll/win32/comctl32/idb_std_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_std… Modified: trunk/reactos/dll/win32/comctl32/idb_view_large.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Modified: trunk/reactos/dll/win32/comctl32/idb_view_small.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idb_vie… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca…

1 0

[gedmurphy] 47694: Add missing info needed for the comctl32 sync
by gedmurphy＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: gedmurphy Date: Tue Jun 8 12:16:34 2010 New Revision: 47694 URL: http://svn.reactos.org/svn/reactos?rev=47694&view=rev Log: Add missing info needed for the comctl32 sync Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Tue Jun 8 12:16:34 2010 @@ -417,6 +417,8 @@ WINCOMMCTRLAPI WINBOOL WINAPI ImageList_GetImageInfo(HIMAGELIST himl,int i,IMAGEINFO *pImageInfo); WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST himl1,int i1,HIMAGELIST himl2,int i2,int dx,int dy); WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST himl); + WINCOMMCTRLAPI HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST himl, REFIID riid, void **ppv); + #endif #ifndef NOHEADER @@ -4447,11 +4449,16 @@ #define MCN_SELECT (MCN_FIRST+4) -#define MCS_DAYSTATE 0x1 -#define MCS_MULTISELECT 0x2 -#define MCS_WEEKNUMBERS 0x4 -#define MCS_NOTODAYCIRCLE 0x8 -#define MCS_NOTODAY 0x10 +#define MCS_DAYSTATE 0x0001 +#define MCS_MULTISELECT 0x0002 +#define MCS_WEEKNUMBERS 0x0004 +#define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTODAY 0x0010 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 +#define MCS_NOSELCHANGEONNAV 0x0100 +#endif #define GMR_VISIBLE 0 #define GMR_DAYSTATE 1

1 0

[jmorlan] 47693: [KERNEL32], [WIN32CSR] - Implement ReadConsoleW's CONSOLE_READCONSOLE_CONTROL structure. - Make pressing Insert during line input work
by jmorlan＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: jmorlan Date: Tue Jun 8 08:38:14 2010 New Revision: 47693 URL: http://svn.reactos.org/svn/reactos?rev=47693&view=rev Log: [KERNEL32], [WIN32CSR] - Implement ReadConsoleW's CONSOLE_READCONSOLE_CONTROL structure. - Make pressing Insert during line input work Modified: trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -1698,37 +1698,45 @@ PVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, - PCONSOLE_READCONSOLE_CONTROL lpReserved, + PCONSOLE_READCONSOLE_CONTROL pInputControl, BOOL bUnicode) { - PCSR_API_MESSAGE Request; - ULONG CsrRequest; - NTSTATUS Status; - ULONG CharSize, CharsRead = 0; - - CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - Request = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + min(nNumberOfCharsToRead, - CSRSS_MAX_READ_CONSOLE / CharSize) * CharSize)); - if (Request == NULL) + CSR_API_MESSAGE Request; + PCSR_CAPTURE_BUFFER CaptureBuffer; + ULONG CsrRequest = MAKE_CSR_API(READ_CONSOLE, CSR_CONSOLE); + NTSTATUS Status = STATUS_SUCCESS; + ULONG CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + + CaptureBuffer = CsrAllocateCaptureBuffer(1, nNumberOfCharsToRead * CharSize); + if (CaptureBuffer == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - Request->Status = STATUS_SUCCESS; - Request->Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; - Request->Data.ReadConsoleRequest.Unicode = bUnicode; - Request->Data.ReadConsoleRequest.FullReadSize = (WORD)nNumberOfCharsToRead; - CsrRequest = MAKE_CSR_API(READ_CONSOLE, CSR_CONSOLE); + CsrAllocateMessagePointer(CaptureBuffer, + nNumberOfCharsToRead * CharSize, + &Request.Data.ReadConsoleRequest.Buffer); + + Request.Data.ReadConsoleRequest.ConsoleHandle = hConsoleInput; + Request.Data.ReadConsoleRequest.Unicode = bUnicode; + Request.Data.ReadConsoleRequest.NrCharactersToRead = (WORD)nNumberOfCharsToRead; + Request.Data.ReadConsoleRequest.NrCharactersRead = 0; + Request.Data.ReadConsoleRequest.CtrlWakeupMask = 0; + if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + { + Request.Data.ReadConsoleRequest.NrCharactersRead = pInputControl->nInitialChars; + memcpy(Request.Data.ReadConsoleRequest.Buffer, + lpBuffer, + pInputControl->nInitialChars * sizeof(WCHAR)); + Request.Data.ReadConsoleRequest.CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; + } do { - if (Request->Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { - Status = NtWaitForSingleObject(Request->Data.ReadConsoleRequest.EventHandle, + Status = NtWaitForSingleObject(Request.Data.ReadConsoleRequest.EventHandle, FALSE, 0); if (!NT_SUCCESS(Status)) @@ -1738,37 +1746,28 @@ } } - Request->Data.ReadConsoleRequest.NrCharactersToRead = (WORD)min(nNumberOfCharsToRead, CSRSS_MAX_READ_CONSOLE / CharSize); - - Status = CsrClientCallServer(Request, - NULL, - CsrRequest, - max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) - + Request->Data.ReadConsoleRequest.NrCharactersToRead * CharSize)); - - if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request->Status)) + Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); + if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { DPRINT1("CSR returned error in ReadConsole\n"); - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + CsrFreeCaptureBuffer(CaptureBuffer); SetLastErrorByStatus(Status); return FALSE; } - - nNumberOfCharsToRead -= Request->Data.ReadConsoleRequest.NrCharactersRead; - memcpy((PVOID)((ULONG_PTR)lpBuffer + (ULONG_PTR)(CharsRead * CharSize)), - Request->Data.ReadConsoleRequest.Buffer, - Request->Data.ReadConsoleRequest.NrCharactersRead * CharSize); - CharsRead += Request->Data.ReadConsoleRequest.NrCharactersRead; - } - while (Request->Status == STATUS_PENDING && nNumberOfCharsToRead > 0); + } + while (Status == STATUS_PENDING); + + memcpy(lpBuffer, + Request.Data.ReadConsoleRequest.Buffer, + Request.Data.ReadConsoleRequest.NrCharactersRead * CharSize); if (lpNumberOfCharsRead != NULL) - { - *lpNumberOfCharsRead = CharsRead; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Request); + *lpNumberOfCharsRead = Request.Data.ReadConsoleRequest.NrCharactersRead; + + if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + pInputControl->dwControlKeyState = Request.Data.ReadConsoleRequest.ControlKeyState; + + CsrFreeCaptureBuffer(CaptureBuffer); return TRUE; } @@ -1791,7 +1790,7 @@ lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, - pInputControl, + NULL, FALSE); } Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -70,11 +70,13 @@ { HANDLE ConsoleHandle; BOOL Unicode; - WORD FullReadSize; WORD NrCharactersToRead; + WORD NrCharactersRead; HANDLE EventHandle; - ULONG NrCharactersRead; - BYTE Buffer[0]; + PVOID Buffer; + UNICODE_STRING ExeName; + DWORD CtrlWakeupMask; + DWORD ControlKeyState; } CSRSS_READ_CONSOLE, *PCSRSS_READ_CONSOLE; typedef struct @@ -515,7 +517,6 @@ #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB)) -#define CSRSS_MAX_READ_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR)) #define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -37,13 +37,18 @@ CharSize = (Request->Data.ReadConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - /* truncate length to CSRSS_MAX_READ_CONSOLE_REQUEST */ - nNumberOfCharsToRead = min(Request->Data.ReadConsoleRequest.NrCharactersToRead, CSRSS_MAX_READ_CONSOLE / CharSize); + nNumberOfCharsToRead = Request->Data.ReadConsoleRequest.NrCharactersToRead; Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Buffer = (PCHAR)Request->Data.ReadConsoleRequest.Buffer; UnicodeBuffer = (PWCHAR)Buffer; + if (!Win32CsrValidateBuffer(ProcessData, Buffer, nNumberOfCharsToRead, CharSize)) + return STATUS_ACCESS_VIOLATION; + + if (Request->Data.ReadConsoleRequest.NrCharactersRead * sizeof(WCHAR) > nNumberOfCharsToRead * CharSize) + return STATUS_INVALID_PARAMETER; + Status = ConioLockConsole(ProcessData, Request->Data.ReadConsoleRequest.ConsoleHandle, &Console, GENERIC_READ); if (! NT_SUCCESS(Status)) @@ -58,7 +63,7 @@ if (Console->LineBuffer == NULL) { /* Starting a new line */ - Console->LineMaxSize = max(256, Request->Data.ReadConsoleRequest.FullReadSize); + Console->LineMaxSize = max(256, nNumberOfCharsToRead); Console->LineBuffer = HeapAlloc(Win32CsrApiHeap, 0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) { @@ -66,9 +71,19 @@ goto done; } Console->LineComplete = FALSE; - Console->LineSize = 0; - Console->LinePos = 0; Console->LineUpPressed = FALSE; + Console->LineInsertToggle = 0; + Console->LineWakeupMask = Request->Data.ReadConsoleRequest.CtrlWakeupMask; + Console->LineSize = Request->Data.ReadConsoleRequest.NrCharactersRead; + Console->LinePos = Console->LineSize; + /* pre-filling the buffer is only allowed in the Unicode API, + * so we don't need to worry about conversion */ + memcpy(Console->LineBuffer, Buffer, Console->LineSize * sizeof(WCHAR)); + if (Console->LineSize == Console->LineMaxSize) + { + Console->LineComplete = TRUE; + Console->LinePos = 0; + } } /* If we don't have a complete line yet, process the pending input */ @@ -87,6 +102,7 @@ && Input->InputEvent.Event.KeyEvent.bKeyDown) { LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); + Request->Data.ReadConsoleRequest.ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; } HeapFree(Win32CsrApiHeap, 0, Input); } @@ -104,10 +120,11 @@ } if (Console->LinePos == Console->LineSize) { + /* Entire line has been read */ HeapFree(Win32CsrApiHeap, 0, Console->LineBuffer); Console->LineBuffer = NULL; - Status = STATUS_SUCCESS; /* Entire line has been read */ - } + } + Status = STATUS_SUCCESS; } } else @@ -141,12 +158,6 @@ done: Request->Data.ReadConsoleRequest.NrCharactersRead = i; ConioUnlockConsole(Console); - - if (CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + i * CharSize > sizeof(CSR_API_MESSAGE)) - { - Request->Header.u1.s1.TotalLength = CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE) + i * CharSize; - Request->Header.u1.s1.DataLength = Request->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); - } return Status; } @@ -355,6 +366,12 @@ current_entry = current_entry->Flink; ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); } + if (Console->LineBuffer && !Console->LineComplete) + { + /* Line input is in progress; end it */ + Console->LinePos = Console->LineSize = 0; + Console->LineComplete = TRUE; + } return; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -81,6 +81,8 @@ WORD LinePos; /* current position within line */ BOOLEAN LineComplete; /* user pressed enter, ready to send back to client */ BOOLEAN LineUpPressed; + BOOLEAN LineInsertToggle; /* replace character over cursor instead of inserting */ + ULONG LineWakeupMask; /* bitmap of which control characters will end line input */ LIST_ENTRY HistoryBuffers; WORD HistoryBufferSize; /* size for newly created history buffers */ WORD NumberOfHistoryBuffers; /* maximum number of history buffers allowed */ @@ -192,6 +194,7 @@ CHAR *Buffer, DWORD Length, BOOL Attrib); NTSTATUS FASTCALL CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer); VOID WINAPI ConioDeleteScreenBuffer(PCSRSS_SCREEN_BUFFER Buffer); +DWORD FASTCALL ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale); CSR_API(CsrWriteConsole); CSR_API(CsrGetScreenBufferInfo); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -865,6 +865,16 @@ return STATUS_SUCCESS; } +DWORD FASTCALL +ConioEffectiveCursorSize(PCSRSS_CONSOLE Console, DWORD Scale) +{ + DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100; + /* If line input in progress, perhaps adjust for insert toggle */ + if (Console->LineBuffer && !Console->LineComplete && Console->LineInsertToggle) + return (Size * 2 <= Scale) ? (Size * 2) : (Size / 2); + return Size; +} + CSR_API(CsrGetCursorInfo) { PCSRSS_SCREEN_BUFFER Buff; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -946,11 +946,7 @@ if (LeftChar <= CursorX && CursorX <= RightChar && TopLine <= CursorY && CursorY <= BottomLine) { - CursorHeight = (GuiData->CharHeight * Buff->CursorInfo.dwSize) / 100; - if (CursorHeight < 1) - { - CursorHeight = 1; - } + CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); From = ConioCoordToPointer(Buff, Buff->CurrentX, Buff->CurrentY) + 1; if (*From != DEFAULT_ATTRIB) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -459,6 +459,11 @@ LineInputEdit(Console, 0, 1, &Entry.Buffer[Pos]); } return; + case VK_INSERT: + /* Toggle between insert and overstrike */ + Console->LineInsertToggle = !Console->LineInsertToggle; + ConioSetCursorInfo(Console, Console->ActiveBuffer); + return; case VK_DELETE: /* Remove character to right of cursor */ if (Pos != Console->LineSize) @@ -555,7 +560,12 @@ Console->LineBuffer[Console->LineSize++] = L'\r'; if (Console->Mode & ENABLE_ECHO_INPUT) ConioWriteConsole(Console, Console->ActiveBuffer, "\r", 1, TRUE); - if (Console->Mode & ENABLE_PROCESSED_INPUT) + + /* Add \n if processed input. There should usually be room for it, + * but an exception to the rule exists: the buffer could have been + * pre-filled with LineMaxSize - 1 characters. */ + if (Console->Mode & ENABLE_PROCESSED_INPUT && + Console->LineSize < Console->LineMaxSize) { Console->LineBuffer[Console->LineSize++] = L'\n'; if (Console->Mode & ENABLE_ECHO_INPUT) @@ -566,8 +576,21 @@ } else if (KeyEvent->uChar.UnicodeChar != L'\0') { - /* Normal character */ - LineInputEdit(Console, 0, 1, &KeyEvent->uChar.UnicodeChar); + if (KeyEvent->uChar.UnicodeChar < 0x20 && + Console->LineWakeupMask & (1 << KeyEvent->uChar.UnicodeChar)) + { + /* Control key client wants to handle itself (e.g. for tab completion) */ + Console->LineBuffer[Console->LineSize++] = L' '; + Console->LineBuffer[Console->LinePos] = KeyEvent->uChar.UnicodeChar; + Console->LineComplete = TRUE; + Console->LinePos = 0; + } + else + { + /* Normal character */ + BOOL Overstrike = Console->LineInsertToggle && Console->LinePos != Console->LineSize; + LineInputEdit(Console, Overstrike, 1, &KeyEvent->uChar.UnicodeChar); + } } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Tue Jun 8 08:38:14 2010 @@ -208,6 +208,7 @@ static BOOL WINAPI TuiSetCursorInfo(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buff) { + CONSOLE_CURSOR_INFO Info; DWORD BytesReturned; if (ActiveConsole->ActiveBuffer != Buff) @@ -215,9 +216,11 @@ return TRUE; } + Info.dwSize = ConioEffectiveCursorSize(Console, 100); + Info.bVisible = Buff->CursorInfo.bVisible; + if (! DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_SET_CURSOR_INFO, - &Buff->CursorInfo, sizeof(Buff->CursorInfo), NULL, 0, - &BytesReturned, NULL)) + &Info, sizeof(Info), NULL, 0, &BytesReturned, NULL)) { DPRINT1( "Failed to set cursor info\n" ); return FALSE;

1 0

[tkreuzer] 47692: [WIN32K] NtGdiGetDIBitsInternal: don't use the unsafe usermode pointer after the BITMAPINFO has been converted and protect writing back the result with SEH.
by tkreuzer＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: tkreuzer Date: Tue Jun 8 04:27:28 2010 New Revision: 47692 URL: http://svn.reactos.org/svn/reactos?rev=47692&view=rev Log: [WIN32K] NtGdiGetDIBitsInternal: don't use the unsafe usermode pointer after the BITMAPINFO has been converted and protect writing back the result with SEH. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Jun 8 04:27:28 2010 @@ -631,8 +631,8 @@ /* Copy palette information * Always create a palette for 15 & 16 bit. */ - if ((Info->bmiHeader.biBitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat) && - Info->bmiHeader.biBitCount != 15 && Info->bmiHeader.biBitCount != 16) || + if ((bmiLocal.bmiHeader.bV5BitCount == BitsPerFormat(psurf->SurfObj.iBitmapFormat) && + bmiLocal.bmiHeader.bV5BitCount != 15 && bmiLocal.bmiHeader.bV5BitCount != 16) || !ChkBits) { ppalDst = psurf->ppal; @@ -674,7 +674,7 @@ else { for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); + Index < (1 << bmiLocal.bmiHeader.bV5BitCount); Index++) { ((WORD*)bmiLocal.bmiColors)[Index] = Index; @@ -686,16 +686,16 @@ if (Usage == DIB_PAL_COLORS) { for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount); + Index < (1 << bmiLocal.bmiHeader.bV5BitCount); Index++) { ((WORD*)bmiLocal.bmiColors)[Index] = (WORD)Index; } } - else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) + else if (bmiLocal.bmiHeader.bV5BitCount > 1 && bPaletteMatch) { for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < ppalDst->NumColors; + Index < (1 << bmiLocal.bmiHeader.bV5BitCount) && Index < ppalDst->NumColors; Index++) { bmiLocal.bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; @@ -755,7 +755,7 @@ break; case 16: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) + if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) { bmiLocal.bmiHeader.bV5RedMask = 0xf800; bmiLocal.bmiHeader.bV5GreenMask = 0x07e0; @@ -765,7 +765,7 @@ case 24: case 32: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) + if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) { bmiLocal.bmiHeader.bV5RedMask = 0xff0000; bmiLocal.bmiHeader.bV5GreenMask = 0x00ff00; @@ -778,7 +778,11 @@ if (!ChkBits) { bmiLocal.bmiHeader.bV5Width = psurf->SurfObj.sizlBitmap.cx; - bmiLocal.bmiHeader.bV5Height = psurf->SurfObj.sizlBitmap.cy; + /* Report negative height for top-down bitmaps. */ + if (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) + bmiLocal.bmiHeader.bV5Height = - psurf->SurfObj.sizlBitmap.cy; + else + bmiLocal.bmiHeader.bV5Height = psurf->SurfObj.sizlBitmap.cy; bmiLocal.bmiHeader.bV5Planes = 1; bmiLocal.bmiHeader.bV5BitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); switch (psurf->SurfObj.iBitmapFormat) @@ -805,16 +809,12 @@ bmiLocal.bmiHeader.bV5Compression = BI_PNG; break; } - /* Image size has to be calculated */ - bmiLocal.bmiHeader.bV5SizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, - Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; - bmiLocal.bmiHeader.bV5XPelsPerMeter = 0; /* FIXME */ - bmiLocal.bmiHeader.bV5YPelsPerMeter = 0; /* FIXME */ + + bmiLocal.bmiHeader.bV5SizeImage = psurf->SurfObj.cjBits; + bmiLocal.bmiHeader.bV5XPelsPerMeter = psurf->sizlDim.cx; /* FIXME */ + bmiLocal.bmiHeader.bV5YPelsPerMeter = psurf->sizlDim.cy; /* FIXME */ bmiLocal.bmiHeader.bV5ClrUsed = 0; - bmiLocal.bmiHeader.bV5ClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - /* Report negative height for top-down bitmaps. */ - if (psurf->SurfObj.lDelta > 0) - bmiLocal.bmiHeader.bV5Height *= -1; + bmiLocal.bmiHeader.bV5ClrImportant = 1 << bmiLocal.bmiHeader.bV5BitCount; /* FIXME */ Result = psurf->SurfObj.sizlBitmap.cy; } else @@ -839,12 +839,14 @@ hDestBitmap = NULL; bmiLocal.bmiHeader.bV5SizeImage = DIB_GetDIBWidthBytes(DestSize.cx, - Info->bmiHeader.biBitCount) * DestSize.cy; + bmiLocal.bmiHeader.bV5BitCount) * DestSize.cy; hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + DIB_GetDIBWidthBytes(DestSize.cx, + bmiLocal.bmiHeader.bV5BitCount), + BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, + bmiLocal.bmiHeader.bV5Compression), + bmiLocal.bmiHeader.bV5Height > 0 ? 0 : BMF_TOPDOWN, Bits); if (hDestBitmap == NULL) @@ -877,7 +879,7 @@ &DestRect, &SourcePoint)) { - DPRINT("GetDIBits %d \n",abs(Info->bmiHeader.biHeight) - StartScan); + DPRINT("GetDIBits %d \n",abs(bmiLocal.bmiHeader.bV5Height) - StartScan); Result = ScanLines; } @@ -885,9 +887,19 @@ EngUnlockSurface(DestSurfObj); } } + /* Now that everything is over, get back the information to caller */ - /* Note : Info has already been probed */ - GetBMIFromBitmapV5Info(&bmiLocal, Info, Usage); + _SEH2_TRY + { + /* Note : Info has already been probed */ + GetBMIFromBitmapV5Info(&bmiLocal, Info, Usage); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* FIXME: fail or something */ + } + _SEH2_END + cleanup: if (hDestBitmap != NULL)

1 0

[tkreuzer] 47691: revert 47688 and 47689
by tkreuzer＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: tkreuzer Date: Tue Jun 8 03:37:58 2010 New Revision: 47691 URL: http://svn.reactos.org/svn/reactos?rev=47691&view=rev Log: revert 47688 and 47689 Added: trunk/reactos/lib/3rdparty/zlib/gzclose.c - copied unchanged from r47687, trunk/reactos/lib/3rdparty/zlib/gzclose.c trunk/reactos/lib/3rdparty/zlib/gzguts.h - copied unchanged from r47687, trunk/reactos/lib/3rdparty/zlib/gzguts.h trunk/reactos/lib/3rdparty/zlib/gzlib.c - copied unchanged from r47687, trunk/reactos/lib/3rdparty/zlib/gzlib.c trunk/reactos/lib/3rdparty/zlib/gzread.c - copied unchanged from r47687, trunk/reactos/lib/3rdparty/zlib/gzread.c trunk/reactos/lib/3rdparty/zlib/gzwrite.c - copied unchanged from r47687, trunk/reactos/lib/3rdparty/zlib/gzwrite.c Removed: trunk/reactos/lib/3rdparty/zlib/Makefile.host trunk/reactos/lib/3rdparty/zlib/gzio.c trunk/reactos/lib/3rdparty/zlib/zconf.in.h Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/lib/3rdparty/zlib/ChangeLog trunk/reactos/lib/3rdparty/zlib/FAQ trunk/reactos/lib/3rdparty/zlib/INDEX trunk/reactos/lib/3rdparty/zlib/Makefile.in trunk/reactos/lib/3rdparty/zlib/README trunk/reactos/lib/3rdparty/zlib/adler32.c trunk/reactos/lib/3rdparty/zlib/algorithm.txt trunk/reactos/lib/3rdparty/zlib/compress.c trunk/reactos/lib/3rdparty/zlib/configure trunk/reactos/lib/3rdparty/zlib/crc32.c trunk/reactos/lib/3rdparty/zlib/deflate.c trunk/reactos/lib/3rdparty/zlib/deflate.h trunk/reactos/lib/3rdparty/zlib/example.c trunk/reactos/lib/3rdparty/zlib/infback.c trunk/reactos/lib/3rdparty/zlib/inffast.c trunk/reactos/lib/3rdparty/zlib/inffast.h trunk/reactos/lib/3rdparty/zlib/inflate.c trunk/reactos/lib/3rdparty/zlib/inflate.h trunk/reactos/lib/3rdparty/zlib/inftrees.c trunk/reactos/lib/3rdparty/zlib/inftrees.h trunk/reactos/lib/3rdparty/zlib/minigzip.c trunk/reactos/lib/3rdparty/zlib/trees.c trunk/reactos/lib/3rdparty/zlib/uncompr.c trunk/reactos/lib/3rdparty/zlib/zconf.h trunk/reactos/lib/3rdparty/zlib/zlib.h trunk/reactos/lib/3rdparty/zlib/zlib.rbuild trunk/reactos/lib/3rdparty/zlib/zutil.c trunk/reactos/lib/3rdparty/zlib/zutil.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/lib/3rdparty/zlib/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/ChangeLo… Modified: trunk/reactos/lib/3rdparty/zlib/FAQ URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/FAQ?rev=… Modified: trunk/reactos/lib/3rdparty/zlib/INDEX URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/INDEX?re… Removed: trunk/reactos/lib/3rdparty/zlib/Makefile.host URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/Makefile… Modified: trunk/reactos/lib/3rdparty/zlib/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/Makefile… Modified: trunk/reactos/lib/3rdparty/zlib/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/README?r… Modified: trunk/reactos/lib/3rdparty/zlib/adler32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/adler32.… Modified: trunk/reactos/lib/3rdparty/zlib/algorithm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/algorith… Modified: trunk/reactos/lib/3rdparty/zlib/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/compress… Modified: trunk/reactos/lib/3rdparty/zlib/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/configur… Modified: trunk/reactos/lib/3rdparty/zlib/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/crc32.c?… Modified: trunk/reactos/lib/3rdparty/zlib/deflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/deflate.… Modified: trunk/reactos/lib/3rdparty/zlib/deflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/deflate.… Modified: trunk/reactos/lib/3rdparty/zlib/example.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/example.… Removed: trunk/reactos/lib/3rdparty/zlib/gzio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzio.c?r… Modified: trunk/reactos/lib/3rdparty/zlib/infback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/infback.… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inflate.… Modified: trunk/reactos/lib/3rdparty/zlib/inflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inflate.… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/minigzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/minigzip… Modified: trunk/reactos/lib/3rdparty/zlib/trees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/trees.c?… Modified: trunk/reactos/lib/3rdparty/zlib/uncompr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/uncompr.… Modified: trunk/reactos/lib/3rdparty/zlib/zconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zconf.h?… Removed: trunk/reactos/lib/3rdparty/zlib/zconf.in.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zconf.in… Modified: trunk/reactos/lib/3rdparty/zlib/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.h?r… Modified: trunk/reactos/lib/3rdparty/zlib/zlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.rbu… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.c?… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.h?…

1 0

[jgardou] 47690: [WIN32K] - remove duplicate prototypes. - Add missing trail to debug print - replace some now superfluous checks on bitmap palette with sanity ASSERTS - begin using BITMAPV5HEADER as a default bitmap format, and introduce conversion to and from everything prior that. Congratulations to BITMAPCOREHEADER, for its backward compatibility personal failure.
by jgardou＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: jgardou Date: Tue Jun 8 02:40:42 2010 New Revision: 47690 URL: http://svn.reactos.org/svn/reactos?rev=47690&view=rev Log: [WIN32K] - remove duplicate prototypes. - Add missing trail to debug print - replace some now superfluous checks on bitmap palette with sanity ASSERTS - begin using BITMAPV5HEADER as a default bitmap format, and introduce conversion to and from everything prior that. Congratulations to BITMAPCOREHEADER, for its backward compatibility personal failure. Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Tue Jun 8 02:40:42 2010 @@ -2,14 +2,19 @@ #include "surface.h" -INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); -int APIENTRY DIB_GetDIBImageBytes (INT width, INT height, INT depth); -INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); +typedef struct tagBITMAPV5INFO +{ + BITMAPV5HEADER bmiHeader; + RGBQUAD bmiColors[256]; +} BITMAPV5INFO, *PBITMAPV5INFO; + INT APIENTRY BITMAP_GetObject(SURFACE * bmp, INT count, LPVOID buffer); HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); +NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse); +VOID FASTCALL GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, OUT PBITMAPINFO pbmiDst, IN DWORD dwUse); HBITMAP APIENTRY Modified: branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/misc/file.c [iso-8859-1] Tue Jun 8 02:40:42 2010 @@ -149,144 +149,8 @@ return pvBase; } -typedef struct tagBITMAPV5INFO -{ - BITMAPV5HEADER bmiHeader; - RGBQUAD bmiColors[256]; -} BITMAPV5INFO, *PBITMAPV5INFO; - // FIXME: this should go to dibobj.c -NTSTATUS -ProbeAndConvertBitmapInfo( - OUT BITMAPV5HEADER *pbmhDst, - OUT RGBQUAD *pbmiColorsDst, - ULONG cColors, - IN PBITMAPINFO pbmiUnsafe) -{ - DWORD dwSize; - RGBQUAD *pbmiColors; - ULONG ulWidthBytes; - - /* Get the size and probe */ - ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1); - dwSize = pbmiUnsafe->bmiHeader.biSize; - ProbeForRead(pbmiUnsafe, dwSize, 1); - - /* Check the size */ - // FIXME: are intermediate sizes allowed? As what are they interpreted? - // make sure we don't use a too big dwSize later - if (dwSize != sizeof(BITMAPCOREHEADER) && - dwSize != sizeof(BITMAPINFOHEADER) && - dwSize != sizeof(BITMAPV4HEADER) && - dwSize != sizeof(BITMAPV5HEADER)) - { - return STATUS_INVALID_PARAMETER; - } - - pbmiColors = (RGBQUAD*)((PCHAR)pbmiUnsafe + dwSize); - - pbmhDst->bV5Size = sizeof(BITMAPV5HEADER); - - if (dwSize == sizeof(BITMAPCOREHEADER)) - { - PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmiUnsafe; - - /* Manually copy the fields that are present */ - pbmhDst->bV5Width = pbch->bcWidth; - pbmhDst->bV5Height = pbch->bcHeight; - pbmhDst->bV5Planes = pbch->bcPlanes; - pbmhDst->bV5BitCount = pbch->bcBitCount; - - /* Set some default values */ - pbmhDst->bV5Compression = BI_RGB; - pbmhDst->bV5SizeImage = 0; - pbmhDst->bV5XPelsPerMeter = 72; - pbmhDst->bV5YPelsPerMeter = 72; - pbmhDst->bV5ClrUsed = 0; - pbmhDst->bV5ClrImportant = 0; - } - else - { - /* Copy valid fields */ - memcpy(pbmhDst, pbmiUnsafe, dwSize); - - /* Zero out the rest of the V5 header */ - memset((char*)pbmhDst + dwSize, 0, sizeof(BITMAPV5HEADER) - dwSize); - } - - - if (dwSize < sizeof(BITMAPV4HEADER)) - { - if (pbmhDst->bV5Compression == BI_BITFIELDS) - { - DWORD *pMasks = (DWORD*)pbmiColors; - pbmhDst->bV5RedMask = pMasks[0]; - pbmhDst->bV5GreenMask = pMasks[1]; - pbmhDst->bV5BlueMask = pMasks[2]; - pbmhDst->bV5AlphaMask = 0; - pbmhDst->bV5ClrUsed = 0; - } - -// pbmhDst->bV5CSType; -// pbmhDst->bV5Endpoints; -// pbmhDst->bV5GammaRed; -// pbmhDst->bV5GammaGreen; -// pbmhDst->bV5GammaBlue; - } - - if (dwSize < sizeof(BITMAPV5HEADER)) - { -// pbmhDst->bV5Intent; -// pbmhDst->bV5ProfileData; -// pbmhDst->bV5ProfileSize; -// pbmhDst->bV5Reserved; - } - - ulWidthBytes = ((pbmhDst->bV5Width * pbmhDst->bV5Planes * - pbmhDst->bV5BitCount + 31) & ~31) / 8; - - if (pbmhDst->bV5SizeImage == 0) - pbmhDst->bV5SizeImage = abs(ulWidthBytes * pbmhDst->bV5Height); - - if (pbmhDst->bV5ClrUsed == 0) - pbmhDst->bV5ClrUsed = pbmhDst->bV5BitCount == 1 ? 2 : - (pbmhDst->bV5BitCount == 4 ? 16 : - (pbmhDst->bV5BitCount == 8 ? 256 : 0)); - - if (pbmhDst->bV5Planes != 1) - { - return STATUS_INVALID_PARAMETER; - } - - if (pbmhDst->bV5BitCount != 0 && pbmhDst->bV5BitCount != 1 && - pbmhDst->bV5BitCount != 4 && pbmhDst->bV5BitCount != 8 && - pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 24 && - pbmhDst->bV5BitCount != 32) - { - DPRINT("Invalid bit count: %d\n", pbmhDst->bV5BitCount); - return STATUS_INVALID_PARAMETER; - } - - if ((pbmhDst->bV5BitCount == 0 && - pbmhDst->bV5Compression != BI_JPEG && pbmhDst->bV5Compression != BI_PNG)) - { - DPRINT("Bit count 0 is invalid for compression %d.\n", pbmhDst->bV5Compression); - return STATUS_INVALID_PARAMETER; - } - - if (pbmhDst->bV5Compression == BI_BITFIELDS && - pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 32) - { - DPRINT("Bit count %d is invalid for compression BI_BITFIELDS.\n", pbmhDst->bV5BitCount); - return STATUS_INVALID_PARAMETER; - } - - /* Copy Colors */ - cColors = min(cColors, pbmhDst->bV5ClrUsed); - memcpy(pbmiColorsDst, pbmiColors, cColors * sizeof(RGBQUAD)); - - return STATUS_SUCCESS; -} + HBITMAP @@ -333,10 +197,9 @@ /* Create a normalized local BITMAPINFO */ _SEH2_TRY { - Status = ProbeAndConvertBitmapInfo(&bmiLocal.bmiHeader, - bmiLocal.bmiColors, - 256, - pbmi); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, + pbmi, + DIB_RGB_COLORS); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue Jun 8 02:40:42 2010 @@ -757,7 +757,7 @@ } else if(DCSrc) { - DPRINT1("Getting a valid Source handle without using source!!!"); + DPRINT1("Getting a valid Source handle without using source!!!\n"); GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject); DCSrc = NULL ; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Tue Jun 8 02:40:42 2010 @@ -221,16 +221,16 @@ CONST BITMAPINFO *bmi, UINT ColorUse) { - SURFACE *bitmap; + SURFACE *bitmap; HBITMAP SourceBitmap; INT result = 0; BOOL copyBitsResult; - SURFOBJ *DestSurf, *SourceSurf; + SURFOBJ *DestSurf, *SourceSurf; SIZEL SourceSize; POINTL ZeroPoint; RECTL DestRect; EXLATEOBJ exlo; - PPALETTE ppalDDB, ppalDIB; + PPALETTE ppalDIB; //RGBQUAD *lpRGB; HPALETTE DIB_Palette; ULONG DIB_Palette_Type; @@ -278,32 +278,15 @@ return 0; } - if (bitmap->ppal) - { - ppalDDB = bitmap->ppal; - GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); - } - else - // Destination palette obtained from the hDC - ppalDDB = PALETTE_ShareLockPalette(DC->ppdev->devinfo.hpalDefault); - - if (NULL == ppalDDB) + ASSERT(bitmap->ppal); + + // Source palette obtained from the BITMAPINFO + DIB_Palette = BuildDIBPalette(bmi, (PINT)&DIB_Palette_Type); + if (NULL == DIB_Palette) { EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); SURFACE_UnlockSurface(bitmap); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - // Source palette obtained from the BITMAPINFO - DIB_Palette = BuildDIBPalette((PBITMAPINFO)bmi, (PINT)&DIB_Palette_Type); - if (NULL == DIB_Palette) - { - EngUnlockSurface(SourceSurf); - EngDeleteSurface((HSURF)SourceBitmap); - SURFACE_UnlockSurface(bitmap); - PALETTE_ShareUnlockPalette(ppalDDB); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } @@ -311,7 +294,7 @@ ppalDIB = PALETTE_LockPalette(DIB_Palette); /* Initialize XLATEOBJ for color translation */ - EXLATEOBJ_vInitialize(&exlo, ppalDIB, ppalDDB, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, ppalDIB, bitmap->ppal, 0, 0, 0); // Zero point ZeroPoint.x = 0; @@ -336,7 +319,6 @@ // Clean up EXLATEOBJ_vCleanup(&exlo); PALETTE_UnlockPalette(ppalDIB); - PALETTE_ShareUnlockPalette(ppalDDB); PALETTE_FreePaletteByHandle(DIB_Palette); EngUnlockSurface(SourceSurf); EngDeleteSurface((HSURF)SourceBitmap); @@ -366,17 +348,13 @@ PDC Dc; INT Ret; NTSTATUS Status = STATUS_SUCCESS; - UINT cjBits; + BITMAPV5INFO bmiLocal; if (!Bits) return 0; _SEH2_TRY - { // FYI: We converted from CORE in gdi. - ProbeForRead(bmi, sizeof(BITMAPINFO), 1); - cjBits = bmi->bmiHeader.biBitCount * bmi->bmiHeader.biPlanes * bmi->bmiHeader.biWidth; - cjBits = ((cjBits + 31) & ~31) / 8; - cjBits *= ScanLines; - ProbeForRead(Bits, cjBits, 1); + { + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -401,7 +379,7 @@ return 0; } - Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); + Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, (PBITMAPINFO)&bmiLocal, ColorUse); DC_UnlockDc(Dc); @@ -440,16 +418,16 @@ INT DIBWidth; SIZEL SourceSize; EXLATEOBJ exlo; - PPALETTE ppalDDB = NULL, ppalDIB = NULL; + PPALETTE ppalDIB = NULL; HPALETTE hpalDIB = NULL; ULONG DIBPaletteType; + BITMAPV5INFO bmiLocal ; if (!Bits) return 0; _SEH2_TRY { - ProbeForRead(bmi, cjMaxInfo , 1); - ProbeForRead(Bits, cjMaxBits, 1); + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -478,7 +456,7 @@ pDestSurf = pSurf ? &pSurf->SurfObj : NULL; - ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); + ScanLines = min(ScanLines, abs(bmiLocal.bmiHeader.bV5Height) - StartScan); rcDest.left = XDest; rcDest.top = YDest; @@ -495,15 +473,16 @@ ptSource.x = XSrc; ptSource.y = YSrc; - SourceSize.cx = bmi->bmiHeader.biWidth; + SourceSize.cx = bmiLocal.bmiHeader.bV5Width; SourceSize.cy = ScanLines; - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmiLocal.bmiHeader.bV5BitCount); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, - BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), - bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, + bmiLocal.bmiHeader.bV5Compression), + bmiLocal.bmiHeader.bV5Height < 0 ? BMF_TOPDOWN : 0, (PVOID) Bits); if (!hSourceBitmap) { @@ -519,42 +498,28 @@ goto Exit; } - /* Obtain destination palette */ - if (pSurf && pSurf->ppal) - { - ppalDDB = pSurf->ppal; - GDIOBJ_IncrementShareCount(&ppalDDB->BaseObject); - } - else - ppalDDB = PALETTE_ShareLockPalette(pDC->ppdev->devinfo.hpalDefault); - - if (!ppalDDB) + ASSERT(pSurf->ppal); + + /* Create a palette for the DIB */ + hpalDIB = BuildDIBPalette((PBITMAPINFO)&bmiLocal, (PINT)&DIBPaletteType); + if (!hpalDIB) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + goto Exit; + } + + /* Lock the DIB palette */ + ppalDIB = PALETTE_LockPalette(hpalDIB); + if (!ppalDIB) { SetLastWin32Error(ERROR_INVALID_HANDLE); Status = STATUS_UNSUCCESSFUL; goto Exit; } - /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); - if (!hpalDIB) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - Status = STATUS_NO_MEMORY; - goto Exit; - } - - /* Lock the DIB palette */ - ppalDIB = PALETTE_LockPalette(hpalDIB); - if (!ppalDIB) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - Status = STATUS_UNSUCCESSFUL; - goto Exit; - } - /* Initialize EXLATEOBJ */ - EXLATEOBJ_vInitialize(&exlo, ppalDIB, ppalDDB, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, ppalDIB, pSurf->ppal, 0, 0, 0); /* Copy the bits */ DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", @@ -582,7 +547,6 @@ } if (ppalDIB) PALETTE_UnlockPalette(ppalDIB); - if (ppalDDB) PALETTE_ShareUnlockPalette(ppalDDB); if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); @@ -611,14 +575,12 @@ SURFACE *psurf = NULL; HBITMAP hDestBitmap = NULL; HPALETTE hDestPalette = NULL; - PPALETTE ppalSrc = NULL; + BITMAPV5INFO bmiLocal ; PPALETTE ppalDst = NULL; NTSTATUS Status = STATUS_SUCCESS; ULONG Result = 0; BOOL bPaletteMatch = FALSE; PBYTE ChkBits = Bits; - PVOID ColorPtr; - RGBQUAD *rgbQuads; ULONG DestPaletteType; ULONG Index; @@ -633,9 +595,7 @@ _SEH2_TRY { - ProbeForRead(&Info->bmiHeader.biSize, sizeof(DWORD), 1); - - ProbeForWrite(Info, Info->bmiHeader.biSize, 1); // Comp for Core. + Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, Info, Usage); if (ChkBits) ProbeForWrite(ChkBits, MaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -665,20 +625,9 @@ return 0; } - if (psurf->ppal) - { - ppalSrc = psurf->ppal; - GDIOBJ_IncrementShareCount(&ppalSrc->BaseObject); - } - else - ppalSrc = PALETTE_ShareLockPalette(Dc->ppdev->devinfo.hpalDefault); + ASSERT(psurf->ppal); DC_UnlockDc(Dc); - - ASSERT(ppalSrc != NULL); - - ColorPtr = ((PBYTE)Info + Info->bmiHeader.biSize); - rgbQuads = (RGBQUAD *)ColorPtr; /* Copy palette information * Always create a palette for 15 & 16 bit. */ @@ -686,53 +635,49 @@ Info->bmiHeader.biBitCount != 15 && Info->bmiHeader.biBitCount != 16) || !ChkBits) { - ppalDst = ppalSrc; + ppalDst = psurf->ppal; bPaletteMatch = TRUE; } else - hDestPalette = BuildDIBPalette(Info, (PINT)&DestPaletteType); //hDestPalette = Dc->DevInfo->hpalDefault; - - if (!bPaletteMatch) - { + { + hDestPalette = BuildDIBPalette((PBITMAPINFO)&bmiLocal, (PINT)&DestPaletteType); ppalDst = PALETTE_LockPalette(hDestPalette); - /* FIXME - ppalDst can be NULL!!!! Don't assert here!!! */ - DPRINT("ppalDst : %p\n", ppalDst); - ASSERT(ppalDst); - } + } + + DPRINT("ppalDst : %p\n", ppalDst); + ASSERT(ppalDst); /* Copy palette. */ - /* FIXME: This is largely incomplete. ATM no Core!*/ - switch (Info->bmiHeader.biBitCount) + switch (bmiLocal.bmiHeader.bV5BitCount) { case 1: case 4: case 8: - Info->bmiHeader.biClrUsed = 0; + bmiLocal.bmiHeader.bV5ClrUsed = 0; if (psurf->hSecure && - BitsPerFormat(psurf->SurfObj.iBitmapFormat) == Info->bmiHeader.biBitCount) + BitsPerFormat(psurf->SurfObj.iBitmapFormat) == bmiLocal.bmiHeader.bV5BitCount) { if (Usage == DIB_RGB_COLORS) { - if (ppalDst->NumColors != 1 << Info->bmiHeader.biBitCount) - Info->bmiHeader.biClrUsed = ppalDst->NumColors; + if (ppalDst->NumColors != 1 << bmiLocal.bmiHeader.bV5BitCount) + bmiLocal.bmiHeader.bV5ClrUsed = ppalDst->NumColors; for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && Index < ppalDst->NumColors; + Index < (1 << bmiLocal.bmiHeader.bV5BitCount) && Index < ppalDst->NumColors; Index++) { - rgbQuads[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; - rgbQuads[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; - rgbQuads[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; - rgbQuads[Index].rgbReserved = 0; + bmiLocal.bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; + bmiLocal.bmiColors[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; + bmiLocal.bmiColors[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; + bmiLocal.bmiColors[Index].rgbReserved = 0; } } else { - PWORD Ptr = ColorPtr; for (Index = 0; Index < (1 << Info->bmiHeader.biBitCount); Index++) { - Ptr[Index] = (WORD)Index; + ((WORD*)bmiLocal.bmiColors)[Index] = Index; } } } @@ -740,12 +685,11 @@ { if (Usage == DIB_PAL_COLORS) { - PWORD Ptr = ColorPtr; for (Index = 0; Index < (1 << Info->bmiHeader.biBitCount); Index++) { - Ptr[Index] = (WORD)Index; + ((WORD*)bmiLocal.bmiColors)[Index] = (WORD)Index; } } else if (Info->bmiHeader.biBitCount > 1 && bPaletteMatch) @@ -754,33 +698,37 @@ Index < (1 << Info->bmiHeader.biBitCount) && Index < ppalDst->NumColors; Index++) { - Info->bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; - Info->bmiColors[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; - Info->bmiColors[Index].rgbReserved = 0; + bmiLocal.bmiColors[Index].rgbRed = ppalDst->IndexedColors[Index].peRed; + bmiLocal.bmiColors[Index].rgbGreen = ppalDst->IndexedColors[Index].peGreen; + bmiLocal.bmiColors[Index].rgbBlue = ppalDst->IndexedColors[Index].peBlue; + bmiLocal.bmiColors[Index].rgbReserved = 0; } } else { - switch (Info->bmiHeader.biBitCount) + switch (bmiLocal.bmiHeader.bV5BitCount) { case 1: - rgbQuads[0].rgbRed = rgbQuads[0].rgbGreen = rgbQuads[0].rgbBlue = 0; - rgbQuads[0].rgbReserved = 0; - rgbQuads[1].rgbRed = rgbQuads[1].rgbGreen = rgbQuads[1].rgbBlue = 0xff; - rgbQuads[1].rgbReserved = 0; + bmiLocal.bmiColors[0].rgbRed =0 ; + bmiLocal.bmiColors[0].rgbGreen = 0; + bmiLocal.bmiColors[0].rgbBlue = 0; + bmiLocal.bmiColors[0].rgbReserved = 0; + bmiLocal.bmiColors[1].rgbRed =0xFF ; + bmiLocal.bmiColors[1].rgbGreen = 0xFF; + bmiLocal.bmiColors[1].rgbBlue = 0xFF; + bmiLocal.bmiColors[1].rgbReserved = 0; break; case 4: - RtlCopyMemory(ColorPtr, EGAColorsQuads, sizeof(EGAColorsQuads)); + RtlCopyMemory(bmiLocal.bmiColors, EGAColorsQuads, sizeof(EGAColorsQuads)); break; case 8: { INT r, g, b; RGBQUAD *color; - RtlCopyMemory(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); - RtlCopyMemory(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; + RtlCopyMemory(bmiLocal.bmiColors, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); + RtlCopyMemory(bmiLocal.bmiColors + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); + color = bmiLocal.bmiColors + 10; for (r = 0; r <= 5; r++) /* FIXME */ for (g = 0; g <= 5; g++) for (b = 0; b <= 5; b++) @@ -798,20 +746,20 @@ } case 15: - if (Info->bmiHeader.biCompression == BI_BITFIELDS) + if (bmiLocal.bmiHeader.bV5Compression == BI_BITFIELDS) { - ((PDWORD)Info->bmiColors)[0] = 0x7c00; - ((PDWORD)Info->bmiColors)[1] = 0x03e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; + bmiLocal.bmiHeader.bV5RedMask = 0x7c00; + bmiLocal.bmiHeader.bV5GreenMask = 0x03e0; + bmiLocal.bmiHeader.bV5BlueMask = 0x001f; } break; case 16: if (Info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)Info->bmiColors)[0] = 0xf800; - ((PDWORD)Info->bmiColors)[1] = 0x07e0; - ((PDWORD)Info->bmiColors)[2] = 0x001f; + bmiLocal.bmiHeader.bV5RedMask = 0xf800; + bmiLocal.bmiHeader.bV5GreenMask = 0x07e0; + bmiLocal.bmiHeader.bV5BlueMask = 0x001f; } break; @@ -819,71 +767,54 @@ case 32: if (Info->bmiHeader.biCompression == BI_BITFIELDS) { - ((PDWORD)Info->bmiColors)[0] = 0xff0000; - ((PDWORD)Info->bmiColors)[1] = 0x00ff00; - ((PDWORD)Info->bmiColors)[2] = 0x0000ff; + bmiLocal.bmiHeader.bV5RedMask = 0xff0000; + bmiLocal.bmiHeader.bV5GreenMask = 0x00ff00; + bmiLocal.bmiHeader.bV5BlueMask = 0x0000ff; } break; } - if (!bPaletteMatch) - PALETTE_UnlockPalette(ppalDst); - /* fill out the BITMAPINFO struct */ if (!ChkBits) - { // Core or not to Core? We have converted from Core in Gdi~ so? - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcWidth = psurf->SurfObj.sizlBitmap.cx; - coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - coreheader->bcHeight = psurf->SurfObj.sizlBitmap.cy; - if (psurf->SurfObj.lDelta > 0) - coreheader->bcHeight = -coreheader->bcHeight; - } - - if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) - { - Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = psurf->SurfObj.sizlBitmap.cy; - Info->bmiHeader.biPlanes = 1; - Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - switch (psurf->SurfObj.iBitmapFormat) - { - /* FIXME: What about BI_BITFIELDS? */ - case BMF_1BPP: - case BMF_4BPP: - case BMF_8BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - Info->bmiHeader.biCompression = BI_RGB; - break; - case BMF_4RLE: - Info->bmiHeader.biCompression = BI_RLE4; - break; - case BMF_8RLE: - Info->bmiHeader.biCompression = BI_RLE8; - break; - case BMF_JPEG: - Info->bmiHeader.biCompression = BI_JPEG; - break; - case BMF_PNG: - Info->bmiHeader.biCompression = BI_PNG; - break; - } - /* Image size has to be calculated */ - Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, - Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; - Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biClrUsed = 0; - Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - /* Report negtive height for top-down bitmaps. */ - if (psurf->SurfObj.lDelta > 0) - Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; - } + { + bmiLocal.bmiHeader.bV5Width = psurf->SurfObj.sizlBitmap.cx; + bmiLocal.bmiHeader.bV5Height = psurf->SurfObj.sizlBitmap.cy; + bmiLocal.bmiHeader.bV5Planes = 1; + bmiLocal.bmiHeader.bV5BitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + switch (psurf->SurfObj.iBitmapFormat) + { + /* FIXME: What about BI_BITFIELDS? */ + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + bmiLocal.bmiHeader.bV5Compression = BI_RGB; + break; + case BMF_4RLE: + bmiLocal.bmiHeader.bV5Compression = BI_RLE4; + break; + case BMF_8RLE: + bmiLocal.bmiHeader.bV5Compression = BI_RLE8; + break; + case BMF_JPEG: + bmiLocal.bmiHeader.bV5Compression = BI_JPEG; + break; + case BMF_PNG: + bmiLocal.bmiHeader.bV5Compression = BI_PNG; + break; + } + /* Image size has to be calculated */ + bmiLocal.bmiHeader.bV5SizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; + bmiLocal.bmiHeader.bV5XPelsPerMeter = 0; /* FIXME */ + bmiLocal.bmiHeader.bV5YPelsPerMeter = 0; /* FIXME */ + bmiLocal.bmiHeader.bV5ClrUsed = 0; + bmiLocal.bmiHeader.bV5ClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ + /* Report negative height for top-down bitmaps. */ + if (psurf->SurfObj.lDelta > 0) + bmiLocal.bmiHeader.bV5Height *= -1; Result = psurf->SurfObj.sizlBitmap.cy; } else @@ -907,27 +838,14 @@ hDestBitmap = NULL; - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), - BitmapFormat(coreheader->bcBitCount, BI_RGB), - 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) - { - Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(DestSize.cx, + bmiLocal.bmiHeader.bV5SizeImage = DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount) * DestSize.cy; - hDestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, - Bits); - } + hDestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); if (hDestBitmap == NULL) goto cleanup; @@ -939,7 +857,7 @@ SURFOBJ *DestSurfObj; RECTL DestRect; - EXLATEOBJ_vInitialize(&exlo, ppalSrc, ppalDst, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, psurf->ppal, ppalDst, 0, 0, 0); SourcePoint.x = 0; SourcePoint.y = psurf->SurfObj.sizlBitmap.cy - (StartScan + ScanLines); @@ -967,14 +885,19 @@ EngUnlockSurface(DestSurfObj); } } + /* Now that everything is over, get back the information to caller */ + /* Note : Info has already been probed */ + GetBMIFromBitmapV5Info(&bmiLocal, Info, Usage); cleanup: - PALETTE_ShareUnlockPalette(ppalSrc); if (hDestBitmap != NULL) EngDeleteSurface((HSURF)hDestBitmap); - if (hDestPalette != NULL && bPaletteMatch == FALSE) + if (hDestPalette != NULL && !bPaletteMatch) + { + PALETTE_UnlockPalette(ppalDst); PALETTE_FreePaletteByHandle(hDestPalette); + } SURFACE_UnlockSurface(psurf); @@ -1653,7 +1576,7 @@ { colors = info->bmiHeader.biClrUsed; if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; - return sizeof(BITMAPINFOHEADER) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + return info->bmiHeader.biSize + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } } @@ -1722,9 +1645,9 @@ { BYTE bits; ULONG ColorCount; - PALETTEENTRY *palEntries = NULL; HPALETTE hPal; ULONG RedMask, GreenMask, BlueMask; + PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1738,9 +1661,9 @@ else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) { *paletteType = PAL_BITFIELDS; - RedMask = ((ULONG *)bmi->bmiColors)[0]; - GreenMask = ((ULONG *)bmi->bmiColors)[1]; - BlueMask = ((ULONG *)bmi->bmiColors)[2]; + RedMask = pdwColors[0]; + GreenMask = pdwColors[1]; + BlueMask = pdwColors[2]; } else if (bits == 15) { @@ -1775,16 +1698,256 @@ if (PAL_INDEXED == *paletteType) { - hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)bmi->bmiColors); + hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)pdwColors); } else { hPal = PALETTE_AllocPalette(*paletteType, ColorCount, - (ULONG*) palEntries, + NULL, RedMask, GreenMask, BlueMask); } return hPal; } +FORCEINLINE +DWORD +GetBMIColor(CONST BITMAPINFO* pbmi, INT i) +{ + DWORD dwRet = 0; + INT size; + if(pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + /* BITMAPCOREINFO holds RGBTRIPLE values */ + size = sizeof(RGBTRIPLE); + } + else + { + size = sizeof(RGBQUAD); + } + memcpy(&dwRet, (PBYTE)pbmi + pbmi->bmiHeader.biSize + i*size, size); + return dwRet; +} + +FORCEINLINE +VOID +SetBMIColor(CONST BITMAPINFO* pbmi, DWORD* color, INT i) +{ + if(pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + *(RGBTRIPLE*)((PBYTE)pbmi + pbmi->bmiHeader.biSize + i*sizeof(RGBTRIPLE)) = *(RGBTRIPLE*)color; + } + else + { + *(RGBQUAD*)((PBYTE)pbmi + pbmi->bmiHeader.biSize + i*sizeof(RGBQUAD)) = *(RGBQUAD*)color; + } +} + +NTSTATUS +FASTCALL +ProbeAndConvertToBitmapV5Info( + OUT PBITMAPV5INFO pbmiDst, + IN CONST BITMAPINFO* pbmiUnsafe, + IN DWORD dwColorUse) +{ + DWORD dwSize; + ULONG ulWidthBytes; + PBITMAPV5HEADER pbmhDst = &pbmiDst->bmiHeader; + + /* Get the size and probe */ + ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1); + dwSize = pbmiUnsafe->bmiHeader.biSize; + ProbeForRead(pbmiUnsafe, dwSize, 1); + + /* Check the size */ + // FIXME: are intermediate sizes allowed? As what are they interpreted? + // make sure we don't use a too big dwSize later + if (dwSize != sizeof(BITMAPCOREHEADER) && + dwSize != sizeof(BITMAPINFOHEADER) && + dwSize != sizeof(BITMAPV4HEADER) && + dwSize != sizeof(BITMAPV5HEADER)) + { + return STATUS_INVALID_PARAMETER; + } + + if (dwSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmiUnsafe; + + /* Manually copy the fields that are present */ + pbmhDst->bV5Width = pbch->bcWidth; + pbmhDst->bV5Height = pbch->bcHeight; + pbmhDst->bV5Planes = pbch->bcPlanes; + pbmhDst->bV5BitCount = pbch->bcBitCount; + + /* Set some default values */ + pbmhDst->bV5Compression = BI_RGB; + pbmhDst->bV5SizeImage = 0; + pbmhDst->bV5XPelsPerMeter = 72; + pbmhDst->bV5YPelsPerMeter = 72; + pbmhDst->bV5ClrUsed = 0; + pbmhDst->bV5ClrImportant = 0; + } + else + { + /* Copy valid fields */ + memcpy(pbmiDst, pbmiUnsafe, dwSize); + + if(dwSize < sizeof(BITMAPV5HEADER)) + { + /* Zero out the rest of the V5 header */ + memset((char*)pbmiDst + dwSize, 0, sizeof(BITMAPV5HEADER) - dwSize); + } + } + pbmhDst->bV5Size = sizeof(BITMAPV5HEADER); + + + if (dwSize < sizeof(BITMAPV4HEADER)) + { + if (pbmhDst->bV5Compression == BI_BITFIELDS) + { + pbmhDst->bV5RedMask = GetBMIColor(pbmiUnsafe, 0); + pbmhDst->bV5GreenMask = GetBMIColor(pbmiUnsafe, 1); + pbmhDst->bV5BlueMask = GetBMIColor(pbmiUnsafe, 2); + pbmhDst->bV5AlphaMask = 0; + pbmhDst->bV5ClrUsed = 0; + } + +// pbmhDst->bV5CSType; +// pbmhDst->bV5Endpoints; +// pbmhDst->bV5GammaRed; +// pbmhDst->bV5GammaGreen; +// pbmhDst->bV5GammaBlue; + } + + if (dwSize < sizeof(BITMAPV5HEADER)) + { +// pbmhDst->bV5Intent; +// pbmhDst->bV5ProfileData; +// pbmhDst->bV5ProfileSize; +// pbmhDst->bV5Reserved; + } + + ulWidthBytes = ((pbmhDst->bV5Width * pbmhDst->bV5Planes * + pbmhDst->bV5BitCount + 31) & ~31) / 8; + + if (pbmhDst->bV5SizeImage == 0) + pbmhDst->bV5SizeImage = abs(ulWidthBytes * pbmhDst->bV5Height); + + if (pbmhDst->bV5ClrUsed == 0) + { + switch(pbmhDst->bV5BitCount) + { + case 1: + pbmhDst->bV5ClrUsed = 2; + break; + case 4: + pbmhDst->bV5ClrUsed = 16; + break; + case 8: + pbmhDst->bV5ClrUsed = 256; + break; + default: + pbmhDst->bV5ClrUsed = 0; + break; + } + } + + if (pbmhDst->bV5Planes != 1) + { + return STATUS_INVALID_PARAMETER; + } + + if (pbmhDst->bV5BitCount != 0 && pbmhDst->bV5BitCount != 1 && + pbmhDst->bV5BitCount != 4 && pbmhDst->bV5BitCount != 8 && + pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 24 && + pbmhDst->bV5BitCount != 32) + { + DPRINT("Invalid bit count: %d\n", pbmhDst->bV5BitCount); + return STATUS_INVALID_PARAMETER; + } + + if ((pbmhDst->bV5BitCount == 0 && + pbmhDst->bV5Compression != BI_JPEG && pbmhDst->bV5Compression != BI_PNG)) + { + DPRINT("Bit count 0 is invalid for compression %d.\n", pbmhDst->bV5Compression); + return STATUS_INVALID_PARAMETER; + } + + if (pbmhDst->bV5Compression == BI_BITFIELDS && + pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 32) + { + DPRINT("Bit count %d is invalid for compression BI_BITFIELDS.\n", pbmhDst->bV5BitCount); + return STATUS_INVALID_PARAMETER; + } + + /* Copy Colors */ + if(pbmhDst->bV5ClrUsed) + { + INT i; + if(dwColorUse == DIB_PAL_COLORS) + { + RtlCopyMemory(pbmiDst->bmiColors, + pbmiUnsafe->bmiColors, + pbmhDst->bV5ClrUsed * sizeof(WORD)); + } + else + { + for(i = 0; i < pbmhDst->bV5ClrUsed; i++) + { + ((DWORD*)pbmiDst->bmiColors)[i] = GetBMIColor(pbmiUnsafe, i); + } + } + } + + return STATUS_SUCCESS; +} + +VOID +FASTCALL +GetBMIFromBitmapV5Info(IN PBITMAPV5INFO pbmiSrc, + OUT PBITMAPINFO pbmiDst, + IN DWORD dwColorUse) +{ + if(pbmiDst->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + /* Manually set value */ + BITMAPCOREHEADER* pbmhCore = (BITMAPCOREHEADER*)&pbmiDst->bmiHeader; + pbmhCore->bcWidth = pbmiSrc->bmiHeader.bV5Width; + pbmhCore->bcHeight = pbmiSrc->bmiHeader.bV5Height; + pbmhCore->bcPlanes = pbmiSrc->bmiHeader.bV5Planes; + pbmhCore->bcBitCount = pbmiSrc->bmiHeader.bV5BitCount; + } + else + { + /* Copy valid Fields, keep bmiHeader.biSize safe */ + RtlCopyMemory((PBYTE)pbmiDst + sizeof(DWORD), pbmiSrc, pbmiDst->bmiHeader.biSize - sizeof(DWORD)); + } + if((pbmiDst->bmiHeader.biSize < sizeof(BITMAPV4HEADER)) && + (pbmiSrc->bmiHeader.bV5Compression == BI_BITFIELDS)) + { + /* Masks are already set in V4 and V5 headers */ + SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5RedMask, 0); + SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5GreenMask, 1); + SetBMIColor(pbmiDst, &pbmiSrc->bmiHeader.bV5BlueMask, 2); + } + else + { + INT i; + if(dwColorUse == DIB_PAL_COLORS) + { + RtlCopyMemory(pbmiDst->bmiColors, + pbmiSrc->bmiColors, + pbmiSrc->bmiHeader.bV5ClrUsed * sizeof(WORD)); + } + else + { + for(i = 0; i < pbmiSrc->bmiHeader.bV5ClrUsed; i++) + { + SetBMIColor(pbmiDst, (DWORD*)pbmiSrc->bmiColors + i, i); + } + } + } +} + /* EOF */

1 0

[tkreuzer] 47689: [BOOTCD] Add cabman to bootcd. This is for diagnostic purposes.
by tkreuzer＠svn.reactos.org 08 Jun '10

08 Jun '10

Author: tkreuzer Date: Tue Jun 8 02:19:34 2010 New Revision: 47689 URL: http://svn.reactos.org/svn/reactos?rev=47689&view=rev Log: [BOOTCD] Add cabman to bootcd. This is for diagnostic purposes. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Jun 8 02:19:34 2010 @@ -816,3 +816,5 @@ modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional + +tools\cabman\cabman 7

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