Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[tkreuzer] 46469: [HAL] Fix rbuild files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 26 17:03:03 2010 New Revision: 46469 URL: http://svn.reactos.org/svn/reactos?rev=46469&view=rev Log: [HAL] Fix rbuild files Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Fri Mar 26 17:03:03 2010 @@ -28,23 +28,16 @@ <file>timer.c</file> <file>usage.c</file> <if property="ARCH" value="i386"> + <file>bios.c</file> <directory name="i386"> <file>portio.c</file> <file>systimer.S</file> - <if property="ARCH" value="i386"> - <file>bios.c</file> - <file>halinit.c</file> - <file>misc.c</file> - <file>pic.c</file> <file>trap.S</file> - <directory name="i386"> - <file>portio.c</file> - <file>systimer.S</file> - <file>v86.s</file> </directory> </if> <if property="ARCH" value="amd64"> <directory name="amd64"> + <file>x86bios.c</file> <file>halinit.c</file> <file>irq.S</file> <file>misc.c</file> @@ -81,6 +74,7 @@ <file>sysbus.c</file> </directory> <file>beep.c</file> + <file>bios.c</file> <file>cmos.c</file> <file>dma.c</file> <file>display.c</file> @@ -106,7 +100,7 @@ <file>apic.c</file> <file>systimer.S</file> <file>usage.c</file> - </directory> + </directory> </if> </directory> <directory name="up"> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Fri Mar 26 17:03:03 2010 @@ -13,11 +13,5 @@ <file>pic.c</file> <file>processor.c</file> </directory> - <directory name="up"> - <file>processor.c</file> - <if property="ARCH" value="i386"> - <file>irq.S</file> - </if> - </directory> </module> </group>

14 years, 9 months

[tkreuzer] 46468: Merge trunk head (46467)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 26 16:47:53 2010 New Revision: 46468 URL: http://svn.reactos.org/svn/reactos?rev=46468&view=rev Log: Merge trunk head (46467) Added: branches/ros-amd64-bringup/reactos/dll/nls/idndl/idndl.spec - copied unchanged from r46467, trunk/reactos/dll/nls/idndl/idndl.spec branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/ - copied from r46467, trunk/reactos/drivers/bus/acpi/compbatt/ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/eval.c - copied unchanged from r46467, trunk/reactos/drivers/bus/acpi/eval.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/trap.S - copied unchanged from r46465, trunk/reactos/hal/halx86/generic/i386/trap.S branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/mpsirql.c - copied unchanged from r46465, trunk/reactos/hal/halx86/mp/i386/mpsirql.c branches/ros-amd64-bringup/reactos/hal/halx86/up/pic.c - copied unchanged from r46467, trunk/reactos/hal/halx86/up/pic.c branches/ros-amd64-bringup/reactos/include/ddk/mce.h - copied unchanged from r46466, trunk/reactos/include/ddk/mce.h branches/ros-amd64-bringup/reactos/include/dxsdk/bdatif.idl - copied unchanged from r46467, trunk/reactos/include/dxsdk/bdatif.idl branches/ros-amd64-bringup/reactos/include/psdk/atsmedia.h - copied unchanged from r46466, trunk/reactos/include/psdk/atsmedia.h branches/ros-amd64-bringup/reactos/include/psdk/cfg.h - copied unchanged from r46466, trunk/reactos/include/psdk/cfg.h branches/ros-amd64-bringup/reactos/include/psdk/cfgmgr32.h - copied unchanged from r46466, trunk/reactos/include/psdk/cfgmgr32.h branches/ros-amd64-bringup/reactos/include/psdk/devpropdef.h - copied unchanged from r46466, trunk/reactos/include/psdk/devpropdef.h branches/ros-amd64-bringup/reactos/include/psdk/evntprov.h - copied unchanged from r46466, trunk/reactos/include/psdk/evntprov.h branches/ros-amd64-bringup/reactos/include/psdk/tvout.h - copied unchanged from r46466, trunk/reactos/include/psdk/tvout.h branches/ros-amd64-bringup/reactos/include/xdk/ (props changed) - copied from r46467, trunk/reactos/include/xdk/ Removed: branches/ros-amd64-bringup/reactos/dll/nls/idndl/idndl.def branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/v86.s branches/ros-amd64-bringup/reactos/hal/halx86/generic/pic.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/trap.S branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c branches/ros-amd64-bringup/reactos/include/ddk/atsmedia.h branches/ros-amd64-bringup/reactos/include/ddk/cfg.h branches/ros-amd64-bringup/reactos/include/ddk/cfgmgr32.h branches/ros-amd64-bringup/reactos/include/ddk/ntstatus.h branches/ros-amd64-bringup/reactos/include/ddk/tvout.h branches/ros-amd64-bringup/reactos/include/ddk/xmldsodid.h branches/ros-amd64-bringup/reactos/include/reactos/wine/cfgmgr32.h Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild branches/ros-amd64-bringup/reactos/base/applications/downloader/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/fontview/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/winver/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/ (props changed) branches/ros-amd64-bringup/reactos/base/services/telnetd/ (props changed) branches/ros-amd64-bringup/reactos/boot/bootdata/bootcd/bootcd.rbuild branches/ros-amd64-bringup/reactos/boot/bootdata/livecd/livecd.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/scsiport.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/controlnode.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/devicecontrol.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/digitaldemo.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/frequencyfilter.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/lnbinfo.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/pincontrol.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/precomp.h branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/signalstatistics.cpp branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/allocator.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/basicaudio.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/clockforward.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/cvpconfig.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/cvpvbiconfig.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/datatype.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enum_mediatypes.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enumpins.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/input_pin.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/interface.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/mediasample.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/node.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/output_pin.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/precomp.h branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/proxy.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/qualityforward.cpp branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec (props changed) branches/ros-amd64-bringup/reactos/dll/nls/idndl/idndl.rbuild branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-amd64-bringup/reactos/dll/win32/acledit/acledit.c branches/ros-amd64-bringup/reactos/dll/win32/acledit/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/browseui/internettoolbar.cpp branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/hid/precomp.h branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/fiber.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi_private.h branches/ros-amd64-bringup/reactos/drivers/battery/battc/battc.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpi.rbuild branches/ros-amd64-bringup/reactos/drivers/bus/acpi/busmgr/bus.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/busmgr/button.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/buspdo.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/acpi_bus.h branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/acpisys.h branches/ros-amd64-bringup/reactos/drivers/bus/acpi/main.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/osl.c branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/dxapi_driver.h branches/ros-amd64-bringup/reactos/drivers/directx/dxg/dxg_int.h branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/inc/ext2fsd.h branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/serial/serial/serial.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/atapi.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/bsmaster.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/config.h branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_ata.cpp branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/srb.h branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/vgaddi.h branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ (props changed) branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S branches/ros-amd64-bringup/reactos/hal/halx86/generic/misc.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/spinlock.c branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h (props changed) branches/ros-amd64-bringup/reactos/include/ddk/acpiioct.h branches/ros-amd64-bringup/reactos/include/dxsdk/dxsdk.rbuild branches/ros-amd64-bringup/reactos/include/ndk/amd64/ (props changed) branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h branches/ros-amd64-bringup/reactos/include/psdk/batclass.h branches/ros-amd64-bringup/reactos/include/psdk/ntdef.h branches/ros-amd64-bringup/reactos/include/psdk/ntstatus.h branches/ros-amd64-bringup/reactos/include/psdk/usbioctl.h branches/ros-amd64-bringup/reactos/include/psdk/winbase.h branches/ros-amd64-bringup/reactos/include/psdk/wincon.h branches/ros-amd64-bringup/reactos/include/psdk/windef.h branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h branches/ros-amd64-bringup/reactos/include/psdk/winuser.h branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl branches/ros-amd64-bringup/reactos/include/xdk/amd64/ (props changed) branches/ros-amd64-bringup/reactos/include/xdk/arm/ (props changed) branches/ros-amd64-bringup/reactos/include/xdk/ia64/ (props changed) branches/ros-amd64-bringup/reactos/include/xdk/mips/ (props changed) branches/ros-amd64-bringup/reactos/include/xdk/ppc/ (props changed) branches/ros-amd64-bringup/reactos/include/xdk/x86/ (props changed) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ (props changed) branches/ros-amd64-bringup/reactos/media/inf/cpu.inf branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmalloc.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/cm_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/ (props changed) branches/ros-amd64-bringup/reactos/ntoskrnl/po/events.c branches/ros-amd64-bringup/reactos/ntoskrnl/po/power.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdibatch.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/pch.h branches/ros-amd64-bringup/reactos/tools/ (props changed) branches/ros-amd64-bringup/reactos/tools/hpp/ (props changed) branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak branches/ros-amd64-bringup/reactos/tools/rbuild_helper/ (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/livecd/livecd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/controlnode.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/allocator.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/basicaudio.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/clockforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/cvpconfig.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/cvpvbiconfig.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enum_mediatypes.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enumpins.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/mediasample.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/node.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/proxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/qualityforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Removed: branches/ros-amd64-bringup/reactos/dll/nls/idndl/idndl.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/nls/idndl/idndl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/v86.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Removed: branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/tvout.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/ddk/xmldsodid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

