Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 47728: - Fix localspl and localui build.
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 22:28:14 2010 New Revision: 47728 URL: http://svn.reactos.org/svn/reactos?rev=47728&view=rev Log: - Fix localspl and localui build. Modified: trunk/rostests/winetests/localspl/localspl.rbuild trunk/rostests/winetests/localui/localui.rbuild Modified: trunk/rostests/winetests/localspl/localspl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/locals… ============================================================================== --- trunk/rostests/winetests/localspl/localspl.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/localspl.rbuild [iso-8859-1] Wed Jun 9 22:28:14 2010 @@ -1,4 +1,5 @@ <module name="localspl_winetest" type="win32cui" installbase="bin" installname="localspl_winetest.exe" allowwarnings="true"> + <include base="ReactOS">include/reactos/wine</include> <include base="localspl_winetest">.</include> <define name="__ROS_LONG64__" /> <file>localmon.c</file> Modified: trunk/rostests/winetests/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/localui… ============================================================================== --- trunk/rostests/winetests/localui/localui.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/localui/localui.rbuild [iso-8859-1] Wed Jun 9 22:28:14 2010 @@ -1,4 +1,5 @@ <module name="localui_winetest" type="win32cui" installbase="bin" installname="localui_winetest.exe" allowwarnings="true"> + <include base="ReactOS">include/reactos/wine</include> <include base="localui_winetest">.</include> <define name="__ROS_LONG64__" /> <file>localui.c</file>

1 0

