Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[akhaldi] 46158: [PSDK] Move NTSTATUS codes from DDK to PSDK, removing all the duplicated ones (and adding a couple of missing ones). Dedicated to arty
by akhaldi＠svn.reactos.org 13 Mar '10

13 Mar '10

Author: akhaldi Date: Sat Mar 13 02:18:58 2010 New Revision: 46158 URL: http://svn.reactos.org/svn/reactos?rev=46158&view=rev Log: [PSDK] Move NTSTATUS codes from DDK to PSDK, removing all the duplicated ones (and adding a couple of missing ones). Dedicated to arty Removed: branches/header-work/include/ddk/ntstatus.h Modified: branches/header-work/include/psdk/ntstatus.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/header-work/include/ddk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntstatu… Modified: branches/header-work/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntstat…

1 0

[tkreuzer] 46157: [HEADERS] Say hello to the "XDK" (preliminary name). A set of headers from wich certain other headers (wdm, ntifs, ntddk, winnt) shall one day be autogenerated. I added a .bat file that autogenerates wdn.h from wdm.template.h and the headers. Others will follow.
by tkreuzer＠svn.reactos.org 13 Mar '10

13 Mar '10

Author: tkreuzer Date: Sat Mar 13 01:34:48 2010 New Revision: 46157 URL: http://svn.reactos.org/svn/reactos?rev=46157&view=rev Log: [HEADERS] Say hello to the "XDK" (preliminary name). A set of headers from wich certain other headers (wdm, ntifs, ntddk, winnt) shall one day be autogenerated. I added a .bat file that autogenerates wdn.h from wdm.template.h and the headers. Others will follow. Added: branches/header-work/include/xdk/ (with props) branches/header-work/include/xdk/amd64/ (with props) branches/header-work/include/xdk/amd64/ke.h (with props) branches/header-work/include/xdk/arm/ (with props) branches/header-work/include/xdk/arm/ke.h (with props) branches/header-work/include/xdk/cmfuncs.h (with props) branches/header-work/include/xdk/cmtypes.h (with props) branches/header-work/include/xdk/exfuncs.h (with props) branches/header-work/include/xdk/extypes.h (with props) branches/header-work/include/xdk/generate.bat (with props) branches/header-work/include/xdk/halfuncs.h (with props) branches/header-work/include/xdk/ia64/ (with props) branches/header-work/include/xdk/ia64/ke.h (with props) branches/header-work/include/xdk/interlocked.h (with props) branches/header-work/include/xdk/iofuncs.h (with props) branches/header-work/include/xdk/iotypes.h (with props) branches/header-work/include/xdk/kdfuncs.h (with props) branches/header-work/include/xdk/kefuncs.h (with props) branches/header-work/include/xdk/ketypes.h (with props) branches/header-work/include/xdk/mips/ (with props) branches/header-work/include/xdk/mips/ke.h (with props) branches/header-work/include/xdk/mmfuncs.h (with props) branches/header-work/include/xdk/mmtypes.h (with props) branches/header-work/include/xdk/nttmapi.h (with props) branches/header-work/include/xdk/obfuncs.h (with props) branches/header-work/include/xdk/obtypes.h (with props) branches/header-work/include/xdk/pofuncs.h (with props) branches/header-work/include/xdk/potypes.h (with props) branches/header-work/include/xdk/ppc/ (with props) branches/header-work/include/xdk/ppc/ke.h (with props) branches/header-work/include/xdk/psfuncs.h (with props) branches/header-work/include/xdk/pstypes.h (with props) branches/header-work/include/xdk/rtlfuncs.h (with props) branches/header-work/include/xdk/rtltypes.h (with props) branches/header-work/include/xdk/sefuncs.h (with props) branches/header-work/include/xdk/setypes.h (with props) branches/header-work/include/xdk/wdm.template.h (with props) branches/header-work/include/xdk/wmifuncs.h (with props) branches/header-work/include/xdk/x86/ (with props) branches/header-work/include/xdk/x86/ke.h (with props) branches/header-work/include/xdk/zwfuncs.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/header-work/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/k… Added: branches/header-work/include/xdk/arm/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/arm/ke.… Added: branches/header-work/include/xdk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmfuncs… Added: branches/header-work/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmtypes… Added: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… Added: branches/header-work/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes… Added: branches/header-work/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/generat… Added: branches/header-work/include/xdk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/halfunc… Added: branches/header-work/include/xdk/ia64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ia64/ke… Added: branches/header-work/include/xdk/interlocked.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/interlo… Added: branches/header-work/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs… Added: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… Added: branches/header-work/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/kdfuncs… Added: branches/header-work/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/kefuncs… Added: branches/header-work/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ketypes… Added: branches/header-work/include/xdk/mips/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mips/ke… Added: branches/header-work/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmfuncs… Added: branches/header-work/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmtypes… Added: branches/header-work/include/xdk/nttmapi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/nttmapi… Added: branches/header-work/include/xdk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/obfuncs… Added: branches/header-work/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/obtypes… Added: branches/header-work/include/xdk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/pofuncs… Added: branches/header-work/include/xdk/potypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/potypes… Added: branches/header-work/include/xdk/ppc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ppc/ke.… Added: branches/header-work/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/psfuncs… Added: branches/header-work/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/pstypes… Added: branches/header-work/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtlfunc… Added: branches/header-work/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtltype… Added: branches/header-work/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/sefuncs… Added: branches/header-work/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/setypes… Added: branches/header-work/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/wdm.tem… Added: branches/header-work/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/wmifunc… Added: branches/header-work/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/x86/ke.… Added: branches/header-work/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/zwfuncs…