14 years, 9 months

[dreimer] 46467: Generalize some lines to be used for a whole bunch of models. Reduced size about 10kb that way. As long as we don't have a CPU driver I will keep it that way its now, because now it at least shows a approximate CPU Title in Devmgr.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Mar 26 15:57:35 2010 New Revision: 46467 URL: http://svn.reactos.org/svn/reactos?rev=46467&view=rev Log: Generalize some lines to be used for a whole bunch of models. Reduced size about 10kb that way. As long as we don't have a CPU driver I will keep it that way its now, because now it at least shows a approximate CPU Title in Devmgr. Modified: trunk/reactos/media/inf/cpu.inf Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4646… ============================================================================== Binary files - no diff available.

14 years, 9 months

[tkreuzer] 46466: Reintegrate header branch - DDKAPI -> NTAPI - delete duplicate definitions - move files to right locations - Fix Mm64BitPhysicalAddress definition - Add a number of missing definitions - add XDK

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 26 14:50:02 2010 New Revision: 46466 URL: http://svn.reactos.org/svn/reactos?rev=46466&view=rev Log: Reintegrate header branch - DDKAPI -> NTAPI - delete duplicate definitions - move files to right locations - Fix Mm64BitPhysicalAddress definition - Add a number of missing definitions - add XDK Added: trunk/reactos/include/ddk/mce.h - copied unchanged from r46463, branches/header-work/include/ddk/mce.h trunk/reactos/include/psdk/atsmedia.h - copied unchanged from r46463, branches/header-work/include/psdk/atsmedia.h trunk/reactos/include/psdk/cfg.h - copied unchanged from r46463, branches/header-work/include/psdk/cfg.h trunk/reactos/include/psdk/cfgmgr32.h - copied unchanged from r46463, branches/header-work/include/psdk/cfgmgr32.h trunk/reactos/include/psdk/devpropdef.h - copied unchanged from r46463, branches/header-work/include/psdk/devpropdef.h trunk/reactos/include/psdk/evntprov.h - copied unchanged from r46463, branches/header-work/include/psdk/evntprov.h trunk/reactos/include/psdk/ntiologc.h - copied unchanged from r46463, branches/header-work/include/psdk/ntiologc.h trunk/reactos/include/psdk/ntstatus.h - copied unchanged from r46463, branches/header-work/include/psdk/ntstatus.h trunk/reactos/include/psdk/tvout.h - copied unchanged from r46463, branches/header-work/include/psdk/tvout.h trunk/reactos/include/xdk/ (props changed) - copied from r46463, branches/header-work/include/xdk/ Removed: trunk/reactos/include/ddk/atsmedia.h trunk/reactos/include/ddk/cfg.h trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/ddk/tvout.h trunk/reactos/include/ddk/xmldsodid.h trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/ (props changed) trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c 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/gdi32/objects/bitmap.c trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/directx/dxg/dxg_int.h trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h trunk/reactos/drivers/serial/serial/serial.h trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/scsiport/stubs.c trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/include/ddk/afilter.h trunk/reactos/include/ddk/bdasup.h trunk/reactos/include/ddk/csq.h trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/minitape.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntagp.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/ntimage.h trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ddk/parallel.h trunk/reactos/include/ddk/scsiwmi.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/upssvc.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ddk/wmilib.h trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/peb_teb.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/batclass.h trunk/reactos/include/psdk/ktmtypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/usbioctl.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/xdk/amd64/ (props changed) trunk/reactos/include/xdk/arm/ (props changed) trunk/reactos/include/xdk/ia64/ (props changed) trunk/reactos/include/xdk/mips/ (props changed) trunk/reactos/include/xdk/ppc/ (props changed) trunk/reactos/include/xdk/x86/ (props changed) trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/kdbg/ (props changed) trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/subsystems/subsystems.rbuild trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/subsystems/win32/win32k/pch.h 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) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… 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/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxap… Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… Modified: trunk/reactos/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/include/ddk/afilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/afilter.h?rev=… Removed: trunk/reactos/include/ddk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atsmedia.h?rev… Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… Removed: trunk/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfg.h?rev=4646… Removed: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… Modified: trunk/reactos/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/csq.h?rev=4646… Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… Modified: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=46… Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4646… Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… Modified: trunk/reactos/include/ddk/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=464… Modified: trunk/reactos/include/ddk/ntagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntagp.h?rev=46… Modified: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev… Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.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/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… 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/parallel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/parallel.h?rev… Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=46… Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4646… Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.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/tvout.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tvout.h?rev=46… Modified: trunk/reactos/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/upssvc.h?rev=4… Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=46… Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4646… Modified: trunk/reactos/include/ddk/wmilib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wmilib.h?rev=4… Removed: trunk/reactos/include/ddk/xmldsodid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/xmldsodid.h?re… Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… Modified: trunk/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?rev=… Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.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/ktmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ktmtypes.h?re… Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4… Modified: trunk/reactos/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbioctl.h?re… 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/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.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/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.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/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… Removed: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… Modified: trunk/reactos/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/subsystems.rbui… Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc…