[akhaldi] 47727: Reintegrate header-work branch. Important changes include continued work on headers and progress on compiling for ARM.
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 22:24:32 2010 New Revision: 47727 URL: http://svn.reactos.org/svn/reactos?rev=47727&view=rev Log: Reintegrate header-work branch. Important changes include continued work on headers and progress on compiling for ARM. Added: trunk/reactos/include/ddk/dciddi.h - copied unchanged from r47721, branches/header-work/include/ddk/dciddi.h trunk/reactos/include/ddk/wmidata.h - copied unchanged from r47721, branches/header-work/include/ddk/wmidata.h trunk/reactos/include/psdk/compstui.h (with props) trunk/reactos/include/psdk/devioctl.h - copied, changed from r47721, trunk/reactos/include/ddk/devioctl.h trunk/reactos/include/psdk/kcom.h - copied, changed from r47721, trunk/reactos/include/ddk/kcom.h trunk/reactos/include/psdk/ksdebug.h - copied, changed from r47721, trunk/reactos/include/ddk/ksdebug.h trunk/reactos/include/psdk/ksuuids.h - copied, changed from r47721, trunk/reactos/include/ddk/ksuuids.h trunk/reactos/include/psdk/lmon.h - copied, changed from r47721, trunk/reactos/include/ddk/lmon.h trunk/reactos/include/psdk/mstcpip.h - copied unchanged from r47721, branches/header-work/include/psdk/mstcpip.h trunk/reactos/include/psdk/mswsockdef.h - copied unchanged from r47721, branches/header-work/include/psdk/mswsockdef.h trunk/reactos/include/psdk/nettypes.h - copied, changed from r47721, trunk/reactos/include/ddk/nettypes.h trunk/reactos/include/psdk/newdev.h - copied unchanged from r47721, branches/header-work/include/ddk/newdev.h trunk/reactos/include/psdk/ntddchgr.h - copied, changed from r47721, trunk/reactos/include/ddk/ntddchgr.h trunk/reactos/include/psdk/ntddmou.h - copied, changed from r47721, trunk/reactos/include/ddk/ntddmou.h trunk/reactos/include/psdk/ntddstor.h - copied, changed from r47721, trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/psdk/winddi.h - copied unchanged from r47721, trunk/reactos/include/ddk/winddi.h trunk/reactos/include/psdk/winddiui.h - copied, changed from r47721, trunk/reactos/include/ddk/winddiui.h trunk/reactos/include/psdk/winsplp.h (with props) trunk/reactos/include/psdk/ws2bth.h - copied unchanged from r47721, branches/header-work/include/psdk/ws2bth.h trunk/reactos/include/psdk/wsipv6ok.h - copied unchanged from r47721, branches/header-work/include/psdk/wsipv6ok.h trunk/reactos/include/psdk/wspiapi.h - copied unchanged from r47721, branches/header-work/include/psdk/wspiapi.h trunk/reactos/include/reactos/wine/ddk/ (props changed) - copied from r47721, branches/header-work/include/reactos/wine/ddk/ trunk/reactos/include/xdk/ccfuncs.h - copied unchanged from r47721, branches/header-work/include/xdk/ccfuncs.h trunk/reactos/include/xdk/cctypes.h - copied unchanged from r47721, branches/header-work/include/xdk/cctypes.h trunk/reactos/include/xdk/devioctl.template.h - copied unchanged from r47721, branches/header-work/include/xdk/devioctl.template.h trunk/reactos/include/xdk/fsrtlfuncs.h - copied unchanged from r47721, branches/header-work/include/xdk/fsrtlfuncs.h trunk/reactos/include/xdk/fsrtltypes.h - copied unchanged from r47721, branches/header-work/include/xdk/fsrtltypes.h trunk/reactos/include/xdk/ntifs.template.h - copied unchanged from r47721, branches/header-work/include/xdk/ntifs.template.h Removed: trunk/reactos/include/ddk/compstui.h trunk/reactos/include/ddk/devioctl.h trunk/reactos/include/ddk/kcom.h trunk/reactos/include/ddk/ksdebug.h trunk/reactos/include/ddk/ksuuids.h trunk/reactos/include/ddk/lmon.h trunk/reactos/include/ddk/nettypes.h trunk/reactos/include/ddk/newdev.h trunk/reactos/include/ddk/ntddchgr.h trunk/reactos/include/ddk/ntddmou.h trunk/reactos/include/ddk/ntddstor.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/ddk/winddiui.h trunk/reactos/include/ddk/winsplp.h trunk/reactos/include/ddk/wmlib.h trunk/reactos/include/psdk/dciddi.h Modified: trunk/reactos/ (props changed) trunk/reactos/base/applications/network/netstat/netstat.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/boot/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c (contents, props changed) trunk/reactos/boot/freeldr/freeldr/freeldr.c (contents, props changed) trunk/reactos/dll/win32/advapi32/misc/trace.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h trunk/reactos/dll/win32/rpcrt4/unix_func.h trunk/reactos/dll/win32/version/resource.c trunk/reactos/dll/win32/ws2_32/misc/async.c trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild trunk/reactos/drivers/base/kdcom/arm/kdbg.c trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/drivers/battery/battc/battc.h trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vga/vgamp.c trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/wmi/wmilib.c trunk/reactos/hal/hal.pspec trunk/reactos/include/crt/mingw32/intrin_arm.h trunk/reactos/include/ddk/atm.h trunk/reactos/include/ddk/csq.h trunk/reactos/include/ddk/d4drvif.h trunk/reactos/include/ddk/d4iface.h trunk/reactos/include/ddk/dderror.h trunk/reactos/include/ddk/dxapi.h trunk/reactos/include/ddk/fltsafe.h trunk/reactos/include/ddk/kbdmou.h trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/mountdev.h trunk/reactos/include/ddk/mountmgr.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ndisguid.h trunk/reactos/include/ddk/ndiswan.h trunk/reactos/include/ddk/netpnp.h trunk/reactos/include/ddk/ntagp.h trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/scsi.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/ws2san.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/psdk/batclass.h trunk/reactos/include/psdk/evntrace.h trunk/reactos/include/psdk/in6addr.h trunk/reactos/include/psdk/inaddr.h trunk/reactos/include/psdk/iptypes.h trunk/reactos/include/psdk/mswsock.h trunk/reactos/include/psdk/nspapi.h trunk/reactos/include/psdk/ntddkbd.h trunk/reactos/include/psdk/qos.h trunk/reactos/include/psdk/winioctl.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winsock.h trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/winspool.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/psdk/ws2def.h trunk/reactos/include/psdk/ws2ipdef.h trunk/reactos/include/psdk/ws2spi.h trunk/reactos/include/psdk/ws2tcpip.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/include/reactos/wine/dcetypes.idl trunk/reactos/include/xdk/amd64/ke.h trunk/reactos/include/xdk/cmfuncs.h trunk/reactos/include/xdk/cmtypes.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/extypes.h trunk/reactos/include/xdk/generate.bat trunk/reactos/include/xdk/halfuncs.h trunk/reactos/include/xdk/haltypes.h trunk/reactos/include/xdk/iofuncs.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/include/xdk/mmtypes.h trunk/reactos/include/xdk/ntddk.template.h trunk/reactos/include/xdk/obfuncs.h trunk/reactos/include/xdk/obtypes.h trunk/reactos/include/xdk/pofuncs.h trunk/reactos/include/xdk/potypes.h trunk/reactos/include/xdk/psfuncs.h trunk/reactos/include/xdk/pstypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/sefuncs.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/wdm.template.h trunk/reactos/include/xdk/zwfuncs.h trunk/reactos/lib/3rdparty/libxml2/config.h trunk/reactos/ntoskrnl/ex/fastinterlck.c trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… Modified: trunk/reactos/boot/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr.rbuil… Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… Modified: trunk/reactos/dll/win32/rpcrt4/unix_func.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/unix_func… Modified: trunk/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/resource… Modified: trunk/reactos/dll/win32/ws2_32/misc/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/asyn… Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… Modified: trunk/reactos/drivers/base/kdcom/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/arm/kdb… Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… Modified: trunk/reactos/drivers/battery/battc/battc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… Modified: trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vmx… Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… Modified: trunk/reactos/drivers/wmi/wmilib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.c?rev=4… Modified: trunk/reactos/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.pspec?rev=47727&r1… Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… Modified: trunk/reactos/include/ddk/atm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atm.h?rev=4772… Removed: trunk/reactos/include/ddk/compstui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/compstui.h?rev… Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=4772… Modified: trunk/reactos/include/ddk/d4drvif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d4drvif.h?rev=… Modified: trunk/reactos/include/ddk/d4iface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d4iface.h?rev=… Modified: trunk/reactos/include/ddk/dderror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dderror.h?rev=… Removed: trunk/reactos/include/ddk/devioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/devioctl.h?rev… Modified: trunk/reactos/include/ddk/dxapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dxapi.h?rev=47… Modified: trunk/reactos/include/ddk/fltsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltsafe.h?rev=… Modified: trunk/reactos/include/ddk/kbdmou.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kbdmou.h?rev=4… Removed: trunk/reactos/include/ddk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kcom.h?rev=477… Removed: trunk/reactos/include/ddk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ksdebug.h?rev=… Removed: trunk/reactos/include/ddk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ksuuids.h?rev=… Removed: trunk/reactos/include/ddk/lmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/lmon.h?rev=477… Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… Modified: trunk/reactos/include/ddk/mountdev.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mountdev.h?rev… Modified: trunk/reactos/include/ddk/mountmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mountmgr.h?rev… Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=477… Modified: trunk/reactos/include/ddk/ndisguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndisguid.h?rev… Modified: trunk/reactos/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndiswan.h?rev=… Modified: trunk/reactos/include/ddk/netpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/netpnp.h?rev=4… Removed: trunk/reactos/include/ddk/nettypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/nettypes.h?rev… Removed: trunk/reactos/include/ddk/newdev.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/newdev.h?rev=4… Modified: trunk/reactos/include/ddk/ntagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntagp.h?rev=47… Removed: trunk/reactos/include/ddk/ntddchgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddchgr.h?rev… Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=47… Removed: trunk/reactos/include/ddk/ntddmou.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddmou.h?rev=… Removed: trunk/reactos/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=47… Modified: trunk/reactos/include/ddk/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsi.h?rev=477… Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4772… Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=47… Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4772… Removed: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=4… Removed: trunk/reactos/include/ddk/winddiui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddiui.h?rev… Removed: trunk/reactos/include/ddk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winsplp.h?rev=… Removed: trunk/reactos/include/ddk/wmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wmlib.h?rev=47… Modified: trunk/reactos/include/ddk/ws2san.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ws2san.h?rev=4… Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… Added: trunk/reactos/include/psdk/compstui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/compstui.h?re… Removed: trunk/reactos/include/psdk/dciddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dciddi.h?rev=… Copied: trunk/reactos/include/psdk/devioctl.h (from r47721, trunk/reactos/include/ddk/devioctl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devioctl.h?p2… Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… Modified: trunk/reactos/include/psdk/in6addr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/in6addr.h?rev… Modified: trunk/reactos/include/psdk/inaddr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/inaddr.h?rev=… Modified: trunk/reactos/include/psdk/iptypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iptypes.h?rev… Copied: trunk/reactos/include/psdk/kcom.h (from r47721, trunk/reactos/include/ddk/kcom.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?p2=tru… Copied: trunk/reactos/include/psdk/ksdebug.h (from r47721, trunk/reactos/include/ddk/ksdebug.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksdebug.h?p2=… Copied: trunk/reactos/include/psdk/ksuuids.h (from r47721, trunk/reactos/include/ddk/ksuuids.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksuuids.h?p2=… Copied: trunk/reactos/include/psdk/lmon.h (from r47721, trunk/reactos/include/ddk/lmon.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmon.h?p2=tru… Modified: trunk/reactos/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mswsock.h?rev… Copied: trunk/reactos/include/psdk/nettypes.h (from r47721, trunk/reactos/include/ddk/nettypes.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/nettypes.h?p2… Modified: trunk/reactos/include/psdk/nspapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/nspapi.h?rev=… Copied: trunk/reactos/include/psdk/ntddchgr.h (from r47721, trunk/reactos/include/ddk/ntddchgr.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddchgr.h?p2… Modified: trunk/reactos/include/psdk/ntddkbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddkbd.h?rev… Copied: trunk/reactos/include/psdk/ntddmou.h (from r47721, trunk/reactos/include/ddk/ntddmou.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddmou.h?p2=… Copied: trunk/reactos/include/psdk/ntddstor.h (from r47721, trunk/reactos/include/ddk/ntddstor.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddstor.h?p2… Modified: trunk/reactos/include/psdk/qos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/qos.h?rev=477… Copied: trunk/reactos/include/psdk/winddiui.h (from r47721, trunk/reactos/include/ddk/winddiui.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddiui.h?p2… Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… Modified: trunk/reactos/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock.h?rev… Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?re… Added: trunk/reactos/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsplp.h?rev… Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Modified: trunk/reactos/include/psdk/ws2def.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2def.h?rev=… Modified: trunk/reactos/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2ipdef.h?re… Modified: trunk/reactos/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2spi.h?rev=… Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… Modified: trunk/reactos/include/reactos/wine/dcetypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dcety… Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… Modified: trunk/reactos/include/xdk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cmfuncs.h?rev=… Modified: trunk/reactos/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cmtypes.h?rev=… Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… Modified: trunk/reactos/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/extypes.h?rev=… Modified: trunk/reactos/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/generate.bat?r… Modified: trunk/reactos/include/xdk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/halfuncs.h?rev… Modified: trunk/reactos/include/xdk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/haltypes.h?rev… Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… Modified: trunk/reactos/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmtypes.h?rev=… Modified: trunk/reactos/include/xdk/ntddk.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntddk.template… Modified: trunk/reactos/include/xdk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obfuncs.h?rev=… Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=… Modified: trunk/reactos/include/xdk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pofuncs.h?rev=… Modified: trunk/reactos/include/xdk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/potypes.h?rev=… Modified: trunk/reactos/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=… Modified: trunk/reactos/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pstypes.h?rev=… Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev… Modified: trunk/reactos/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sefuncs.h?rev=… Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=… Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… Modified: trunk/reactos/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/zwfuncs.h?rev=… Modified: trunk/reactos/lib/3rdparty/libxml2/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r…