1 0

[tkreuzer] 46156: [KMTEST] Try to fix rostests build
by tkreuzer＠svn.reactos.org 13 Mar '10

13 Mar '10

Author: tkreuzer Date: Sat Mar 13 01:01:01 2010 New Revision: 46156 URL: http://svn.reactos.org/svn/reactos?rev=46156&view=rev Log: [KMTEST] Try to fix rostests build Modified: trunk/rostests/drivers/kmtest/deviface_test.c Modified: trunk/rostests/drivers/kmtest/deviface_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/deviface_t… ============================================================================== --- trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/deviface_test.c [iso-8859-1] Sat Mar 13 01:01:01 2010 @@ -22,7 +22,7 @@ /* INCLUDES *******************************************************************/ -#include <ddk/ntddk.h> +#include <ddk/ntifs.h> #include <ndk/iotypes.h> #include "kmtest.h"

1 0

[tkreuzer] 46155: [HEADERS] Reintegrate header-work branch. Thanks to hours of boring work on the ddk headers (Most of it done by Amine Khaldi), we have now a decent set, which is still incomplete but already relatively close to latest WDK. A clean rebuild is recommended.
by tkreuzer＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: tkreuzer Date: Sat Mar 13 00:16:29 2010 New Revision: 46155 URL: http://svn.reactos.org/svn/reactos?rev=46155&view=rev Log: [HEADERS] Reintegrate header-work branch. Thanks to hours of boring work on the ddk headers (Most of it done by Amine Khaldi), we have now a decent set, which is still incomplete but already relatively close to latest WDK. A clean rebuild is recommended. Added: trunk/reactos/include/ddk/hubbusif.h - copied unchanged from r46153, branches/header-work/include/ddk/hubbusif.h trunk/reactos/include/ddk/usbbusif.h - copied unchanged from r46153, branches/header-work/include/ddk/usbbusif.h trunk/reactos/include/ddk/usbdrivr.h - copied unchanged from r46153, branches/header-work/include/ddk/usbdrivr.h trunk/reactos/include/ddk/usbprotocoldefs.h - copied unchanged from r46153, branches/header-work/include/ddk/usbprotocoldefs.h trunk/reactos/include/ddk/usbstorioctl.h - copied unchanged from r46153, branches/header-work/include/ddk/usbstorioctl.h trunk/reactos/include/ddk/wmlib.h - copied unchanged from r46153, branches/header-work/include/ddk/wmlib.h trunk/reactos/include/psdk/dpfilter.h - copied unchanged from r46153, branches/header-work/include/psdk/dpfilter.h trunk/reactos/include/psdk/ktmtypes.h - copied unchanged from r46153, branches/header-work/include/psdk/ktmtypes.h trunk/reactos/include/psdk/ntddkbd.h - copied unchanged from r46153, branches/header-work/include/psdk/ntddkbd.h trunk/reactos/include/psdk/ntdef.h - copied unchanged from r46153, branches/header-work/include/psdk/ntdef.h trunk/reactos/include/psdk/usb.h - copied unchanged from r46153, branches/header-work/include/psdk/usb.h trunk/reactos/include/psdk/usb100.h - copied unchanged from r46153, branches/header-work/include/psdk/usb100.h trunk/reactos/include/psdk/usb200.h - copied unchanged from r46153, branches/header-work/include/psdk/usb200.h trunk/reactos/include/psdk/usbcamdi.h - copied unchanged from r46153, branches/header-work/include/psdk/usbcamdi.h trunk/reactos/include/psdk/usbdi.h - copied unchanged from r46153, branches/header-work/include/psdk/usbdi.h trunk/reactos/include/psdk/usbioctl.h - copied unchanged from r46153, branches/header-work/include/psdk/usbioctl.h trunk/reactos/include/psdk/usbiodef.h - copied unchanged from r46153, branches/header-work/include/psdk/usbiodef.h trunk/reactos/include/psdk/usbrpmif.h - copied unchanged from r46153, branches/header-work/include/psdk/usbrpmif.h trunk/reactos/include/psdk/usbuser.h - copied unchanged from r46153, branches/header-work/include/psdk/usbuser.h Removed: trunk/reactos/include/ddk/ntddkbd.h trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/usb.h trunk/reactos/include/ddk/usb100.h trunk/reactos/include/ddk/usb200.h trunk/reactos/include/ddk/usbcamdi.h trunk/reactos/include/ddk/usbdi.h trunk/reactos/include/ddk/usbioctl.h trunk/reactos/include/ddk/usbiodef.h trunk/reactos/include/ddk/usbuser.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/ (props changed) trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h trunk/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) trunk/reactos/dll/directx/d3d8/d3d8.spec (props changed) trunk/reactos/dll/directx/dsound_new/classfactory.c (props changed) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) trunk/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) trunk/reactos/dll/directx/dsound_new/regsvr.c (props changed) trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed) trunk/reactos/dll/shellext/slayer/slayer.spec (props changed) trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/drivers/base/beep/beep.c trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/battery/battc/battc.h trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/wmi/wmilib.c trunk/reactos/hal/halppc/generic/fmutex.c trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/hal/halx86/hal.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/hal_generic_mp.rbuild trunk/reactos/hal/halx86/hal_generic_up.rbuild trunk/reactos/hal/halx86/halmps.rbuild trunk/reactos/hal/halx86/halxbox.rbuild trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/excpt.h trunk/reactos/include/crt/fpieee.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/rtcapi.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdint.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/tchar.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/crt/yvals.h trunk/reactos/include/ddk/bdasup.h trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/ddk/d3dnthal.h trunk/reactos/include/ddk/ddkmapi.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/ddrawint.h trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/ddk/ide.h trunk/reactos/include/ddk/minitape.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntdddisk.h trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/ddk/strmini.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/usbdlib.h trunk/reactos/include/ddk/usbkern.h trunk/reactos/include/ddk/usbprint.h trunk/reactos/include/ddk/usbscan.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/ndk/cmtypes.h trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/ifssupp.h trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/batclass.h trunk/reactos/include/psdk/sdkddkver.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winternl.h trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/ntoskrnl/ke/eventobj.c trunk/reactos/ntoskrnl/ke/except.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ntoskrnl.pspec trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/tools/hpp/hpp.c trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym.mak (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed) trunk/reactos/tools/tools.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=46… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… 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.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… 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/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… 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/halppc/generic/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/fmutex.… Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… Modified: trunk/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=… Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… Modified: trunk/reactos/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.… Modified: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.… Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=4… Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=46… Modified: trunk/reactos/include/crt/fpieee.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fpieee.h?rev=4… Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=46155… Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=461… Modified: trunk/reactos/include/crt/rtcapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/rtcapi.h?rev=4… Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=4… Modified: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=4… Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=46… Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=46… Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=461… Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=4… Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=46… Modified: trunk/reactos/include/crt/yvals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/yvals.h?rev=46… Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=4… Modified: trunk/reactos/include/ddk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dnthal.h?rev… Modified: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=4… Modified: trunk/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawint.h?rev… Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… Modified: trunk/reactos/include/ddk/ide.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ide.h?rev=4615… Modified: trunk/reactos/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/minitape.h?rev… Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=461… Modified: trunk/reactos/include/ddk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev… Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… Removed: trunk/reactos/include/ddk/ntddkbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddkbd.h?rev=… Removed: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=46… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=46… Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=4… Modified: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… Removed: trunk/reactos/include/ddk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usb.h?rev=4615… Removed: trunk/reactos/include/ddk/usb100.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usb100.h?rev=4… Removed: trunk/reactos/include/ddk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usb200.h?rev=4… Removed: trunk/reactos/include/ddk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbcamdi.h?rev… Removed: trunk/reactos/include/ddk/usbdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbdi.h?rev=46… Modified: trunk/reactos/include/ddk/usbdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbdlib.h?rev=… Removed: trunk/reactos/include/ddk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbioctl.h?rev… Removed: trunk/reactos/include/ddk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbiodef.h?rev… Modified: trunk/reactos/include/ddk/usbkern.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbkern.h?rev=… Modified: trunk/reactos/include/ddk/usbprint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbprint.h?rev… Modified: trunk/reactos/include/ddk/usbscan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbscan.h?rev=… Removed: trunk/reactos/include/ddk/usbuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbuser.h?rev=… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4615… Removed: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… Modified: trunk/reactos/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ifssupp.h?rev=… Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… 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/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=46155&r1… Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… Modified: trunk/reactos/ntoskrnl/ke/eventobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/eventobj.c?rev… Modified: trunk/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/except.c?rev=4… Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=461… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=46155&… Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=461…