14 years, 9 months

[dreimer] 46465: Add Cyrix, Pentium MMX, Pro, II, M, 4, Core Solo/Duo/Extreme/i*, Atom, AMD K6, K6-3, Via Nehemiah, Esther, Nano and a big bunch of Family 15 (1st gen Athlon64, Turion64, Sempron Series) AMD CPUs to cpu.inf These should be all CPUs out there we support....

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Mar 26 13:59:02 2010 New Revision: 46465 URL: http://svn.reactos.org/svn/reactos?rev=46465&view=rev Log: Add Cyrix, Pentium MMX, Pro, II, M, 4, Core Solo/Duo/Extreme/i*, Atom, AMD K6, K6-3, Via Nehemiah, Esther, Nano and a big bunch of Family 15 (1st gen Athlon64, Turion64, Sempron Series) AMD CPUs to cpu.inf These should be all CPUs out there we support.... Modified: trunk/reactos/media/inf/cpu.inf Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=4646… ============================================================================== Binary files - no diff available.

14 years, 9 months

[janderwald] 46464: [BDAPLGIN] - Perform property request by passing the request through IKsPropertySet interface. This is necessary as the pin handle might not have been created at the time the proxy plugin has been loaded - Set Reserved of KSP_NODE request to zero as required by the documentation

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Mar 26 12:43:52 2010 New Revision: 46464 URL: http://svn.reactos.org/svn/reactos?rev=46464&view=rev Log: [BDAPLGIN] - Perform property request by passing the request through IKsPropertySet interface. This is necessary as the pin handle might not have been created at the time the proxy plugin has been loaded - Set Reserved of KSP_NODE request to zero as required by the documentation Modified: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp trunk/reactos/dll/directx/bdaplgin/precomp.h trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp Modified: trunk/reactos/dll/directx/bdaplgin/controlnode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/contr… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/controlnode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/controlnode.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -34,12 +34,12 @@ return m_Ref; } - CControlNode(HANDLE hFile, ULONG NodeType, ULONG PinId) : m_Ref(0), m_hFile(hFile), m_NodeType(NodeType), m_PinId(PinId){}; + CControlNode(IKsPropertySet * pProperty, ULONG NodeType, ULONG PinId) : m_Ref(0), m_pKsProperty(pProperty), m_NodeType(NodeType), m_PinId(PinId){}; virtual ~CControlNode(){}; protected: LONG m_Ref; - HANDLE m_hFile; + IKsPropertySet * m_pKsProperty; ULONG m_NodeType; ULONG m_PinId; }; @@ -60,19 +60,19 @@ } else if(IsEqualGUID(refiid, IID_IBDA_FrequencyFilter)) { - return CBDAFrequencyFilter_fnConstructor(m_hFile, m_NodeType, refiid, Output); + return CBDAFrequencyFilter_fnConstructor(m_pKsProperty, m_NodeType, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_SignalStatistics)) { - return CBDASignalStatistics_fnConstructor(m_hFile, m_NodeType, refiid, Output); + return CBDASignalStatistics_fnConstructor(m_pKsProperty, m_NodeType, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_LNBInfo)) { - return CBDALNBInfo_fnConstructor(m_hFile, m_NodeType, refiid, Output); + return CBDALNBInfo_fnConstructor(m_pKsProperty, m_NodeType, refiid, Output); } else if(IsEqualGUID(refiid, IID_IBDA_DigitalDemodulator)) { - return CBDADigitalDemodulator_fnConstructor(m_hFile, m_NodeType, refiid, Output); + return CBDADigitalDemodulator_fnConstructor(m_pKsProperty, m_NodeType, refiid, Output); } #ifdef BDAPLGIN_TRACE WCHAR Buffer[MAX_PATH]; @@ -99,8 +99,7 @@ WCHAR Buffer[100]; HRESULT hr; IPin * pPin = NULL; - IKsObject * pObject = NULL; - HANDLE hFile = INVALID_HANDLE_VALUE; + IKsPropertySet * pProperty; // store pin id swprintf(Buffer, L"%u", PinId); @@ -117,26 +116,21 @@ return hr; } - // query IKsObject interface - hr = pPin->QueryInterface(IID_IKsObject, (void**)&pObject); + // query for IKsPropertySet interface + hr = pPin->QueryInterface(IID_IKsPropertySet, (void**)&pProperty); + if (FAILED(hr)) + return hr; #ifdef BDAPLGIN_TRACE swprintf(Buffer, L"CControlNode_fnConstructor get IID_IKsObject status %lx\n", hr); OutputDebugStringW(Buffer); #endif - if (SUCCEEDED(hr)) - { - // get pin handle - hFile = pObject->KsGetObjectHandle(); - // release IKsObject interface - pObject->Release(); - } // release IPin interface pPin->Release(); // construct device control - CControlNode * handler = new CControlNode(hFile, NodeType, PinId); + CControlNode * handler = new CControlNode(pProperty, NodeType, PinId); #ifdef BDAPLGIN_TRACE OutputDebugStringW(L"CControlNode_fnConstructor\n"); Modified: trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/digit… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/digitaldemo.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -50,12 +50,12 @@ HRESULT STDMETHODCALLTYPE put_SpectralInversion(SpectralInversion *pSpectralInversion); HRESULT STDMETHODCALLTYPE get_SpectralInversion(SpectralInversion *pSpectralInversion); - CBDADigitalDemodulator(HANDLE hFile, ULONG NodeId) : m_Ref(0), m_hFile(hFile), m_NodeId(NodeId){}; + CBDADigitalDemodulator(IKsPropertySet * pProperty, ULONG NodeId) : m_Ref(0), m_pProperty(pProperty), m_NodeId(NodeId){}; ~CBDADigitalDemodulator(){}; protected: LONG m_Ref; - HANDLE m_hFile; + IKsPropertySet * m_pProperty; ULONG m_NodeId; }; @@ -88,6 +88,7 @@ swprintf(Buffer, L"CBDADigitalDemodulator::QueryInterface: NoInterface for %s", lpstr); OutputDebugStringW(Buffer); CoTaskMemFree(lpstr); +DebugBreak(); #endif return E_NOINTERFACE; @@ -100,20 +101,17 @@ KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_MODULATION_TYPE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pModulationType, sizeof(ModulationType), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_ModulationType: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_MODULATION_TYPE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pModulationType, sizeof(ModulationType)); + + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_ModulationType: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -133,20 +131,18 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_INNER_FEC_TYPE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pFECMethod, sizeof(FECMethod), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_InnerFECMethod: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_INNER_FEC_TYPE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pFECMethod, sizeof(FECMethod)); + + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_InnerFECMethod: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -167,20 +163,16 @@ KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_INNER_FEC_RATE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pFECRate, sizeof(BinaryConvolutionCodeRate), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_InnerFECRate: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_INNER_FEC_RATE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pFECRate, sizeof(BinaryConvolutionCodeRate)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_InnerFECRate: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -200,20 +192,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_OUTER_FEC_TYPE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pFECMethod, sizeof(FECMethod), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_OuterFECMethod: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_OUTER_FEC_TYPE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pFECMethod, sizeof(FECMethod)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_OuterFECMethod: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -234,20 +223,16 @@ KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_OUTER_FEC_RATE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pFECRate, sizeof(BinaryConvolutionCodeRate), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_OuterFECRate: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_OUTER_FEC_RATE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pFECRate, sizeof(BinaryConvolutionCodeRate)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_OuterFECRate: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -267,20 +252,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_SYMBOL_RATE; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pSymbolRate, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_SymbolRate: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_SYMBOL_RATE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pSymbolRate, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_SymbolRate: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -300,20 +282,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaDigitalDemodulator; - Node.Property.Id = KSPROPERTY_BDA_SPECTRAL_INVERSION; - Node.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY | KSPROPERTY_TYPE_SET; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), pSpectralInversion, sizeof(SpectralInversion), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDADigitalDemodulator::put_SpectralInversion: hr %lx, BytesReturned %lu\n", hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaDigitalDemodulator, KSPROPERTY_BDA_SPECTRAL_INVERSION, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), pSpectralInversion, sizeof(SpectralInversion)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDADigitalDemodulator::put_SpectralInversion: hr %lx\n", hr); OutputDebugStringW(Buffer); #endif @@ -331,13 +310,13 @@ HRESULT WINAPI CBDADigitalDemodulator_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv) { // construct device control - CBDADigitalDemodulator * handler = new CBDADigitalDemodulator(hFile, NodeId); + CBDADigitalDemodulator * handler = new CBDADigitalDemodulator(pProperty, NodeId); #ifdef BDAPLGIN_TRACE OutputDebugStringW(L"CBDADigitalDemodulator_fnConstructor\n"); Modified: trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/frequ… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/frequencyfilter.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -48,12 +48,12 @@ HRESULT STDMETHODCALLTYPE put_FrequencyMultiplier(ULONG ulMultiplier); HRESULT STDMETHODCALLTYPE get_FrequencyMultiplier(ULONG *pulMultiplier); - CBDAFrequencyFilter(HANDLE hFile, ULONG NodeId) : m_Ref(0), m_hFile(hFile), m_NodeId(NodeId){}; + CBDAFrequencyFilter(IKsPropertySet * pProperty, ULONG NodeId) : m_Ref(0), m_pProperty(pProperty), m_NodeId(NodeId){}; virtual ~CBDAFrequencyFilter(){}; protected: LONG m_Ref; - HANDLE m_hFile; + IKsPropertySet * m_pProperty; ULONG m_NodeId; }; @@ -86,6 +86,7 @@ swprintf(Buffer, L"CControlNode::QueryInterface: NoInterface for %s", lpstr); OutputDebugStringW(Buffer); CoTaskMemFree(lpstr); +DebugBreak(); #endif return E_NOINTERFACE; @@ -112,20 +113,16 @@ KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaFrequencyFilter; - Node.Property.Id = KSPROPERTY_BDA_RF_TUNER_FREQUENCY; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulFrequency, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDAFrequencyFilter::put_Frequency: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaFrequencyFilter, KSPROPERTY_BDA_RF_TUNER_FREQUENCY, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulFrequency, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAFrequencyFilter::put_Frequency: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -145,20 +142,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaFrequencyFilter; - Node.Property.Id = KSPROPERTY_BDA_RF_TUNER_POLARITY; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &Polarity, sizeof(Polarisation), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDAFrequencyFilter::put_Polarity: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaFrequencyFilter, KSPROPERTY_BDA_RF_TUNER_POLARITY, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &Polarity, sizeof(Polarisation)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAFrequencyFilter::put_Polarity: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -178,20 +172,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaFrequencyFilter; - Node.Property.Id = KSPROPERTY_BDA_RF_TUNER_RANGE; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulRange, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDAFrequencyFilter::put_Polarity: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaFrequencyFilter, KSPROPERTY_BDA_RF_TUNER_RANGE, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulRange, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAFrequencyFilter::put_Polarity: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -211,20 +202,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaFrequencyFilter; - Node.Property.Id = KSPROPERTY_BDA_RF_TUNER_BANDWIDTH; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulBandwidth, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDAFrequencyFilter::put_Bandwidth: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaFrequencyFilter, KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulBandwidth, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAFrequencyFilter::put_Bandwidth: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -243,20 +231,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaFrequencyFilter; - Node.Property.Id = KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = m_NodeId; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulMultiplier, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDAFrequencyFilter::put_FrequencyMultiplier: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + + // setup request + Node.NodeId = m_NodeId; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaFrequencyFilter, KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulMultiplier, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAFrequencyFilter::put_FrequencyMultiplier: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -273,13 +258,13 @@ HRESULT WINAPI CBDAFrequencyFilter_fnConstructor( - HANDLE hFile, + IKsPropertySet* pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv) { // construct device control - CBDAFrequencyFilter * handler = new CBDAFrequencyFilter(hFile, NodeId); + CBDAFrequencyFilter * handler = new CBDAFrequencyFilter(pProperty, NodeId); #ifdef BDAPLGIN_TRACE OutputDebugStringW(L"CBDAFrequencyFilter_fnConstructor\n"); Modified: trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/lnbin… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/lnbinfo.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -43,12 +43,12 @@ HRESULT STDMETHODCALLTYPE put_HighLowSwitchFrequency(ULONG ulSwitchFrequency); HRESULT STDMETHODCALLTYPE get_HighLowSwitchFrequency(ULONG *pulSwitchFrequency); - CBDALNBInfo(HANDLE hFile, ULONG NodeId) : m_Ref(0), m_hFile(hFile), m_NodeId(NodeId){}; + CBDALNBInfo(IKsPropertySet *pProperty, ULONG NodeId) : m_Ref(0), m_pProperty(pProperty), m_NodeId(NodeId){}; ~CBDALNBInfo(){}; protected: LONG m_Ref; - HANDLE m_hFile; + IKsPropertySet * m_pProperty; ULONG m_NodeId; }; @@ -92,20 +92,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaLNBInfo; - Node.Property.Id = KSPROPERTY_BDA_LNB_LOF_LOW_BAND; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; Node.NodeId = m_NodeId; + Node.Reserved = 0; // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulLOFLow, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDALNBInfo::put_LocalOscilatorFrequencyLowBand: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + hr = m_pProperty->Set(KSPROPSETID_BdaLNBInfo, KSPROPERTY_BDA_LNB_LOF_LOW_BAND, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulLOFLow, sizeof(LONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDALNBInfo::put_LocalOscilatorFrequencyLowBand: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -125,20 +122,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaLNBInfo; - Node.Property.Id = KSPROPERTY_BDA_LNB_LOF_HIGH_BAND; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; Node.NodeId = m_NodeId; + Node.Reserved = 0; // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulLOFHigh, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDALNBInfo::put_LocalOscilatorFrequencyHighBand: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + hr = m_pProperty->Set(KSPROPSETID_BdaLNBInfo, KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulLOFHigh, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDALNBInfo::put_LocalOscilatorFrequencyHighBand: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -158,20 +152,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaLNBInfo; - Node.Property.Id = KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; Node.NodeId = m_NodeId; + Node.Reserved = 0; // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &ulSwitchFrequency, sizeof(ULONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDALNBInfo::put_HighLowSwitchFrequency: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + hr = m_pProperty->Set(KSPROPSETID_BdaLNBInfo, KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &ulSwitchFrequency, sizeof(ULONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDALNBInfo::put_HighLowSwitchFrequency: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -188,13 +179,13 @@ HRESULT WINAPI CBDALNBInfo_fnConstructor( - HANDLE hFile, + IKsPropertySet *pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv) { // construct device control - CBDALNBInfo * handler = new CBDALNBInfo(hFile, NodeId); + CBDALNBInfo * handler = new CBDALNBInfo(pProperty, NodeId); #ifdef BDAPLGIN_TRACE OutputDebugStringW(L"CBDALNBInfo_fnConstructor\n"); Modified: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/pinco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -76,7 +76,7 @@ reinterpret_cast<IBDA_PinControl*>(*Output)->AddRef(); return NOERROR; } - +DebugBreak(); return E_NOINTERFACE; } //------------------------------------------------------------------- @@ -251,6 +251,9 @@ if (!pUnkOuter) return E_POINTER; + + OutputDebugStringW(L"CBDAPinControl_fnConstructor\n"); + //DebugBreak(); // query for IKsObject interface hr = pUnkOuter->QueryInterface(IID_IKsObject, (void**)&pObject); @@ -353,6 +356,13 @@ hr = E_UNEXPECTED; } } + else + { + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDAPinControl_fnConstructor failed to register filter with %lx\n", hr); + OutputDebugStringW(Buffer); + DebugBreak(); + } } } } Modified: trunk/reactos/dll/directx/bdaplgin/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/preco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/precomp.h [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -1,7 +1,7 @@ #ifndef PRECOMP_H__ #define PRECOMP_H__ -//#define BDAPLGIN_TRACE +#define BDAPLGIN_TRACE #define BUILDING_KS #define _KSDDK_ #include <dshow.h> @@ -67,7 +67,7 @@ HRESULT WINAPI CBDAFrequencyFilter_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv); @@ -77,7 +77,7 @@ HRESULT WINAPI CBDASignalStatistics_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv); @@ -87,7 +87,7 @@ HRESULT WINAPI CBDALNBInfo_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv); @@ -96,7 +96,7 @@ HRESULT WINAPI CBDADigitalDemodulator_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/signa… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] Fri Mar 26 12:43:52 2010 @@ -47,12 +47,12 @@ HRESULT STDMETHODCALLTYPE put_SampleTime(LONG lmsSampleTime); HRESULT STDMETHODCALLTYPE get_SampleTime(LONG *plmsSampleTime); - CBDASignalStatistics(HANDLE hFile, ULONG NodeId) : m_Ref(0), m_hFile(hFile), m_NodeId(NodeId){}; + CBDASignalStatistics(IKsPropertySet * pProperty, ULONG NodeId) : m_Ref(0), m_pProperty(pProperty), m_NodeId(NodeId){}; ~CBDASignalStatistics(){}; protected: LONG m_Ref; - HANDLE m_hFile; + IKsPropertySet * m_pProperty; ULONG m_NodeId; }; @@ -77,7 +77,6 @@ reinterpret_cast<IBDA_SignalStatistics*>(*Output)->AddRef(); return NOERROR; } - return E_NOINTERFACE; } @@ -97,13 +96,13 @@ ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SIGNAL_STRENGTH; - Node.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), plDbStrength, sizeof(LONG), &BytesReturned); + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + assert(m_pProperty); + + hr = m_pProperty->Get(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SIGNAL_STRENGTH, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), plDbStrength, sizeof(LONG), &BytesReturned); + #ifdef BDAPLGIN_TRACE WCHAR Buffer[100]; @@ -130,13 +129,11 @@ ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SIGNAL_QUALITY; - Node.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), plPercentQuality, sizeof(LONG), &BytesReturned); + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Get(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SIGNAL_QUALITY, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), plPercentQuality, sizeof(LONG), &BytesReturned); #ifdef BDAPLGIN_TRACE WCHAR Buffer[100]; @@ -164,13 +161,12 @@ ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SIGNAL_PRESENT; - Node.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &Present, sizeof(ULONG), &BytesReturned); + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Get(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SIGNAL_PRESENT, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &Present, sizeof(ULONG), &BytesReturned); + // store result *pfPresent = Present; @@ -200,13 +196,12 @@ ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SIGNAL_LOCKED; - Node.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &Locked, sizeof(ULONG), &BytesReturned); + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Get(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SIGNAL_LOCKED, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &Locked, sizeof(ULONG), &BytesReturned); + *pfLocked = Locked; #ifdef BDAPLGIN_TRACE @@ -224,20 +219,17 @@ { KSP_NODE Node; HRESULT hr; - ULONG BytesReturned; - - // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SAMPLE_TIME; - Node.Property.Flags = KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), &lmsSampleTime, sizeof(LONG), &BytesReturned); - -#ifdef BDAPLGIN_TRACE - WCHAR Buffer[100]; - swprintf(Buffer, L"CBDASignalStatistics::put_SampleTime: m_NodeId %lu hr %lx, BytesReturned %lu\n", m_NodeId, hr, BytesReturned); + + // setup request + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Set(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SAMPLE_TIME, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), &lmsSampleTime, sizeof(LONG)); + +#ifdef BDAPLGIN_TRACE + WCHAR Buffer[100]; + swprintf(Buffer, L"CBDASignalStatistics::put_SampleTime: m_NodeId %lu hr %lx\n", m_NodeId, hr); OutputDebugStringW(Buffer); #endif @@ -253,13 +245,11 @@ ULONG BytesReturned; // setup request - Node.Property.Set = KSPROPSETID_BdaSignalStats; - Node.Property.Id = KSPROPERTY_BDA_SAMPLE_TIME; - Node.Property.Flags = KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY; - Node.NodeId = (ULONG)-1; - - // perform request - hr = KsSynchronousDeviceControl(m_hFile, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), plmsSampleTime, sizeof(LONG), &BytesReturned); + Node.NodeId = (ULONG)-1; + Node.Reserved = 0; + + // perform request + hr = m_pProperty->Get(KSPROPSETID_BdaSignalStats, KSPROPERTY_BDA_SAMPLE_TIME, &Node.NodeId, sizeof(KSP_NODE)-sizeof(KSPROPERTY), plmsSampleTime, sizeof(LONG), &BytesReturned); #ifdef BDAPLGIN_TRACE WCHAR Buffer[100]; @@ -273,13 +263,13 @@ HRESULT WINAPI CBDASignalStatistics_fnConstructor( - HANDLE hFile, + IKsPropertySet * pProperty, ULONG NodeId, REFIID riid, LPVOID * ppv) { // construct device control - CBDASignalStatistics * handler = new CBDASignalStatistics(hFile, NodeId); + CBDASignalStatistics * handler = new CBDASignalStatistics(pProperty, NodeId); #ifdef BDAPLGIN_TRACE OutputDebugStringW(L"CBDASignalStatistics_fnConstructor\n");