1 0

[cgutman] 47726: [ACPI] - Store the interrupt data as the vector and level - Fixes resource conflict issues
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 22:15:17 2010 New Revision: 47726 URL: http://svn.reactos.org/svn/reactos?rev=47726&view=rev Log: [ACPI] - Store the interrupt data as the vector and level - Fixes resource conflict issues Modified: trunk/reactos/drivers/bus/acpi/buspdo.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Wed Jun 9 22:15:17 2010 @@ -744,8 +744,8 @@ (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - ResourceDescriptor->u.Interrupt.Level = irq_data->Interrupts[i]; - ResourceDescriptor->u.Interrupt.Vector = 0; + ResourceDescriptor->u.Interrupt.Level = + ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); ResourceDescriptor++; @@ -763,8 +763,8 @@ (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = (irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); - ResourceDescriptor->u.Interrupt.Level = irq_data->Interrupts[i]; - ResourceDescriptor->u.Interrupt.Vector = 0; + ResourceDescriptor->u.Interrupt.Level = + ResourceDescriptor->u.Interrupt.Vector = irq_data->Interrupts[i]; ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); ResourceDescriptor++;

1 0

[cgutman] 47725: [NTOSKRNL] - Set the resource list pointer to NULL after we free it - Fixes a double-free issue in the resource conflict resolution code
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 21:53:42 2010 New Revision: 47725 URL: http://svn.reactos.org/svn/reactos?rev=47725&view=rev Log: [NTOSKRNL] - Set the resource list pointer to NULL after we free it - Fixes a double-free issue in the resource conflict resolution code Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Wed Jun 9 21:53:42 2010 @@ -243,6 +243,7 @@ if (ReqDesc->Option == 0) { ExFreePool(*ResourceList); + *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } } @@ -258,6 +259,7 @@ if (ReqDesc->Option == 0) { ExFreePool(*ResourceList); + *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } } @@ -273,6 +275,7 @@ if (ReqDesc->Option == 0) { ExFreePool(*ResourceList); + *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } } @@ -288,6 +291,7 @@ if (ReqDesc->Option == 0) { ExFreePool(*ResourceList); + *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } } @@ -302,6 +306,7 @@ if (ReqDesc->Option == 0) { ExFreePool(*ResourceList); + *ResourceList = NULL; return STATUS_CONFLICTING_ADDRESSES; } } @@ -852,6 +857,7 @@ { DPRINT1("Boot resources for %wZ cause a resource conflict!\n", &DeviceNode->InstancePath); ExFreePool(DeviceNode->ResourceList); + DeviceNode->ResourceList = NULL; } }