1 0

[cgutman] 46154: - Handle ACPI_RESOURCE_TYPE_ADDRESS16, ACPI_RESOURCE_TYPE_ADDRESS32, ACPI_RESOURCE_TYPE_ADDRESS64, ACPI_RESOURCE_TYPE_MEMORY24, and ACPI_RESOURCE_TYPE_MEMORY32 for IRP_MN_QUERY_RESOURCES and IRP_MN_QUERY_RESOURCE_REQUIREMENTS
by cgutman＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: cgutman Date: Sat Mar 13 00:00:18 2010 New Revision: 46154 URL: http://svn.reactos.org/svn/reactos?rev=46154&view=rev Log: - Handle ACPI_RESOURCE_TYPE_ADDRESS16, ACPI_RESOURCE_TYPE_ADDRESS32, ACPI_RESOURCE_TYPE_ADDRESS64, ACPI_RESOURCE_TYPE_MEMORY24, and ACPI_RESOURCE_TYPE_MEMORY32 for IRP_MN_QUERY_RESOURCES and IRP_MN_QUERY_RESOURCE_REQUIREMENTS 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] Sat Mar 13 00:00:18 2010 @@ -633,6 +633,11 @@ NumberOfResources += dma_data->ChannelCount; break; } + case ACPI_RESOURCE_TYPE_ADDRESS16: + case ACPI_RESOURCE_TYPE_ADDRESS32: + case ACPI_RESOURCE_TYPE_ADDRESS64: + case ACPI_RESOURCE_TYPE_MEMORY24: + case ACPI_RESOURCE_TYPE_MEMORY32: case ACPI_RESOURCE_TYPE_IO: { NumberOfResources++; @@ -725,9 +730,167 @@ ResourceDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; else ResourceDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = io_data->Minimum; + ResourceDescriptor->u.Port.Start.QuadPart = io_data->Minimum; ResourceDescriptor->u.Port.Length = io_data->AddressLength; + + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + { + ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; + if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = addr16_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr16_data->AddressLength; + } + else if (addr16_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr16_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr16_data->Minimum; + ResourceDescriptor->u.Port.Length = addr16_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr16_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr16_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr16_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS32: + { + ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; + if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = addr32_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr32_data->AddressLength; + } + else if (addr32_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr32_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr32_data->Minimum; + ResourceDescriptor->u.Port.Length = addr32_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr32_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr32_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr32_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + ResourceDescriptor->Type = CmResourceTypeBusNumber; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.BusNumber.Start = (ULONG)addr64_data->Minimum; + ResourceDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + ResourceDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + ResourceDescriptor->u.Port.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; + ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + { + ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_MEMORY_24; + if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = mem24_data->Minimum; + ResourceDescriptor->u.Memory.Length = mem24_data->AddressLength; + + ResourceDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY32: + { + ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; + ResourceDescriptor->Type = CmResourceTypeMemory; + ResourceDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + ResourceDescriptor->Flags = 0; + if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + ResourceDescriptor->u.Memory.Start.QuadPart = mem32_data->Minimum; + ResourceDescriptor->u.Memory.Length = mem32_data->AddressLength; ResourceDescriptor++; break; @@ -815,6 +978,11 @@ NumberOfResources += dma_data->ChannelCount; break; } + case ACPI_RESOURCE_TYPE_ADDRESS16: + case ACPI_RESOURCE_TYPE_ADDRESS32: + case ACPI_RESOURCE_TYPE_ADDRESS64: + case ACPI_RESOURCE_TYPE_MEMORY24: + case ACPI_RESOURCE_TYPE_MEMORY32: case ACPI_RESOURCE_TYPE_IO: { NumberOfResources++; @@ -905,15 +1073,188 @@ RequirementDescriptor->Flags |= CM_RESOURCE_PORT_16_BIT_DECODE; else RequirementDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; - RequirementDescriptor->u.Port.Length = io_data->AddressLength; - RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; RequirementDescriptor->Type = CmResourceTypePort; RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; RequirementDescriptor->u.Port.Alignment = io_data->Alignment; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum; RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum; + + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS16: + { + ACPI_RESOURCE_ADDRESS16 *addr16_data = (ACPI_RESOURCE_ADDRESS16*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr16_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = addr16_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr16_data->Maximum; + RequirementDescriptor->u.BusNumber.Length = addr16_data->AddressLength; + } + else if (addr16_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr16_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr16_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr16_data->Maximum; + RequirementDescriptor->u.Port.Length = addr16_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr16_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr16_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr16_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr16_data->Maximum; + RequirementDescriptor->u.Memory.Length = addr16_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS32: + { + ACPI_RESOURCE_ADDRESS32 *addr32_data = (ACPI_RESOURCE_ADDRESS32*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr32_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = addr32_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr32_data->Maximum; + RequirementDescriptor->u.BusNumber.Length = addr32_data->AddressLength; + } + else if (addr32_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr32_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr32_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr32_data->Maximum; + RequirementDescriptor->u.Port.Length = addr32_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr32_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr32_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr32_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr32_data->Maximum; + RequirementDescriptor->u.Memory.Length = addr32_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_ADDRESS64: + { + ACPI_RESOURCE_ADDRESS64 *addr64_data = (ACPI_RESOURCE_ADDRESS64*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + if (addr64_data->ResourceType == ACPI_BUS_NUMBER_RANGE) + { + DPRINT1("64-bit bus address is not supported!\n"); + RequirementDescriptor->Type = CmResourceTypeBusNumber; + RequirementDescriptor->ShareDisposition = CmResourceShareShared; + RequirementDescriptor->Flags = 0; + RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum; + RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; + } + else if (addr64_data->ResourceType == ACPI_IO_RANGE) + { + RequirementDescriptor->Type = CmResourceTypePort; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_PORT_IO; + if (addr64_data->Decode == ACPI_POS_DECODE) + RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; + RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; + } + else + { + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (addr64_data->Info.Mem.WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + switch (addr64_data->Info.Mem.Caching) + { + case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; + case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; + case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; + } + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; + } + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY24: + { + ACPI_RESOURCE_MEMORY24 *mem24_data = (ACPI_RESOURCE_MEMORY24*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = CM_RESOURCE_MEMORY_24; + if (mem24_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem24_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem24_data->Maximum; + RequirementDescriptor->u.Memory.Length = mem24_data->AddressLength; + + RequirementDescriptor++; + break; + } + case ACPI_RESOURCE_TYPE_MEMORY32: + { + ACPI_RESOURCE_MEMORY32 *mem32_data = (ACPI_RESOURCE_MEMORY32*) &resource->Data; + RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED; + RequirementDescriptor->Type = CmResourceTypeMemory; + RequirementDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + RequirementDescriptor->Flags = 0; + if (mem32_data->WriteProtect == ACPI_READ_ONLY_MEMORY) + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_ONLY; + else + RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; + RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem32_data->Minimum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem32_data->Maximum; + RequirementDescriptor->u.Memory.Length = mem32_data->AddressLength; RequirementDescriptor++; break;