14 years, 9 months

[akhaldi] 46463: Sync with trunk head (part 3 of 3)

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 26 10:27:25 2010 New Revision: 46463 URL: http://svn.reactos.org/svn/reactos?rev=46463&view=rev Log: Sync with trunk head (part 3 of 3) Modified: branches/header-work/ (props changed) Propchange: branches/header-work/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 26 10:27:25 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 -/trunk/reactos:45691-46443 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44762-44764,44772,45124,45126-45127,46394 +/trunk/reactos:45691-46460

14 years, 9 months

[akhaldi] 46462: Sync with trunk head (part 2 of x)

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 26 10:26:37 2010 New Revision: 46462 URL: http://svn.reactos.org/svn/reactos?rev=46462&view=rev Log: Sync with trunk head (part 2 of x) Modified: branches/header-work/include/ndk/amd64/ (props changed) branches/header-work/lib/sdk/crt/time/ (props changed) branches/header-work/ntoskrnl/kdbg/ (props changed) Propchange: branches/header-work/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 26 10:26:37 2010 @@ -1,2 +1,2 @@ -/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44772,45124,45126-45127,46394 -/trunk/reactos/include/ndk/amd64:45691-46443 +/branches/ros-amd64-bringup/reactos/include/ndk/amd64:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35655,35683,35739,35762,35777,35781,35805,35823,35827,35952,35966,36011-36012,36172,36360,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38092,38100,38149-38150,38264,38355,39335,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41070-41071,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338-44339,44389,44391,44426,44460,44491,44499-44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44623,44631,44762-44764,44772,45124,45126-45127,46394 +/trunk/reactos/include/ndk/amd64:45691-46460 Propchange: branches/header-work/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 26 10:26:37 2010 @@ -1,4 +1,4 @@ -/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34741,34780-34782,34803,34864,34870,34874,34877,34908-34909,34965,35655,35683,35762,35777,35781,35805,35827,36011-36012,36172,36380,36397,36445,36502-36503,36505,36898-36899,36936,36949,36951,36958,36961,36964,36969,36972,36992,38092,38100,38149-38150,38264,38268,38355,39335,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41070,41097-41098,41101,41449,41479,41484-41485,41500,41502,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44762-44764,44772,45124,45126-45127,46394 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:45691-46443 +/trunk/reactos/lib/sdk/crt/time:45691-46460 /trunk/reactos/lib/sdk/crt/time_new:39350-42241 Propchange: branches/header-work/ntoskrnl/kdbg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 26 10:26:37 2010 @@ -1,2 +1,2 @@ -/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394 -/trunk/reactos/ntoskrnl/kdbg:45691-46443 +/branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,34969,34986,35323-35324,35347-35348,35361,35436,35444,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,35968,35970-35971,36011-36013,36172,36332,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37433-37435,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38099-38100,38148-38151,38264-38265,38268,38355,39151,39160,39333,39335,39345,39522,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44762-44764,44772,45124,45126-45127,46394 +/trunk/reactos/ntoskrnl/kdbg:45691-46460