1 0

[tkreuzer] 47724: [WIN32K] - Improve readability in SetBMIColor - Only when BitCount is <= 8, calculate the number of colors in the table - Fixes a crash with VBox driver
by tkreuzer＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: tkreuzer Date: Wed Jun 9 20:36:04 2010 New Revision: 47724 URL: http://svn.reactos.org/svn/reactos?rev=47724&view=rev Log: [WIN32K] - Improve readability in SetBMIColor - Only when BitCount is <= 8, calculate the number of colors in the table - Fixes a crash with VBox driver 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] Wed Jun 9 20:36:04 2010 @@ -1746,13 +1746,16 @@ VOID SetBMIColor(CONST BITMAPINFO* pbmi, DWORD* color, INT i) { + PVOID pvColors = ((PBYTE)pbmi + pbmi->bmiHeader.biSize); if(pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - *(RGBTRIPLE*)((PBYTE)pbmi + pbmi->bmiHeader.biSize + i*sizeof(RGBTRIPLE)) = *(RGBTRIPLE*)color; + RGBTRIPLE *pColor = pvColors; + pColor[i] = *(RGBTRIPLE*)color; } else { - *(RGBQUAD*)((PBYTE)pbmi + pbmi->bmiHeader.biSize + i*sizeof(RGBQUAD)) = *(RGBQUAD*)color; + RGBQUAD *pColor = pvColors; + pColor[i] = *(RGBQUAD*)color; } } @@ -1954,7 +1957,7 @@ ULONG cColorsUsed; cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; - if (cColorsUsed == 0) + if (cColorsUsed == 0 && pbmiSrc->bmiHeader.bV5BitCount <= 8) cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); if(dwColorUse == DIB_PAL_COLORS)