1 0

[tkreuzer] 46153: Merge trunk HEAD (46152)
by tkreuzer＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: tkreuzer Date: Fri Mar 12 22:42:11 2010 New Revision: 46153 URL: http://svn.reactos.org/svn/reactos?rev=46153&view=rev Log: Merge trunk HEAD (46152) Modified: branches/header-work/ (props changed) branches/header-work/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/header-work/dll/directx/d3d8/d3d8.spec (props changed) branches/header-work/dll/directx/dsound_new/classfactory.c (props changed) branches/header-work/dll/directx/dsound_new/dsound.spec (props changed) branches/header-work/dll/directx/dsound_new/dsound_convert.c (props changed) branches/header-work/dll/directx/dsound_new/regsvr.c (props changed) branches/header-work/dll/shellext/devcpux/devcpux.spec (props changed) branches/header-work/dll/shellext/slayer/slayer.spec (props changed) branches/header-work/include/ndk/amd64/ (props changed) branches/header-work/include/ndk/amd64/asmmacro.S (props changed) branches/header-work/lib/sdk/crt/time/ (props changed) branches/header-work/ntoskrnl/kdbg/ (props changed) branches/header-work/subsystems/win32/win32k/include/engobjects.h (props changed) branches/header-work/tools/rsym/rsym.c (props changed) branches/header-work/tools/rsym/rsym.h (props changed) branches/header-work/tools/rsym/rsym.mak (props changed) branches/header-work/tools/rsym/rsym_common.c (props changed) Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:45691-46147 +/trunk/reactos:45691-46152 Propchange: branches/header-work/dll/directx/bdaplgin/classfactory.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/classfactory.cpp:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/directx/bdaplgin/classfactory.cpp:45691-46152 Propchange: branches/header-work/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:45691-46152 Propchange: branches/header-work/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,2 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:45691-46152 Propchange: branches/header-work/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,2 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:45691-46152 Propchange: branches/header-work/dll/directx/dsound_new/dsound_convert.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound_convert.c:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/directx/dsound_new/dsound_convert.c:45691-46152 Propchange: branches/header-work/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,2 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:45691-46152 Propchange: branches/header-work/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:45691-46152 Propchange: branches/header-work/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/shellext/slayer/slayer.spec:45691-46152 Propchange: branches/header-work/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 +/trunk/reactos/include/ndk/amd64:45691-46152 Propchange: branches/header-work/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 +/trunk/reactos/include/ndk/amd64/asmmacro.S:45691-46152 Propchange: branches/header-work/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,3 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 +/trunk/reactos/lib/sdk/crt/time:45691-46152 /trunk/reactos/lib/sdk/crt/time_new:39350-42241 Propchange: branches/header-work/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36013,36172,36332,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38099,38148-38151,38264-38265,38268,38355,39151,39160,39333,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/ntoskrnl/kdbg:45691-46152 Propchange: branches/header-work/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40095,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:45691-46152 Propchange: branches/header-work/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/tools/rsym/rsym.c:45691-46152 Propchange: branches/header-work/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/tools/rsym/rsym.h:45691-46152 Propchange: branches/header-work/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/tools/rsym/rsym.mak:45691-46152 Propchange: branches/header-work/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 22:42:11 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/tools/rsym/rsym_common.c:45691-46152