14 years, 9 months

[akhaldi] 46461: Sync with trunk head (part 1 of x)

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 26 10:25:42 2010 New Revision: 46461 URL: http://svn.reactos.org/svn/reactos?rev=46461&view=rev Log: Sync with trunk head (part 1 of x) Added: branches/header-work/boot/bootdata/hiveinst_amd64.inf - copied unchanged from r46459, trunk/reactos/boot/bootdata/hiveinst_amd64.inf branches/header-work/hal/halx86/generic/amd64/ (props changed) - copied from r46459, trunk/reactos/hal/halx86/generic/amd64/ branches/header-work/hal/halx86/generic/i386/ (props changed) - copied from r46459, trunk/reactos/hal/halx86/generic/i386/ branches/header-work/hal/halx86/mp/amd64/ (props changed) - copied from r46459, trunk/reactos/hal/halx86/mp/amd64/ branches/header-work/hal/halx86/mp/i386/ (props changed) - copied from r46459, trunk/reactos/hal/halx86/mp/i386/ branches/header-work/hal/halx86/up/pic.c - copied unchanged from r46459, trunk/reactos/hal/halx86/up/pic.c branches/header-work/hal/halx86/up/processor.c - copied unchanged from r46459, trunk/reactos/hal/halx86/up/processor.c branches/header-work/include/dxsdk/bdatif.idl - copied unchanged from r46459, trunk/reactos/include/dxsdk/bdatif.idl Removed: branches/header-work/boot/bootdata/packages/ branches/header-work/hal/halx86/generic/pic.c branches/header-work/hal/halx86/generic/portio.c branches/header-work/hal/halx86/generic/processor.c branches/header-work/hal/halx86/generic/systimer.S branches/header-work/hal/halx86/generic/trap.S branches/header-work/hal/halx86/mp/mps.S branches/header-work/hal/halx86/mp/mpsboot.asm branches/header-work/hal/halx86/mp/mpsirql.c branches/header-work/hal/halx86/mp/spinlock.c Modified: branches/header-work/ReactOS-amd64.rbuild branches/header-work/base/services/tcpsvcs/tcpsvcs.rbuild branches/header-work/base/shell/explorer/explorer.rbuild branches/header-work/config-amd64.template.rbuild 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/dll/win32/browseui/internettoolbar.cpp branches/header-work/drivers/bus/acpi/busmgr/bus.c branches/header-work/drivers/bus/acpi/main.c branches/header-work/hal/hal.rbuild branches/header-work/hal/halx86/generic/cmos.c branches/header-work/hal/halx86/generic/misc.c branches/header-work/hal/halx86/generic/spinlock.c branches/header-work/hal/halx86/hal_generic.rbuild branches/header-work/hal/halx86/hal_generic_mp.rbuild branches/header-work/hal/halx86/hal_generic_up.rbuild branches/header-work/hal/halx86/halamd64.rbuild branches/header-work/hal/halx86/halmps.rbuild branches/header-work/hal/halx86/include/halp.h branches/header-work/include/dxsdk/dxsdk.rbuild branches/header-work/include/ndk/amd64/asmmacro.S (props changed) branches/header-work/ntoskrnl/config/cmalloc.c branches/header-work/ntoskrnl/include/internal/cm_x.h branches/header-work/ntoskrnl/po/events.c branches/header-work/subsystems/win32/win32k/include/engobjects.h (props changed) branches/header-work/tools/rbuild/backend/mingw/compilers/gcc.mak branches/header-work/tools/rbuild/backend/mingw/mingw.cpp branches/header-work/tools/rbuild/backend/mingw/mingw.h branches/header-work/tools/rbuild/backend/mingw/modulehandler.cpp branches/header-work/tools/rbuild/installfile.cpp branches/header-work/tools/rbuild/module.cpp branches/header-work/tools/rbuild/project.cpp branches/header-work/tools/rbuild/rbuild.h 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) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/ReactOS-amd64.rbuil… Modified: branches/header-work/base/services/tcpsvcs/tcpsvcs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/services/tcpsv… Modified: branches/header-work/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/base/shell/explorer… Modified: branches/header-work/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/config-amd64.templa… Modified: branches/header-work/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/browseui/… Modified: branches/header-work/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/bu… Modified: branches/header-work/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/bus/acpi/ma… Modified: branches/header-work/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/hal.rbuild?rev=… Modified: branches/header-work/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Removed: branches/header-work/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Removed: branches/header-work/hal/halx86/generic/portio.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Removed: branches/header-work/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Removed: branches/header-work/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Removed: branches/header-work/hal/halx86/generic/trap.S URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… Modified: branches/header-work/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… Modified: branches/header-work/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/hal_gene… Modified: branches/header-work/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/halamd64… Modified: branches/header-work/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/halmps.r… Modified: branches/header-work/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/include/… Removed: branches/header-work/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/mps.S… Removed: branches/header-work/hal/halx86/mp/mpsboot.asm URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/mpsbo… Removed: branches/header-work/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/mpsir… Removed: branches/header-work/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/mp/spinl… Modified: branches/header-work/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/dxsdk/dxsdk… Modified: branches/header-work/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/config/cma… Modified: branches/header-work/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/include/in… Modified: branches/header-work/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/ntoskrnl/po/events.… Modified: branches/header-work/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/backen… Modified: branches/header-work/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/backen… Modified: branches/header-work/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/backen… Modified: branches/header-work/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/backen… Modified: branches/header-work/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/instal… Modified: branches/header-work/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/module… Modified: branches/header-work/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/projec… Modified: branches/header-work/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/tools/rbuild/rbuild…