1 0

[cgutman] 47723: [PCI] - Implement IRP_MN_REMOVE_DEVICE handling for FDOs
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 20:12:27 2010 New Revision: 47723 URL: http://svn.reactos.org/svn/reactos?rev=47723&view=rev Log: [PCI] - Implement IRP_MN_REMOVE_DEVICE handling for FDOs Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Wed Jun 9 20:12:27 2010 @@ -551,10 +551,6 @@ case IRP_MN_QUERY_STOP_DEVICE: Status = STATUS_NOT_IMPLEMENTED; break; - - case IRP_MN_REMOVE_DEVICE: - Status = STATUS_NOT_IMPLEMENTED; - break; #endif case IRP_MN_START_DEVICE: DPRINT("IRP_MN_START_DEVICE received\n"); @@ -579,7 +575,14 @@ case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("IRP_MN_REMOVE_DEVICE is UNIMPLEMENTED!\n"); + /* Detach the device object from the device stack */ + IoDetachDevice(DeviceExtension->Ldo); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + + /* Return success */ + Status = STATUS_SUCCESS; break; default: DPRINT1("Unknown IOCTL 0x%lx\n", IrpSp->MinorFunction);

1 0

[cgutman] 47722: [NTOSKRNL] - Implement IRP_MN_REMOVE_DEVICE handling for PnP root PDOs
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 20:04:39 2010 New Revision: 47722 URL: http://svn.reactos.org/svn/reactos?rev=47722&view=rev Log: [NTOSKRNL] - Implement IRP_MN_REMOVE_DEVICE handling for PnP root PDOs Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Wed Jun 9 20:04:39 2010 @@ -1027,10 +1027,12 @@ IN PIRP Irp) { PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + PPNPROOT_FDO_DEVICE_EXTENSION FdoDeviceExtension; PIO_STACK_LOCATION IrpSp; NTSTATUS Status; DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1070,7 +1072,32 @@ break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("IRP_MN_REMOVE_DEVICE is UNIMPLEMENTED!\n"); + /* Remove the device from the device list and decrement the device count*/ + KeAcquireGuardedMutex(&FdoDeviceExtension->DeviceListLock); + RemoveEntryList(&DeviceExtension->DeviceInfo->ListEntry); + FdoDeviceExtension->DeviceListCount--; + KeReleaseGuardedMutex(&FdoDeviceExtension->DeviceListLock); + + /* Free some strings we created */ + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->DeviceDescription); + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->DeviceID); + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->InstanceID); + + /* Free the resource requirements list */ + if (DeviceExtension->DeviceInfo->ResourceRequirementsList != NULL) + ExFreePool(DeviceExtension->DeviceInfo->ResourceRequirementsList); + + /* Free the boot resources list */ + if (DeviceExtension->DeviceInfo->ResourceList != NULL) + ExFreePool(DeviceExtension->DeviceInfo->ResourceList); + + /* Free the device info */ + ExFreePool(DeviceExtension->DeviceInfo); + + /* Finally, delete the device object */ + IoDeleteDevice(DeviceObject); + + /* Return success */ Status = STATUS_SUCCESS; break;