1 0

[spetreolle] 46152: Add missing files.
by spetreolle＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: spetreolle Date: Fri Mar 12 22:31:52 2010 New Revision: 46152 URL: http://svn.reactos.org/svn/reactos?rev=46152&view=rev Log: Add missing files. Added: branches/arty-newcc/include/reactos/asm.h (with props) branches/arty-newcc/tools/pipetools/pipetools.mak (with props) Added: branches/arty-newcc/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/asm.… ============================================================================== --- branches/arty-newcc/include/reactos/asm.h (added) +++ branches/arty-newcc/include/reactos/asm.h [iso-8859-1] Fri Mar 12 22:31:52 2010 @@ -1,0 +1,190 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/amd64/asmmacro.S + * PURPOSE: ASM macros for for GAS and MASM/ML64 + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#ifdef _USE_ML + +/* Allow ".name" identifiers */ +OPTION DOTNAME + +.586 +.MODEL FLAT + +/* Hex numbers need to be in 01ABh format */ +#define HEX(x) 0##x##h + +/* Macro values need to be marked */ +#define VAL(x) x + +/* MASM/ML doesn't want explicit [rip] addressing */ +rip = 0 + +/* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ +#define MACRO(name, ...) name MACRO __VA_ARGS__ + +/* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ +.PROC MACRO name + name PROC FRAME + _name: +ENDM + +/* ... and .ENDP, replacing ENDP */ +.ENDP MACRO name + name ENDP +ENDM + +/* MASM doesn't have an ASCII macro */ +.ASCII MACRO text + DB text +ENDM + +/* MASM doesn't have an ASCIZ macro */ +.ASCIZ MACRO text + DB text, 0 +ENDM + +.text MACRO +ENDM + +.code64 MACRO + .code +ENDM + +.code32 MACRO + .code +ENDM + +UNIMPLEMENTED MACRO name +ENDM + +/* We need this to distinguish repeat from macros */ +#define ENDR ENDM + +#else /***********************************************************************/ + +/* Force intel syntax */ +.intel_syntax noprefix +.code64 + +.altmacro + +/* Hex numbers need to be in 0x1AB format */ +#define HEX(x) 0x##x + +/* Macro values need to be marked */ +#define VAL(x) \x + +/* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ +#define MACRO(...) .macro __VA_ARGS__ +#define ENDM .endm + +/* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ +.macro .PROC name + .func \name + \name: + .cfi_startproc + .equ cfa_current_offset, -8 +.endm + +/* ... and .ENDP, replacing ENDP */ +.macro .ENDP name + .cfi_endproc + .endfunc +.endm + +/* MASM compatible PUBLIC */ +.macro PUBLIC symbol + .global \symbol +.endm + +/* MASM compatible ALIGN */ +#define ALIGN .align + +/* MASM compatible REPEAT, additional ENDR */ +#define REPEAT .rept +#define ENDR .endr + +/* MASM compatible EXTERN */ +.macro EXTERN name +.endm + +/* MASM needs an END tag */ +#define END + +.macro .MODEL model +.endm + +.macro .code + .text +.endm + +/* Macros for x64 stack unwind OPs */ + +.macro .allocstack size + .cfi_adjust_cfa_offset \size + .set cfa_current_offset, cfa_current_offset - \size +.endm + +code = 1 +.macro .pushframe param=0 + .if (\param) + .cfi_adjust_cfa_offset 0x30 + .set cfa_current_offset, cfa_current_offset - 0x30 + .else + .cfi_adjust_cfa_offset 0x28 + .set cfa_current_offset, cfa_current_offset - 0x28 + .endif +.endm + +.macro .pushreg reg + .cfi_adjust_cfa_offset 8 + .equ cfa_current_offset, cfa_current_offset - 8 + .cfi_offset \reg, cfa_current_offset +.endm + +.macro .savereg reg, offset + // checkme!!! + .cfi_offset \reg, \offset +.endm + +.macro .savexmm128 reg, offset + // checkme!!! + .cfi_offset \reg, \offset +.endm + +.macro .setframe reg, offset + .cfi_def_cfa reg, \offset + .equ cfa_current_offset, \offset +.endm + +.macro .endprolog +.endm + +.macro UNIMPLEMENTED2 file, line, func + + jmp 3f +1: .asciz "\func" +2: .asciz \file +3: + sub rsp, 0x20 + lea rcx, MsgUnimplemented[rip] + lea rdx, 1b[rip] + lea r8, 2b[rip] + mov r9, \line + call DbgPrint + add rsp, 0x20 +.endm +#define UNIMPLEMENTED UNIMPLEMENTED2 __FILE__, __LINE__, + +/* MASM/ML uses ".if" for runtime conditionals, and "if" for compile time + conditionals. We therefore use "if", too. .if shouldn't be used at all */ +#define if .if +#define endif .endif +#define else .else +#define elseif .elseif + +#endif Propchange: branches/arty-newcc/include/reactos/asm.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arty-newcc/tools/pipetools/pipetools.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/pipetools/pipe… ============================================================================== --- branches/arty-newcc/tools/pipetools/pipetools.mak (added) +++ branches/arty-newcc/tools/pipetools/pipetools.mak [iso-8859-1] Fri Mar 12 22:31:52 2010 @@ -1,0 +1,47 @@ +PIPETOOLS_BASE = $(TOOLS_BASE)$(SEP)pipetools +PIPETOOLS_BASE_ = $(PIPETOOLS_BASE)$(SEP) +PIPETOOLS_INT = $(INTERMEDIATE_)$(PIPETOOLS_BASE) +PIPETOOLS_INT_ = $(PIPETOOLS_INT)$(SEP) +PIPETOOLS_OUT = $(OUTPUT_)$(PIPETOOLS_BASE) +PIPETOOLS_OUT_ = $(PIPETOOLS_OUT)$(SEP) + +$(PIPETOOLS_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(PIPETOOLS_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + + +PIPETOOLS_TARGET = \ + $(PIPETOOLS_OUT_)piperead$(EXEPOSTFIX) + +PIPETOOLS_SOURCES = \ + $(PIPETOOLS_BASE_)piperead.cpp + +PIPETOOLS_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(PIPETOOLS_SOURCES:.cpp=.o)) + +PIPETOOLS_HOST_CFLAGS = $(TOOLS_CFLAGS) + +PIPETOOLS_HOST_LFLAGS = $(TOOLS_LFLAGS) + +.PHONY: pipetools +pipetools: $(PIPETOOLS_TARGET) + +$(PIPETOOLS_TARGET): $(PIPETOOLS_OBJECTS) | $(PIPETOOLS_OUT) + $(ECHO_HOSTLD) + ${host_gcc} $(PIPETOOLS_OBJECTS) $(PIPETOOLS_HOST_LFLAGS) -o $@ + +$(PIPETOOLS_INT_)piperead.o: $(PIPETOOLS_BASE_)piperead.cpp | $(PIPETOOLS_INT) + $(ECHO_HOSTCC) + ${host_gcc} $(PIPETOOLS_HOST_CFLAGS) -c $< -o $@ + + +.PHONY: pipetools_clean +pipetools_clean: + -@$(rm) $(PIPETOOLS_TARGET) $(PIPETOOLS_OBJECTS) 2>$(NUL) +clean: pipetools_clean Propchange: branches/arty-newcc/tools/pipetools/pipetools.mak ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 46151: Revert 45697: "* Disable compiling usermode components for now."
by tkreuzer＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: tkreuzer Date: Fri Mar 12 22:28:06 2010 New Revision: 46151 URL: http://svn.reactos.org/svn/reactos?rev=46151&view=rev Log: Revert 45697: "* Disable compiling usermode components for now." Modified: branches/header-work/ReactOS-i386.rbuild branches/header-work/config.template.rbuild branches/header-work/drivers/wdm/audio/backpln/directory.rbuild branches/header-work/lib/3rdparty/3rdparty.rbuild branches/header-work/lib/3rdparty/mingw/mingw.rbuild branches/header-work/lib/tdilib/tdilib.rbuild branches/header-work/subsystems/subsystems.rbuild branches/header-work/subsystems/win32/win32.rbuild Modified: branches/header-work/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/ReactOS-i386.rbuild… ============================================================================== --- branches/header-work/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/header-work/ReactOS-i386.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -37,17 +37,14 @@ <linkerflag>-section-alignment=0x1000</linkerflag> </group> - <if property="USERMODE" value="1"> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - </if> - + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> </directory> <directory name="drivers"> <xi:include href="drivers/drivers.rbuild" /> Modified: branches/header-work/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/config.template.rbu… ============================================================================== --- branches/header-work/config.template.rbuild [iso-8859-1] (original) +++ branches/header-work/config.template.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -99,10 +99,4 @@ --> <property name="BUILD_MP" value="1" /> - -<property name="USERMODE" value="0" /> - </group> Modified: branches/header-work/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/b… ============================================================================== --- branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -1,12 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - - <if property="USERMODE" value="1"> - <directory name="audio_test"> - <xi:include href="audio_test/audio_test.rbuild" /> - </directory> - </if> + <directory name="audio_test"> + <xi:include href="audio_test/audio_test.rbuild" /> + </directory> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory> Modified: branches/header-work/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/3rdpar… ============================================================================== --- branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -7,13 +7,9 @@ <directory name="bzip2"> <xi:include href="bzip2/bzip2.rbuild" /> </directory> - - <if property="USERMODE" value="1"> - <directory name="cardlib"> - <xi:include href="cardlib/cardlib.rbuild" /> - </directory> - </if> - + <directory name="cardlib"> + <xi:include href="cardlib/cardlib.rbuild" /> + </directory> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> </directory> Modified: branches/header-work/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/mingw/… ============================================================================== --- branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -4,9 +4,7 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> - <if property="USERMODE" value="1"> - <library>kernel32</library> - </if> + <library>kernel32</library> <file>_newmode.c</file> <file>atonexit.c</file> <file>charmax.c</file> Modified: branches/header-work/lib/tdilib/tdilib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/tdilib/tdilib.r… ============================================================================== --- branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] (original) +++ branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<if property="USERMODE" value="1"> - <module name="tdilib" type="staticlibrary"> - <include base="iphlpapi">.</include> - <include base="tdilib">.</include> - <library>ntdll</library> - <file>enum.c</file> - <file>handle.c</file> - </module> -</if> +<module name="tdilib" type="staticlibrary"> + <include base="iphlpapi">.</include> + <include base="tdilib">.</include> + <library>ntdll</library> + <file>enum.c</file> + <file>handle.c</file> +</module> Modified: branches/header-work/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/subsyste… ============================================================================== --- branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<if property="USERMODE" value="1"> - <directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> - </directory> -</if> +<directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.rbuild" /> +</directory> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory> Modified: branches/header-work/subsystems/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi… ============================================================================== --- branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] (original) +++ branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<if property="USERMODE" value="1"> - <directory name="csrss"> - <xi:include href="csrss/csrss.rbuild" /> - </directory> -</if> +<directory name="csrss"> + <xi:include href="csrss/csrss.rbuild" /> +</directory> <directory name="win32k"> <xi:include href="win32k/win32k.rbuild" /> </directory>