14 years, 9 months

[tkreuzer] 46460: Looks like ld doesn't like specifying "-fno-leading-underscore" for anything else then shared modules (aka dlls). Therefore specify "-shared" for apps, too (Should hopefully not make a difference), making them link again. Since we have switched to non-prefixed symbols, we need to deal with 2 kinds of symbols that the compiler doesn't handle for us. 1.) __image_base__ is still defined the same way by ld, but since gcc doesn't give us an underscore anymore, we need to specify it

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 26 09:58:45 2010 New Revision: 46460 URL: http://svn.reactos.org/svn/reactos?rev=46460&view=rev Log: Looks like ld doesn't like specifying "-fno-leading-underscore" for anything else then shared modules (aka dlls). Therefore specify "-shared" for apps, too (Should hopefully not make a difference), making them link again. Since we have switched to non-prefixed symbols, we need to deal with 2 kinds of symbols that the compiler doesn't handle for us. 1.) __image_base__ is still defined the same way by ld, but since gcc doesn't give us an underscore anymore, we need to specify it on our own. 2.) __MINGW_IMP_SYMBOL, which is a hacky way of declaring a symbol dllimport, by prefixing it with __imp_ also needs special treatment. Fix these issues by adding appropriate macros to _mingw.h and removing the broken and duplicate definitions from multiple .c files. Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -28,6 +28,7 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag>  @@ -44,6 +45,7 @@ <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> <linkerflag>-fno-leading-underscore</linkerflag> + <linkerflag>-shared</linkerflag> <linkerflag>--exclude-all-symbols</linkerflag> </group> Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -197,15 +197,33 @@ #define _CRT_UNUSED(x) (void)x #endif +#if defined(__x86__) #define __MINGW_USE_UNDERSCORE_PREFIX 1 +#else +#define __MINGW_USE_UNDERSCORE_PREFIX 0 +#endif #if __MINGW_USE_UNDERSCORE_PREFIX == 0 -#define __MINGW_IMP_SYMBOL(sym) _imp_##sym +#define __MINGW_IMP_SYMBOL(sym) __imp_##sym #define __MINGW_USYMBOL(sym) sym #else #define __MINGW_IMP_SYMBOL(sym) _imp__##sym #define __MINGW_USYMBOL(sym) _##sym #endif +#if defined(__x86__) +/* Hack, for bug in ld. Will be removed soon. */ +#define __ImageBase _image_base__ +/* This symbol is defined by the linker. */ +extern char __ImageBase; +#elif defined(__x86_64__) +/* Hack, for bug in ld. Will be removed soon. */ +#define __ImageBase __image_base__ +/* This symbol is defined by the linker. */ +extern char __ImageBase; +#else +#error FIXME: Unsupported __ImageBase implementation. +#endif + #endif /* !_INC_MINGW */ Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -12,14 +12,6 @@ #include <memory.h> #include <signal.h> #include <stdio.h> - -#if defined (_WIN64) && defined (__ia64__) -#error FIXME: Unsupported __ImageBase implementation. -#else -#define __ImageBase _image_base__ -/* This symbol is defined by the linker. */ -extern IMAGE_DOS_HEADER __ImageBase; -#endif #pragma pack(push,1) typedef struct _UNWIND_INFO { Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -31,11 +31,6 @@ extern char *** __MINGW_IMP_SYMBOL(__initenv); #define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif - -/* Hack, for bug in ld. Will be removed soon. */ -#define __ImageBase _image_base__ -/* This symbol is defined by ld. */ -extern IMAGE_DOS_HEADER __ImageBase; extern void _fpreset (void); #define SPACECHAR _T(' ') Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -6,15 +6,6 @@ #include <windows.h> #include <string.h> - -#if defined (_WIN64) && defined (__ia64__) -#error FIXME: Unsupported __ImageBase implementation. -#else -/* Hack, for bug in ld. Will be removed soon. */ -#define __ImageBase _image_base__ -/* This symbol is defined by the linker. */ -extern IMAGE_DOS_HEADER __ImageBase; -#endif BOOL _ValidateImageBase (PBYTE); Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Fri Mar 26 09:58:45 2010 @@ -16,7 +16,6 @@ extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; -extern char _image_base__; typedef struct { DWORD addend; @@ -162,5 +161,5 @@ if (was_init) return; ++was_init; - do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,&__RUNTIME_PSEUDO_RELOC_LIST_END__,&_image_base__); + do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,&__RUNTIME_PSEUDO_RELOC_LIST_END__,&__ImageBase); }

14 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
90
Older →

Jump to page:

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