1 0

[akhaldi] 47721: Sync uo to HEAD (r47720).
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 18:58:14 2010 New Revision: 47721 URL: http://svn.reactos.org/svn/reactos?rev=47721&view=rev Log: Sync uo to HEAD (r47720). Modified: branches/header-work/ (props changed) branches/header-work/Makefile branches/header-work/dll/win32/comctl32/pager.c branches/header-work/dll/win32/comctl32/propsheet.c branches/header-work/dll/win32/comctl32/rebar.c branches/header-work/dll/win32/comctl32/status.c branches/header-work/dll/win32/comctl32/string.c branches/header-work/dll/win32/comctl32/syslink.c branches/header-work/dll/win32/comctl32/tab.c branches/header-work/dll/win32/comctl32/theme_combo.c branches/header-work/dll/win32/comctl32/toolbar.c branches/header-work/dll/win32/comctl32/tooltips.c branches/header-work/dll/win32/comctl32/trackbar.c branches/header-work/dll/win32/comctl32/treeview.c branches/header-work/dll/win32/comctl32/updown.c branches/header-work/drivers/ksfilter/ks/api.c branches/header-work/drivers/ksfilter/ks/connectivity.c branches/header-work/drivers/ksfilter/ks/event.c branches/header-work/drivers/ksfilter/ks/image.c branches/header-work/drivers/ksfilter/ks/irp.c branches/header-work/drivers/ksfilter/ks/misc.c branches/header-work/drivers/ksfilter/ks/pin.c branches/header-work/drivers/ksfilter/ks/topology.c branches/header-work/drivers/wdm/audio/backpln/portcls/irp.cpp branches/header-work/lib/drivers/ip/transport/tcp/tcp.c branches/header-work/lib/drivers/sound/mmixer/controls.c branches/header-work/lib/drivers/sound/mmixer/mixer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/Makefile URL: http://svn.reactos.org/svn/reactos/branches/header-work/Makefile?rev=47721&… Modified: branches/header-work/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/b… Modified: branches/header-work/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/ip/tran… Modified: branches/header-work/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/sound/m… Modified: branches/header-work/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/sound/m…