1 0

[spetreolle] 46150: Sync build system.
by spetreolle＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: spetreolle Date: Fri Mar 12 22:22:04 2010 New Revision: 46150 URL: http://svn.reactos.org/svn/reactos?rev=46150&view=rev Log: Sync build system. Added: branches/arty-newcc/tools/log2lines/ branches/arty-newcc/tools/log2lines/cache.c (with props) branches/arty-newcc/tools/log2lines/cache.h (with props) branches/arty-newcc/tools/log2lines/cmd.c (with props) branches/arty-newcc/tools/log2lines/cmd.h (with props) branches/arty-newcc/tools/log2lines/compat.h (with props) branches/arty-newcc/tools/log2lines/config.h (with props) branches/arty-newcc/tools/log2lines/help.c (with props) branches/arty-newcc/tools/log2lines/help.h (with props) branches/arty-newcc/tools/log2lines/image.c (with props) branches/arty-newcc/tools/log2lines/image.h (with props) branches/arty-newcc/tools/log2lines/list.c (with props) branches/arty-newcc/tools/log2lines/list.h (with props) branches/arty-newcc/tools/log2lines/log2lines.c (with props) branches/arty-newcc/tools/log2lines/log2lines.h (with props) branches/arty-newcc/tools/log2lines/log2lines.mak (with props) branches/arty-newcc/tools/log2lines/options.c (with props) branches/arty-newcc/tools/log2lines/options.h (with props) branches/arty-newcc/tools/log2lines/revision.c (with props) branches/arty-newcc/tools/log2lines/revision.h (with props) branches/arty-newcc/tools/log2lines/stat.c (with props) branches/arty-newcc/tools/log2lines/stat.h (with props) branches/arty-newcc/tools/log2lines/util.c (with props) branches/arty-newcc/tools/log2lines/util.h (with props) branches/arty-newcc/tools/log2lines/version.h (with props) branches/arty-newcc/tools/rbuild/backend/msvc/s_as_mscpp.rules branches/arty-newcc/tools/rbuild/backend/msvc/spec.rules branches/arty-newcc/tools/rbuild/backend/msvc/vspropsmaker.cpp (with props) Modified: branches/arty-newcc/Makefile branches/arty-newcc/ReactOS-arm.rbuild branches/arty-newcc/ReactOS-generic.rbuild branches/arty-newcc/ReactOS-i386.rbuild branches/arty-newcc/config-arm.template.rbuild branches/arty-newcc/tools/rbuild/backend/backend.h branches/arty-newcc/tools/rbuild/backend/codeblocks/codeblocks.h branches/arty-newcc/tools/rbuild/backend/dependencymap/dependencymap.h branches/arty-newcc/tools/rbuild/backend/mingw/compilers/gcc.mak branches/arty-newcc/tools/rbuild/backend/mingw/linkers/ld.mak branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp branches/arty-newcc/tools/rbuild/backend/mingw/mingw.h branches/arty-newcc/tools/rbuild/backend/mingw/modulehandler.cpp branches/arty-newcc/tools/rbuild/backend/mingw/modulehandler.h branches/arty-newcc/tools/rbuild/backend/mingw/rule.h branches/arty-newcc/tools/rbuild/backend/mingw/rules.mak branches/arty-newcc/tools/rbuild/backend/msbuild/msbuild.h branches/arty-newcc/tools/rbuild/backend/msvc/msvc.cpp branches/arty-newcc/tools/rbuild/backend/msvc/msvc.h branches/arty-newcc/tools/rbuild/backend/msvc/vcprojmaker.cpp branches/arty-newcc/tools/rbuild/backend/versionreport/versionreport.h branches/arty-newcc/tools/rbuild/exception.h branches/arty-newcc/tools/rbuild/module.cpp branches/arty-newcc/tools/rbuild/pch.h branches/arty-newcc/tools/rbuild/project.cpp branches/arty-newcc/tools/rbuild/rbuild.cpp branches/arty-newcc/tools/rbuild/rbuild.h branches/arty-newcc/tools/rbuild/rbuild.mak branches/arty-newcc/tools/rbuild/rbuild.vcproj branches/arty-newcc/tools/rbuild/test.h branches/arty-newcc/tools/tools.mak [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/Makefile URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/Makefile?rev=46150&r… Modified: branches/arty-newcc/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-arm.rbuild?r… Modified: branches/arty-newcc/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-generic.rbui… Modified: branches/arty-newcc/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ReactOS-i386.rbuild?… Modified: branches/arty-newcc/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/config-arm.template.… Added: branches/arty-newcc/tools/log2lines/cache.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/cach… Added: branches/arty-newcc/tools/log2lines/cache.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/cach… Added: branches/arty-newcc/tools/log2lines/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/cmd.… Added: branches/arty-newcc/tools/log2lines/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/cmd.… Added: branches/arty-newcc/tools/log2lines/compat.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/comp… Added: branches/arty-newcc/tools/log2lines/config.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/conf… Added: branches/arty-newcc/tools/log2lines/help.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/help… Added: branches/arty-newcc/tools/log2lines/help.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/help… Added: branches/arty-newcc/tools/log2lines/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/imag… Added: branches/arty-newcc/tools/log2lines/image.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/imag… Added: branches/arty-newcc/tools/log2lines/list.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/list… Added: branches/arty-newcc/tools/log2lines/list.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/list… Added: branches/arty-newcc/tools/log2lines/log2lines.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/log2… Added: branches/arty-newcc/tools/log2lines/log2lines.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/log2… Added: branches/arty-newcc/tools/log2lines/log2lines.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/log2… Added: branches/arty-newcc/tools/log2lines/options.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/opti… Added: branches/arty-newcc/tools/log2lines/options.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/opti… Added: branches/arty-newcc/tools/log2lines/revision.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/revi… Added: branches/arty-newcc/tools/log2lines/revision.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/revi… Added: branches/arty-newcc/tools/log2lines/stat.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/stat… Added: branches/arty-newcc/tools/log2lines/stat.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/stat… Added: branches/arty-newcc/tools/log2lines/util.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/util… Added: branches/arty-newcc/tools/log2lines/util.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/util… Added: branches/arty-newcc/tools/log2lines/version.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/log2lines/vers… Modified: branches/arty-newcc/tools/rbuild/backend/backend.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/dependencymap/dependencymap.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/rule.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/msbuild/msbuild.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/msvc/msvc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Added: branches/arty-newcc/tools/rbuild/backend/msvc/s_as_mscpp.rules URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Added: branches/arty-newcc/tools/rbuild/backend/msvc/spec.rules URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Added: branches/arty-newcc/tools/rbuild/backend/msvc/vspropsmaker.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/backend/versionreport/versionreport.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… Modified: branches/arty-newcc/tools/rbuild/exception.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/excepti… Modified: branches/arty-newcc/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/module.… Modified: branches/arty-newcc/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/pch.h?r… Modified: branches/arty-newcc/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/project… Modified: branches/arty-newcc/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/rbuild.… Modified: branches/arty-newcc/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/rbuild.… Modified: branches/arty-newcc/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/rbuild.… Modified: branches/arty-newcc/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/rbuild.… Modified: branches/arty-newcc/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/test.h?… Modified: branches/arty-newcc/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/tools.mak?rev=…

1 0

[akhaldi] 46149: Leftover from the sync
by akhaldi＠svn.reactos.org 12 Mar '10

12 Mar '10

Author: akhaldi Date: Fri Mar 12 21:13:38 2010 New Revision: 46149 URL: http://svn.reactos.org/svn/reactos?rev=46149&view=rev Log: Leftover from the sync Modified: branches/header-work/ (props changed) Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 12 21:13:38 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:45691-46019,46021-46023 +/trunk/reactos:45691-46147

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010