1 0

[akhaldi] 47720: - Add some header guards.
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 18:30:37 2010 New Revision: 47720 URL: http://svn.reactos.org/svn/reactos?rev=47720&view=rev Log: - Add some header guards. Modified: branches/header-work/include/ddk/csq.h branches/header-work/include/ddk/d4drvif.h branches/header-work/include/ddk/d4iface.h branches/header-work/include/ddk/kbdmou.h branches/header-work/include/ddk/video.h branches/header-work/include/ddk/videoagp.h branches/header-work/include/ddk/ws2san.h branches/header-work/include/psdk/evntrace.h branches/header-work/include/psdk/mswsock.h Modified: branches/header-work/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/csq.h?r… ============================================================================== --- branches/header-work/include/ddk/csq.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/csq.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -54,7 +54,7 @@ #pragma once -#define _REACTOS_CSQ_H +#define _CSQ_H_ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/d4drvif.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4drvif… ============================================================================== --- branches/header-work/include/ddk/d4drvif.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4drvif.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _DOT4DRVIF_H #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/d4iface.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4iface… ============================================================================== --- branches/header-work/include/ddk/d4iface.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4iface.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -1,4 +1,6 @@ #pragma once + +#define _DOT4_IFACE_H #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/kbdmou.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/kbdmou.… ============================================================================== --- branches/header-work/include/ddk/kbdmou.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/kbdmou.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _KBDMOU_ #include <ntddkbd.h> #include <ntddmou.h> Modified: branches/header-work/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/video.h… ============================================================================== --- branches/header-work/include/ddk/video.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/video.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define __VIDEO_H__ #include "ntddvdeo.h" #include "videoagp.h" Modified: branches/header-work/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/videoag… ============================================================================== --- branches/header-work/include/ddk/videoagp.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/videoagp.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define __VIDEOAGP_H__ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/ws2san.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ws2san.… ============================================================================== --- branches/header-work/include/ddk/ws2san.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ws2san.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _WS2SAN_H_ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/evntra… ============================================================================== --- branches/header-work/include/psdk/evntrace.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/evntrace.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -1,4 +1,6 @@ #pragma once + +#define _EVNTRACE_ #ifndef WMIAPI #ifndef MIDL_PASS Modified: branches/header-work/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/mswsoc… ============================================================================== --- branches/header-work/include/psdk/mswsock.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/mswsock.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -10,6 +10,8 @@ */ #pragma once + +#define _MSWSOCK_ #ifdef __cplusplus extern "C" {

1 0

[tkreuzer] 47719: [WIN32K] If pbmiSrc->bmiHeader.bV5ClrUsed is 0, calculate the number of colors from the bit depth. Fixes black taskbar icons with vbox driver on 8 bpp
by tkreuzer＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: tkreuzer Date: Wed Jun 9 18:08:23 2010 New Revision: 47719 URL: http://svn.reactos.org/svn/reactos?rev=47719&view=rev Log: [WIN32K] If pbmiSrc->bmiHeader.bV5ClrUsed is 0, calculate the number of colors from the bit depth. Fixes black taskbar icons with vbox driver on 8 bpp 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] Wed Jun 9 18:08:23 2010 @@ -1951,15 +1951,21 @@ else { INT i; + ULONG cColorsUsed; + + cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; + if (cColorsUsed == 0) + cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); + if(dwColorUse == DIB_PAL_COLORS) { RtlCopyMemory(pbmiDst->bmiColors, pbmiSrc->bmiColors, - pbmiSrc->bmiHeader.bV5ClrUsed * sizeof(WORD)); + cColorsUsed * sizeof(WORD)); } else { - for(i = 0; i < pbmiSrc->bmiHeader.bV5ClrUsed; i++) + for(i = 0; i < cColorsUsed; i++) { SetBMIColor(pbmiDst, (DWORD*)pbmiSrc->bmiColors + i, i); }

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