Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 47228: sync with trunk r47227
by jgardou＠svn.reactos.org 15 May '10

15 May '10

Author: jgardou Date: Sun May 16 00:30:01 2010 New Revision: 47228 URL: http://svn.reactos.org/svn/reactos?rev=47228&view=rev Log: sync with trunk r47227 Added: branches/reactos-yarotows/base/applications/cacls/lang/ja-JP.rc - copied unchanged from r47227, trunk/reactos/base/applications/cacls/lang/ja-JP.rc branches/reactos-yarotows/base/applications/rapps/lang/it-IT.rc - copied unchanged from r47227, trunk/reactos/base/applications/rapps/lang/it-IT.rc Removed: branches/reactos-yarotows/tools/rbuild/backend/codeblocks/ Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/Makefile branches/reactos-yarotows/base/applications/cacls/rsrc.rc branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt branches/reactos-yarotows/base/applications/rapps/rsrc.rc branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h branches/reactos-yarotows/base/system/winlogon/environment.c branches/reactos-yarotows/base/system/winlogon/sas.c branches/reactos-yarotows/base/system/winlogon/winlogon.h branches/reactos-yarotows/boot/bootdata/packages/reactos.dff branches/reactos-yarotows/boot/freeldr/freeldr/fs/iso.c branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild branches/reactos-yarotows/dll/cpl/appwiz/lang/cs-CZ.rc branches/reactos-yarotows/dll/cpl/console/colors.c branches/reactos-yarotows/dll/cpl/console/layout.c branches/reactos-yarotows/dll/cpl/input/settings.c branches/reactos-yarotows/dll/cpl/sysdm/lang/cs-CZ.rc branches/reactos-yarotows/dll/cpl/sysdm/lang/it-IT.rc branches/reactos-yarotows/dll/cpl/usrmgr/groups.c branches/reactos-yarotows/dll/cpl/usrmgr/users.c branches/reactos-yarotows/dll/win32/advapi32/reg/reg.c branches/reactos-yarotows/dll/win32/gdi32/misc/wingl.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h branches/reactos-yarotows/dll/win32/kernel32/lang/bg-BG.mc branches/reactos-yarotows/dll/win32/kernel32/lang/de-DE.mc branches/reactos-yarotows/dll/win32/kernel32/lang/pl-PL.mc branches/reactos-yarotows/dll/win32/kernel32/lang/ru-RU.mc branches/reactos-yarotows/dll/win32/kernel32/misc/console.c branches/reactos-yarotows/dll/win32/msgina/lang/bg-BG.rc branches/reactos-yarotows/dll/win32/msgina/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/msgina/lang/de-DE.rc branches/reactos-yarotows/dll/win32/msgina/lang/en-US.rc branches/reactos-yarotows/dll/win32/msgina/lang/es-ES.rc branches/reactos-yarotows/dll/win32/msgina/lang/fr-FR.rc branches/reactos-yarotows/dll/win32/msgina/lang/id-ID.rc branches/reactos-yarotows/dll/win32/msgina/lang/it-IT.rc branches/reactos-yarotows/dll/win32/msgina/lang/ja-JP.rc branches/reactos-yarotows/dll/win32/msgina/lang/no-NO.rc branches/reactos-yarotows/dll/win32/msgina/lang/pl-PL.rc branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc branches/reactos-yarotows/dll/win32/msgina/lang/ru-RU.rc branches/reactos-yarotows/dll/win32/msgina/lang/sk-SK.rc branches/reactos-yarotows/dll/win32/msgina/lang/uk-UA.rc branches/reactos-yarotows/dll/win32/msgina/msgina.c branches/reactos-yarotows/dll/win32/netshell/lang/it-IT.rc branches/reactos-yarotows/dll/win32/opengl32/opengl32.c branches/reactos-yarotows/dll/win32/opengl32/opengl32.h branches/reactos-yarotows/dll/win32/opengl32/wgl.c branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc branches/reactos-yarotows/dll/win32/shell32/shfldr_cpanel.c branches/reactos-yarotows/dll/win32/shell32/shlview.c branches/reactos-yarotows/dll/win32/userenv/environment.c branches/reactos-yarotows/drivers/network/afd/afd/read.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.h branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/ehci.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/uhci.c branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_dmus.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_topology.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavert.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/registry.cpp branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/service_group.cpp branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h branches/reactos-yarotows/hal/hal.pspec branches/reactos-yarotows/hal/halx86/generic/bus/pcibus.c branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h branches/reactos-yarotows/lib/newinflib/infhostgen.c branches/reactos-yarotows/lib/newinflib/infhostrtl.c branches/reactos-yarotows/media/inf/cpu.inf branches/reactos-yarotows/media/inf/ports.inf branches/reactos-yarotows/ntoskrnl/ex/init.c branches/reactos-yarotows/ntoskrnl/include/internal/i386/mm.h branches/reactos-yarotows/ntoskrnl/kd/kdinit.c branches/reactos-yarotows/ntoskrnl/kdbg/kdb.c branches/reactos-yarotows/ntoskrnl/ke/i386/traphdlr.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/arm/init.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/contmem.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/i386/init.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h branches/reactos-yarotows/ntoskrnl/mm/ARM3/mminit.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pagfault.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pfnlist.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/pool.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/procsup.c branches/reactos-yarotows/ntoskrnl/mm/freelist.c branches/reactos-yarotows/ntoskrnl/mm/mmfault.c branches/reactos-yarotows/ntoskrnl/mm/mminit.c branches/reactos-yarotows/subsystems/win32/csrss/include/conio.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/dllmain.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/harderror.c branches/reactos-yarotows/subsystems/win32/csrss/win32csr/tuiconsole.c branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/caret.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/keyboard.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c branches/reactos-yarotows/tools/mkhive/mkhive.c branches/reactos-yarotows/tools/mkhive/registry.c branches/reactos-yarotows/tools/mkhive/registry.h branches/reactos-yarotows/tools/rbuild/rbuild.mak branches/reactos-yarotows/tools/rbuild/rbuild.vcproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/Makefile URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/Makefile?rev=4… Modified: branches/reactos-yarotows/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/setup/use… Modified: branches/reactos-yarotows/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/system/wi… Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f… Modified: branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f… Modified: branches/reactos-yarotows/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/appwiz… Modified: branches/reactos-yarotows/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/consol… Modified: branches/reactos-yarotows/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/consol… Modified: branches/reactos-yarotows/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/input/… Modified: branches/reactos-yarotows/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/sysdm/… Modified: branches/reactos-yarotows/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/sysdm/… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/usrmgr… Modified: branches/reactos-yarotows/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/adva… Modified: branches/reactos-yarotows/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/iphl… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/pl-PL.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/kern… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi… Modified: branches/reactos-yarotows/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/nets… Modified: branches/reactos-yarotows/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/open… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/shel… Modified: branches/reactos-yarotows/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/usb/nt… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/wdm/au… Modified: branches/reactos-yarotows/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/hal.pspec?… Modified: branches/reactos-yarotows/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/hal/halx86/gen… Modified: branches/reactos-yarotows/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/lib/newinflib/infhostgen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/newinflib/… Modified: branches/reactos-yarotows/lib/newinflib/infhostrtl.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/newinflib/… Modified: branches/reactos-yarotows/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/media/inf/cpu.… Modified: branches/reactos-yarotows/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/media/inf/port… Modified: branches/reactos-yarotows/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ex/in… Modified: branches/reactos-yarotows/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… Modified: branches/reactos-yarotows/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/kd/kd… Modified: branches/reactos-yarotows/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/kdbg/… Modified: branches/reactos-yarotows/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ke/i3… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… Modified: branches/reactos-yarotows/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/fr… Modified: branches/reactos-yarotows/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/mm… Modified: branches/reactos-yarotows/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/mm… Modified: branches/reactos-yarotows/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/tools/mkhive/mkhive.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/m… Modified: branches/reactos-yarotows/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/r… Modified: branches/reactos-yarotows/tools/mkhive/registry.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/mkhive/r… Modified: branches/reactos-yarotows/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/r… Modified: branches/reactos-yarotows/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/r…

1 0

[cwittich] 47227: [RBUILD] delete outdated codeblocks backend (codeblocks does not support all features needed to build ros) See issue #5381 for more details.
by cwittich＠svn.reactos.org 15 May '10

15 May '10

Author: cwittich Date: Sat May 15 22:37:24 2010 New Revision: 47227 URL: http://svn.reactos.org/svn/reactos?rev=47227&view=rev Log: [RBUILD] delete outdated codeblocks backend (codeblocks does not support all features needed to build ros) See issue #5381 for more details. Removed: trunk/reactos/tools/rbuild/backend/codeblocks/ Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/tools/rbuild/rbuild.mak trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=47227&r1=4722… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat May 15 22:37:24 2010 @@ -472,11 +472,6 @@ $(ECHO_RGENSTAT) $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml -.PHONY: cb -cb: $(ROS_BUILDENGINE) - $(ECHO_RBUILD) - $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb - .PHONY: msbuild msbuild: $(ROS_BUILDENGINE) $(ECHO_RBUILD) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat May 15 22:37:24 2010 @@ -4841,15 +4841,7 @@ return RtlNtStatusToDosError(Status); } - if (lpValueName != NULL) - { - RtlInitUnicodeString(&ValueName, - lpValueName); - } - else - { - RtlInitUnicodeString(&ValueName, L""); - } + RtlInitUnicodeString(&ValueName, lpValueName); pValueName = &ValueName; if (is_string(dwType) && (cbData != 0)) Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.mak [iso-8859-1] Sat May 15 22:37:24 2010 @@ -84,24 +84,6 @@ ${mkdir} $@ endif -RBUILD_CODEBLOCKS_BASE = $(RBUILD_BACKEND_BASE_)codeblocks -RBUILD_CODEBLOCKS_BASE_ = $(RBUILD_CODEBLOCKS_BASE)$(SEP) -RBUILD_CODEBLOCKS_INT = $(INTERMEDIATE_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_INT_ = $(RBUILD_CODEBLOCKS_INT)$(SEP) -RBUILD_CODEBLOCKS_OUT = $(OUTPUT_)$(RBUILD_CODEBLOCKS_BASE) -RBUILD_CODEBLOCKS_OUT_ = $(RBUILD_CODEBLOCKS_OUT)$(SEP) - -$(RBUILD_CODEBLOCKS_INT): | $(RBUILD_BACKEND_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RBUILD_CODEBLOCKS_OUT): | $(RBUILD_BACKEND_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - - RBUILD_MSBUILD_BASE = $(RBUILD_BACKEND_BASE_)msbuild RBUILD_MSBUILD_BASE_ = $(RBUILD_MSBUILD_BASE)$(SEP) RBUILD_MSBUILD_INT = $(INTERMEDIATE_)$(RBUILD_MSBUILD_BASE) @@ -184,10 +166,6 @@ mstools_detection.cpp \ proxymakefile.cpp \ rule.cpp \ - ) - -RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES = $(addprefix $(RBUILD_CODEBLOCKS_BASE_), \ - codeblocks.cpp \ ) RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \ @@ -215,7 +193,6 @@ RBUILD_BACKEND_SOURCES = \ $(RBUILD_BACKEND_MINGW_BASE_SOURCES) \ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ - $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ $(RBUILD_BACKEND_VREPORT_BASE_SOURCES) \ $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ @@ -257,9 +234,6 @@ RBUILD_BACKEND_MSVCCPP_HEADERS = \ msvc.h -RBUILD_BACKEND_CODEBLOCKS_HEADERS = \ - codeblocks.h - RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h @@ -278,7 +252,6 @@ backend.h \ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ - $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ $(addprefix versionreport$(SEP), $(RBUILD_BACKEND_VREPORT_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) @@ -470,10 +443,6 @@ $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ -$(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_HOSTCC) - ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ - $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Sat May 15 22:37:24 2010 @@ -444,18 +444,6 @@ </File> </Filter> <Filter - Name="codeblocks" - > - <File - RelativePath=".\backend\codeblocks\codeblocks.cpp" - > - </File> - <File - RelativePath=".\backend\codeblocks\codeblocks.h" - > - </File> - </Filter> - <Filter Name="dependencymap" > <File

1 0

[mjmartin] 47226: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in ProcessTimers to allow any timers that have expired to have the WM_SYSTIMER/WM_TIMER messages posted to message queue before being destroyed. - Fix error in FindTimer, it was always returning a Timer and it needed to return NULL if the specified timer di
by mjmartin＠svn.reactos.org 15 May '10

15 May '10

Author: mjmartin Date: Sat May 15 21:40:33 2010 New Revision: 47226 URL: http://svn.reactos.org/svn/reactos?rev=47226&view=rev Log: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in ProcessTimers to allow any timers that have expired to have the WM_SYSTIMER/WM_TIMER messages posted to message queue before being destroyed. - Fix error in FindTimer, it was always returning a Timer and it needed to return NULL if the specified timer did not exist. - Fix error in PostTimerMessages, need to handle cases where the Window object is NULL which occurs when requesting messages for any window belonging to the thread. - In co_IntPeekMessage, simply call PostTimerMessages to have WM_SYSTIMER/WM_TIMER messages posted for expired timers. Remove call to old timer message handling. - TODO: Code using the old timer implementation needs removed. - Fixes bugs #2393, #3634, #2835. Commit dedicated to JT and Mr. Roboto. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sat May 15 21:40:33 2010 @@ -23,12 +23,14 @@ #define TMRF_ONESHOT 0x0010 #define TMRF_WAITING 0x0020 #define TMRF_TIFROMWND 0x0040 +#define TMRF_DELETEPENDING 0x8000 extern PKTIMER MasterTimer; NTSTATUS FASTCALL InitTimerImpl(VOID); -BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); -UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); +BOOL FASTCALL DestroyTimersForThread(PTHREADINFO pti); +BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer); +UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type); PTIMER FASTCALL FindSystemTimer(PMSG); BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -290,6 +290,8 @@ Win32Thread->TIF_flags |= TIF_INCLEANUP; DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); + /* Cleanup timers */ + DestroyTimersForThread(Win32Thread); UnregisterThreadHotKeys(Thread); /* what if this co_ func crash in umode? what will clean us up then? */ co_DestroyThreadWindows(Thread); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -189,7 +189,7 @@ ThreadQueue->CaretInfo->Pos.x = X; ThreadQueue->CaretInfo->Pos.y = Y; co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; } @@ -302,7 +302,7 @@ { co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -880,23 +880,8 @@ goto MsgExit; } - if (ThreadQueue->WakeMask & QS_TIMER) - if (PostTimerMessages(Window)) // If there are timers ready, - goto CheckMessages; // go back and process them. - - // LOL! Polling Timer Queue? How much time is spent doing this? - /* Check for WM_(SYS)TIMER messages */ - Present = MsqGetTimerMessage( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax, - &Msg->Msg, - RemoveMessages); - if (Present) - { - Msg->FreeLParam = FALSE; - goto MessageFound; - } + if (PostTimerMessages(Window)) + goto CheckMessages; if(Present) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -57,7 +57,7 @@ { Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); - } + } return Ret; } @@ -68,8 +68,8 @@ { if (pTmr) { - RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + /* Set the flag, it will be removed when ready */ + pTmr->flags |= TMRF_DELETEPENDING; return TRUE; } return FALSE; @@ -83,7 +83,7 @@ BOOL Distroy) { PLIST_ENTRY pLE; - PTIMER pTmr = FirstpTmr; + PTIMER pTmr = FirstpTmr, RetTmr = NULL; KeEnterCriticalRegion(); do { @@ -96,8 +96,8 @@ if (Distroy) { RemoveTimer(pTmr); - pTmr = (PTIMER)1; // We are here to remove the timer. } + RetTmr = pTmr; break; } @@ -106,7 +106,7 @@ } while (pTmr != FirstpTmr); KeLeaveCriticalRegion(); - return pTmr; + return RetTmr; } PTIMER @@ -162,15 +162,15 @@ return TRUE; } -// Rename it to IntSetTimer after move. UINT_PTR FASTCALL -InternalSetTimer( PWINDOW_OBJECT Window, +IntSetTimer( PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type) { PTIMER pTmr; + UINT Ret= IDEvent; LARGE_INTEGER DueTime; DueTime.QuadPart = (LONGLONG)(-10000000); @@ -195,6 +195,24 @@ { DPRINT("Adjusting uElapse\n"); Elapse = 10; + } + + if ((Window == NULL) && (!(Type & TMRF_SYSTEM))) + { + IntLockWindowlessTimerBitmap(); + IDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex); + + if (IDEvent == (UINT_PTR) -1) + { + IntUnlockWindowlessTimerBitmap(); + DPRINT1("Unable to find a free window-less timer id\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return 0; + } + + HintIndex = ++IDEvent; + IntUnlockWindowlessTimerBitmap(); + Ret = IDEvent; } pTmr = FindTimer(Window, IDEvent, Type, FALSE); @@ -215,18 +233,23 @@ pTmr->pWnd = Window; pTmr->cmsCountdown = Elapse; pTmr->cmsRate = Elapse; - pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. pTmr->pfn = TimerFunc; pTmr->nID = IDEvent; - - InsertTailList(&FirstpTmr->ptmrList, &pTmr->ptmrList); + pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. + } + + pTmr->cmsCountdown = Elapse; + pTmr->cmsRate = Elapse; + if (pTmr->flags & TMRF_DELETEPENDING) + { + pTmr->flags &= ~TMRF_DELETEPENDING; } // Start the timer thread! - KeSetTimer(MasterTimer, DueTime, NULL); - - if (!pTmr->nID) return 1; - return pTmr->nID; + if (pTmr == FirstpTmr) + KeSetTimer(MasterTimer, DueTime, NULL); + + return Ret; } // @@ -248,7 +271,7 @@ { // Need to start gdi syncro timers then start timer with Hang App proc // that calles Idle process so the screen savers will know to run...... - InternalSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); + IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); } UINT_PTR @@ -256,14 +279,14 @@ SystemTimerSet( PWINDOW_OBJECT Window, UINT_PTR nIDEvent, UINT uElapse, - TIMERPROC lpTimerFunc) + TIMERPROC lpTimerFunc) { if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return 0; } - return InternalSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); + return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); } BOOL @@ -279,28 +302,23 @@ if (!pTmr) return FALSE; - if (Window && ((ULONG_PTR)Window != 1)) - { - if (!Window->Wnd) return FALSE; - } - pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; KeEnterCriticalRegion(); + do { if ( (pTmr->flags & TMRF_READY) && (pTmr->pti == pti) && - (pTmr->pWnd == Window)) + ((pTmr->pWnd == Window) || (Window == NULL) ) ) { - ASSERT((ULONG_PTR)Window != 1); - Msg.hwnd = Window->hSelf; + Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_POSTMESSAGE); - + + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); pTmr->flags &= ~TMRF_READY; ThreadQueue->WakeMask = ~QS_TIMER; Hit = TRUE; @@ -309,6 +327,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); return Hit; @@ -330,7 +349,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-10000000); + DueTime.QuadPart = (LONGLONG)(-1000000); do { @@ -341,8 +360,10 @@ continue; } - if (pTmr->flags & TMRF_INIT) + if (pTmr->flags & TMRF_INIT) + { pTmr->flags &= ~TMRF_INIT; // Skip this run. + } else { if (pTmr->cmsCountdown < 0) @@ -363,16 +384,35 @@ // Set thread message queue for this timer. if (pTmr->pti->MessageQueue) { // Wakeup thread - pTmr->pti->MessageQueue->WakeMask |= QS_TIMER; - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } } } - pTmr->cmsCountdown = pTmr->cmsRate; + if (pTmr->flags & TMRF_DELETEPENDING) + { + DPRINT("Removing Timer %x from List\n", pTmr); + + /* FIXME: Fix this!!!! */ +/* + if (!pTmr->pWnd) + { + DPRINT1("Clearing Bits for WindowLess Timer\n"); + IntLockWindowlessTimerBitmap(); + RtlSetBits(&WindowLessTimersBitMap, pTmr->nID, 1); + IntUnlockWindowlessTimerBitmap(); + } +*/ + RemoveEntryList(&pTmr->ptmrList); + UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + } + else + pTmr->cmsCountdown = pTmr->cmsRate; } else pTmr->cmsCountdown -= Time - TimeLast; } + pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); @@ -391,7 +431,7 @@ // // UINT_PTR FASTCALL -IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) +InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) { PWINDOW_OBJECT Window; UINT_PTR Ret = 0; @@ -477,17 +517,66 @@ return 0; } - +if (Ret == 0) ASSERT(FALSE); return Ret; } - BOOL FASTCALL -IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) +DestroyTimersForThread(PTHREADINFO pti) +{ + PLIST_ENTRY pLE; + PTIMER pTmr = FirstpTmr; + BOOL TimersRemoved = FALSE; + + if (FirstpTmr == NULL) + return FALSE; + + KeEnterCriticalRegion(); + + do + { + if ((pTmr) && (pTmr->pti == pti)) + { + pTmr->flags &= ~TMRF_READY; + pTmr->flags |= TMRF_DELETEPENDING; + TimersRemoved = TRUE; + } + pLE = pTmr->ptmrList.Flink; + pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); + } while (pTmr != FirstpTmr); + + KeLeaveCriticalRegion(); + + return TimersRemoved; +} + + +BOOL FASTCALL +IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer) +{ + PTIMER pTmr = NULL; + DPRINT("IntKillTimer Window %x id %p systemtimer %s\n", + Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); + + if (IDEvent == 0) + return FALSE; + + pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE); + return pTmr ? TRUE : FALSE; +} + + +// +// +// Old Kill Timer +// +// +BOOL FASTCALL +InternalKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) { PTHREADINFO pti; PWINDOW_OBJECT Window = NULL; - + DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); @@ -495,7 +584,7 @@ if (Wnd) { Window = UserGetWindowObject(Wnd); - + if (! MsqKillTimer(pti->MessageQueue, Wnd, IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) { @@ -574,7 +663,7 @@ DPRINT("Enter NtUserSetTimer\n"); UserEnterExclusive(); - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, FALSE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, 0)); CLEANUP: DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_); @@ -591,12 +680,15 @@ UINT_PTR uIDEvent ) { + PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserKillTimer\n"); UserEnterExclusive(); - RETURN(IntKillTimer(hWnd, uIDEvent, FALSE)); + Window = UserGetWindowObject(hWnd); + + RETURN(IntKillTimer(Window, uIDEvent, FALSE)); CLEANUP: DPRINT("Leave NtUserKillTimer, ret=%i\n", _ret_); @@ -620,7 +712,7 @@ UserEnterExclusive(); // This is wrong, lpTimerFunc is NULL! - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, TRUE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);

1 0

[janderwald] 47225: [SYSAUDIO] - Don't build the pin descriptor as this will make problems with dynamic audio devices which dynamically adjust their audio pins - Remove dead code
by janderwald＠svn.reactos.org 15 May '10

15 May '10

Author: janderwald Date: Sat May 15 21:05:58 2010 New Revision: 47225 URL: http://svn.reactos.org/svn/reactos?rev=47225&view=rev Log: [SYSAUDIO] - Don't build the pin descriptor as this will make problems with dynamic audio devices which dynamically adjust their audio pins - Remove dead code Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Sat May 15 21:05:58 2010 @@ -97,7 +97,6 @@ NTSTATUS Status; PKSAUDIO_DEVICE_ENTRY Entry; ULONG BytesReturned; - PKSP_PIN Pin; // in order to access pin properties of a sysaudio device // the caller must provide a KSP_PIN struct, where @@ -110,8 +109,6 @@ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPROPERTY) + sizeof(ULONG)); } - Pin = (PKSP_PIN)Property; - Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, ((KSP_PIN*)Property)->Reserved); if (!Entry) { @@ -119,64 +116,15 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - if (!Entry->Pins) - { - /* expected pins */ - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - - if (Entry->PinDescriptorsCount <= Pin->PinId) - { - /* invalid pin id */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - if (Property->Id == KSPROPERTY_PIN_CTYPES) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) - { - /* too small buffer */ - return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(ULONG)); - } - /* store result */ - *((PULONG)Irp->UserBuffer) = Entry->PinDescriptorsCount; - return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(ULONG)); - } - else if (Property->Id == KSPROPERTY_PIN_COMMUNICATION) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSPIN_COMMUNICATION)) - { - /* too small buffer */ - return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_COMMUNICATION)); - } - /* store result */ - *((KSPIN_COMMUNICATION*)Irp->UserBuffer) = Entry->PinDescriptors[Pin->PinId].Communication; - return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_COMMUNICATION)); - - } - else if (Property->Id == KSPROPERTY_PIN_DATAFLOW) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSPIN_DATAFLOW)) - { - /* too small buffer */ - return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_DATAFLOW)); - } - /* store result */ - *((KSPIN_DATAFLOW*)Irp->UserBuffer) = Entry->PinDescriptors[Pin->PinId].DataFlow; - return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_DATAFLOW)); - } - else - { - /* forward request to the filter implementing the property */ - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, + /* forward request to the filter implementing the property */ + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, Irp->UserBuffer, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &BytesReturned); - return SetIrpIoStatus(Irp, Status, BytesReturned); - } + return SetIrpIoStatus(Irp, Status, BytesReturned); } @@ -328,7 +276,7 @@ PinRequest.Property.Set = KSPROPSETID_Pin; PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; - + ASSERT(Entry->FileObject); return KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sat May 15 21:05:58 2010 @@ -13,139 +13,6 @@ const GUID KS_CATEGORY_AUDIO = {0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KS_CATEGORY_TOPOLOGY = {0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}}; const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL = {0xBF963D80L, 0xC559, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; - -NTSTATUS -BuildPinDescriptor( - IN PKSAUDIO_DEVICE_ENTRY DeviceEntry, - IN ULONG Count) -{ - ULONG Index; - KSP_PIN PinRequest; - KSPIN_DATAFLOW DataFlow; - KSPIN_COMMUNICATION Communication; - ULONG NumWaveOutPin, NumWaveInPin; - NTSTATUS Status; - ULONG BytesReturned; - - NumWaveInPin = 0; - NumWaveOutPin = 0; - for(Index = 0; Index < Count; Index++) - { - /* retrieve data flow */ - PinRequest.PinId = Index; - PinRequest.Property.Set = KSPROPSETID_Pin; - PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; - - /* get dataflow direction */ - PinRequest.Property.Id = KSPROPERTY_PIN_DATAFLOW; - Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); - if (NT_SUCCESS(Status)) - { - DeviceEntry->PinDescriptors[Index].DataFlow = DataFlow; - } - - /* get irp flow direction */ - PinRequest.Property.Id = KSPROPERTY_PIN_COMMUNICATION; - Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); - if (NT_SUCCESS(Status)) - { - DeviceEntry->PinDescriptors[Index].Communication = Communication; - } - - if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_IN) - NumWaveOutPin++; - - if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_OUT) - NumWaveInPin++; - - /* FIXME query for interface, dataformat etc */ - } - - DPRINT("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->PinDescriptorsCount, NumWaveInPin, NumWaveOutPin); - return STATUS_SUCCESS; -} - -VOID -QueryFilterRoutine( - IN PKSAUDIO_DEVICE_ENTRY DeviceEntry) -{ - KSPROPERTY PropertyRequest; - ULONG Count; - NTSTATUS Status; - ULONG BytesReturned; - - DPRINT("Querying filter...\n"); - - PropertyRequest.Set = KSPROPSETID_Pin; - PropertyRequest.Flags = KSPROPERTY_TYPE_GET; - PropertyRequest.Id = KSPROPERTY_PIN_CTYPES; - - /* query for num of pins */ - Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to query number of pins Status %x\n", Status); - return; - } - - if (!Count) - { - DPRINT1("Filter has no pins!\n"); - return; - } - - /* allocate pin descriptor array */ - DeviceEntry->PinDescriptors = ExAllocatePool(NonPagedPool, Count * sizeof(KSPIN_DESCRIPTOR)); - if (!DeviceEntry->PinDescriptors) - { - /* no memory */ - return; - } - - /* zero array pin descriptor array */ - RtlZeroMemory(DeviceEntry->PinDescriptors, Count * sizeof(KSPIN_DESCRIPTOR)); - - /* build the device descriptor */ - Status = BuildPinDescriptor(DeviceEntry, Count); - if (!NT_SUCCESS(Status)) - return; - - - /* allocate pin array */ - DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); - if (!DeviceEntry->Pins) - { - /* no memory */ - DPRINT1("Failed to allocate memory Pins %u Block %x\n", Count, Count * sizeof(PIN_INFO)); - return; - } - - /* clear array */ - RtlZeroMemory(DeviceEntry->Pins, sizeof(PIN_INFO) * Count); - DeviceEntry->PinDescriptorsCount = Count; - -} - -VOID -NTAPI -FilterPinWorkerRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - PKSAUDIO_DEVICE_ENTRY DeviceEntry; - PFILTER_WORKER_CONTEXT Ctx = (PFILTER_WORKER_CONTEXT)Context; - - DeviceEntry = Ctx->DeviceEntry; - - QueryFilterRoutine(DeviceEntry); - - /* free work item */ - IoFreeWorkItem(Ctx->WorkItem); - /* free work item context */ - ExFreePool(Ctx); - return; - -} NTSTATUS OpenDevice( @@ -199,8 +66,6 @@ IN PUNICODE_STRING DeviceName) { NTSTATUS Status = STATUS_SUCCESS; - PFILTER_WORKER_CONTEXT Ctx = NULL; - PIO_WORKITEM WorkItem = NULL; PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = NULL; @@ -214,24 +79,6 @@ /* initialize audio device entry */ RtlZeroMemory(DeviceEntry, sizeof(KSAUDIO_DEVICE_ENTRY)); - - /* allocate filter ctx */ - Ctx = ExAllocatePool(NonPagedPool, sizeof(FILTER_WORKER_CONTEXT)); - if (!Ctx) - { - /* no memory */ - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - /* allocate work item */ - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - /* no memory */ - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } /* set device name */ DeviceEntry->DeviceName.Length = 0; @@ -254,9 +101,6 @@ { goto cleanup; } - - Ctx->DeviceEntry = DeviceEntry; - Ctx->WorkItem = WorkItem; /* fetch device extension */ DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -265,16 +109,9 @@ InterlockedIncrement((PLONG)&DeviceExtension->NumberOfKsAudioDevices); DPRINT("Successfully opened audio device %u Device %S\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->DeviceName.Buffer); - IoQueueWorkItem(WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)Ctx); return Status; cleanup: - if (Ctx) - ExFreePool(Ctx); - - if (WorkItem) - IoFreeWorkItem(WorkItem); - if (DeviceEntry) { if (DeviceEntry->DeviceName.Buffer) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sat May 15 21:05:58 2010 @@ -53,10 +53,10 @@ /* close audio device handle */ ZwClose(DeviceEntry->Handle); + /* free device string */ RtlFreeUnicodeString(&DeviceEntry->DeviceName); - /* free pins */ - ExFreePool(DeviceEntry->Pins); + /* free audio device entry */ ExFreePool(DeviceEntry); } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sat May 15 21:05:58 2010 @@ -354,7 +354,7 @@ } #endif - DeviceEntry->Pins[Connect->PinId].References = 0; + //DeviceEntry->Pins[Connect->PinId].References = 0; /* initialize dispatch context */ DispatchContext->Handle = RealPinHandle; @@ -386,6 +386,44 @@ } NTSTATUS +GetConnectRequest( + IN PIRP Irp, + OUT PKSPIN_CONNECT * Result) +{ + PIO_STACK_LOCATION IoStack; + ULONG ObjectLength, ParametersLength; + PVOID Buffer; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get object class length */ + ObjectLength = (wcslen(KSSTRING_Pin) + 2) * sizeof(WCHAR); + + /* check for minium length requirement */ + if (ObjectLength + sizeof(KSPIN_CONNECT) > IoStack->FileObject->FileName.MaximumLength) + return STATUS_UNSUCCESSFUL; + + /* extract parameters length */ + ParametersLength = IoStack->FileObject->FileName.MaximumLength - ObjectLength; + + /* allocate buffer */ + Buffer = ExAllocatePool(NonPagedPool, ParametersLength); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + /* copy parameters */ + RtlMoveMemory(Buffer, &IoStack->FileObject->FileName.Buffer[ObjectLength / sizeof(WCHAR)], ParametersLength); + + /* store result */ + *Result = (PKSPIN_CONNECT)Buffer; + + return STATUS_SUCCESS; +} + + + +NTSTATUS NTAPI DispatchCreateSysAudioPin( IN PDEVICE_OBJECT DeviceObject, @@ -394,7 +432,7 @@ NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStack; PKSAUDIO_DEVICE_ENTRY DeviceEntry; - PKSPIN_CONNECT Connect = NULL; + PKSPIN_CONNECT Connect; PDISPATCH_CONTEXT DispatchContext; DPRINT("DispatchCreateSysAudioPin entered\n"); @@ -410,9 +448,6 @@ /* get current attached virtual device */ DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)IoStack->FileObject->RelatedFileObject->FsContext; - /* now validate pin connect request */ - Status = KsValidateConnectRequest(Irp, DeviceEntry->PinDescriptorsCount, DeviceEntry->PinDescriptors, &Connect); - /* check for success */ if (!NT_SUCCESS(Status)) { @@ -421,6 +456,19 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } + + /* get connect details */ + Status = GetConnectRequest(Irp, &Connect); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to obtain connect details */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + /* allocate dispatch context */ DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Sat May 15 21:05:58 2010 @@ -24,9 +24,7 @@ HANDLE Handle; // handle to audio device PFILE_OBJECT FileObject; // file objecto to audio device - PIN_INFO * Pins; // array of PIN_INFO - ULONG PinDescriptorsCount; // number of pin descriptors - KSPIN_DESCRIPTOR *PinDescriptors; // pin descriptors array + //PIN_INFO * Pins; // array of PIN_INFO }KSAUDIO_DEVICE_ENTRY, *PKSAUDIO_DEVICE_ENTRY; typedef struct @@ -61,20 +59,6 @@ HANDLE hMixerPin; // handle to mixer pin }DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; - -typedef struct -{ - PIO_WORKITEM WorkItem; - PKSAUDIO_DEVICE_ENTRY DeviceEntry; -}FILTER_WORKER_CONTEXT, *PFILTER_WORKER_CONTEXT; - -typedef struct -{ - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; -}COMPLETION_CONTEXT, *PCOMPLETION_CONTEXT; - - NTSTATUS SysAudioAllocateDeviceHeader(

1 0

[mjmartin] 47224: [win32k] - The description and changes made regarding WM_ACTIVATEAPP messages in r47126 were partially incorrect, the code was mostly correct.
by mjmartin＠svn.reactos.org 15 May '10

15 May '10

Author: mjmartin Date: Sat May 15 20:30:05 2010 New Revision: 47224 URL: http://svn.reactos.org/svn/reactos?rev=47224&view=rev Log: [win32k] - The description and changes made regarding WM_ACTIVATEAPP messages in r47126 were partially incorrect, the code was mostly correct. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Sat May 15 20:30:05 2010 @@ -105,19 +105,43 @@ if (Window && WindowPrev) { + PWINDOW_OBJECT cWindow; + HWND *List, *phWnd; HANDLE OldTID = IntGetWndThreadId(WindowPrev); HANDLE NewTID = IntGetWndThreadId(Window); DPRINT1("SendActiveMessage Old -> %x, New -> %x\n", OldTID, NewTID); if (Window->Wnd->style & WS_MINIMIZE) { - DPRINT1("Widow was nminimized\n"); + DPRINT("Widow was minimized\n"); } if (OldTID != NewTID) { - co_IntSendMessageNoWait(hWndPrev, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); - co_IntSendMessageNoWait(hWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); + List = IntWinListChildren(UserGetWindowObject(IntGetDesktopWindow())); + if (List) + { + for (phWnd = List; *phWnd; ++phWnd) + { + cWindow = UserGetWindowObject(*phWnd); + + if (cWindow && (IntGetWndThreadId(cWindow) == OldTID)) + { // FALSE if the window is being deactivated, + // ThreadId that owns the window being activated. + co_IntSendMessageNoWait(*phWnd, WM_ACTIVATEAPP, FALSE, (LPARAM)NewTID); + } + } + for (phWnd = List; *phWnd; ++phWnd) + { + cWindow = UserGetWindowObject(*phWnd); + if (cWindow && (IntGetWndThreadId(cWindow) == NewTID)) + { // TRUE if the window is being activated, + // ThreadId that owns the window being deactivated. + co_IntSendMessageNoWait(*phWnd, WM_ACTIVATEAPP, TRUE, (LPARAM)OldTID); + } + } + ExFreePool(List); + } } UserDerefObjectCo(WindowPrev); // Now allow the previous window to die. }

1 0

[janderwald] 47223: [PORTCLS] - Disable debugging
by janderwald＠svn.reactos.org 15 May '10

15 May '10

Author: janderwald Date: Sat May 15 19:57:09 2010 New Revision: 47223 URL: http://svn.reactos.org/svn/reactos?rev=47223&view=rev Log: [PORTCLS] - Disable debugging Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Sat May 15 19:57:09 2010 @@ -14,7 +14,7 @@ #include <ntddk.h> #include <portcls.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <dmusicks.h>

1 0

[janderwald] 47222: [PORTCLS] - Pass subdevice interface to PcNewRegistryKey - Fix multiple bugs in PcNewRegistryKey such as - If key type is GeneralRegistryKey, the function is supposed to create a new key - If key type is HwProfileRegistryKey, the type must be or'd with PLUGPLAY_REGKEY_DEVICE - Implement opening keys of type DeviceInterfaceRegistryKey - Free key handle if there is not enough memory to create a registry key object - Add more comments
by janderwald＠svn.reactos.org 15 May '10

15 May '10

Author: janderwald Date: Sat May 15 19:17:05 2010 New Revision: 47222 URL: http://svn.reactos.org/svn/reactos?rev=47222&view=rev Log: [PORTCLS] - Pass subdevice interface to PcNewRegistryKey - Fix multiple bugs in PcNewRegistryKey such as - If key type is GeneralRegistryKey, the function is supposed to create a new key - If key type is HwProfileRegistryKey, the type must be or'd with PLUGPLAY_REGKEY_DEVICE - Implement opening keys of type DeviceInterfaceRegistryKey - Free key handle if there is not enough memory to create a registry key object - Add more comments Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -340,7 +340,7 @@ RegistryKeyType, DesiredAccess, m_pDeviceObject, - NULL,//FIXME + (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -299,7 +299,7 @@ RegistryKeyType, DesiredAccess, m_pDeviceObject, - NULL,//FIXME + (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -340,7 +340,7 @@ DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, NULL /*FIXME*/, ObjectAttributes, CreateOptions, Disposition); + return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -359,7 +359,7 @@ RegistryKeyType, DesiredAccess, m_pDeviceObject, - NULL,//FIXME + (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -329,7 +329,7 @@ DPRINT("IPortWaveRT_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, NULL /*FIXME*/, ObjectAttributes, CreateOptions, Disposition); + return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition); } //--------------------------------------------------------------- // ISubdevice interface Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -14,7 +14,7 @@ #include <ntddk.h> #include <portcls.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <dmusicks.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Sat May 15 19:17:05 2010 @@ -270,6 +270,9 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; CRegistryKey * RegistryKey; PPCLASS_DEVICE_EXTENSION DeviceExt; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; + ISubdevice * Device; + PSYMBOLICLINK_ENTRY SymEntry; DPRINT("PcNewRegistryKey entered\n"); @@ -294,8 +297,8 @@ // object attributes is mandatory return STATUS_INVALID_PARAMETER; } - // try to open the key - Status = ZwOpenKey(&hHandle, DesiredAccess, ObjectAttributes); + // try to create the key + Status = ZwCreateKey(&hHandle, DesiredAccess, ObjectAttributes, 0, NULL, CreateOptions, Disposition); } else if (RegistryKeyType == DeviceRegistryKey || RegistryKeyType == DriverRegistryKey || @@ -305,7 +308,7 @@ if (RegistryKeyType == HwProfileRegistryKey) { // IoOpenDeviceRegistryKey used different constant - RegistryKeyType = PLUGPLAY_REGKEY_CURRENT_HWPROFILE; + RegistryKeyType = PLUGPLAY_REGKEY_CURRENT_HWPROFILE | PLUGPLAY_REGKEY_DEVICE; } // obtain the new device extension @@ -315,24 +318,71 @@ } else if (RegistryKeyType == DeviceInterfaceRegistryKey) { - // FIXME - UNIMPLEMENTED - DbgBreakPoint(); - } - + if (SubDevice == NULL) + { + // invalid parameter + return STATUS_INVALID_PARAMETER; + } + + // look up our undocumented interface + Status = ((PUNKNOWN)SubDevice)->QueryInterface(IID_ISubdevice, (LPVOID*)&Device); + + if (!NT_SUCCESS(Status)) + { + DPRINT("No ISubdevice interface\n"); + // invalid parameter + return STATUS_INVALID_PARAMETER; + } + + // get the subdevice descriptor + Status = Device->GetDescriptor(&SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to get subdevice descriptor %x\n", Status); + ((PUNKNOWN)SubDevice)->Release(); + return STATUS_UNSUCCESSFUL; + } + + // is there an registered device interface + if (IsListEmpty(&SubDeviceDescriptor->SymbolicLinkList)) + { + DPRINT("No device interface registered\n"); + ((PUNKNOWN)SubDevice)->Release(); + return STATUS_UNSUCCESSFUL; + } + + // get the first symbolic link + SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(SubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); + + // open device interface + Status = IoOpenDeviceInterfaceRegistryKey(&SymEntry->SymbolicLink, DesiredAccess, &hHandle); + + // release subdevice interface + ((PUNKNOWN)SubDevice)->Release(); + } + + // check for success if (!NT_SUCCESS(Status)) { + DPRINT1("PcNewRegistryKey failed with %lx\n", Status); return Status; } + // allocate new registry key object RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hHandle); if (!RegistryKey) + { + // not enough memory + ZwClose(hHandle); return STATUS_INSUFFICIENT_RESOURCES; - + } + + // query for interface Status = RegistryKey->QueryInterface(IID_IRegistryKey, (PVOID*)OutRegistryKey); if (!NT_SUCCESS(Status)) { + // out of memory delete RegistryKey; }

1 0

[akhaldi] 47221: [PSDK] - ntsecpkg.h : merge recent changes from trunk. - winnt.h : Add missing PROCESSOR_NUMBER, introduce _ANONYMOUS_UNION in NT_TIB{32, 64}, update WELL_KNOWN_SID_TYPE & SID_NAME_USE, ULONG -> DWORD in LDT_ENTRY and TOKEN_GROUPS_AND_PRIVILEGES and a consistent formatting for the rest. [FREELDR] - setupldr.rbuild : merge recent changes from trunk.
by akhaldi＠svn.reactos.org 15 May '10

15 May '10

Author: akhaldi Date: Sat May 15 18:53:39 2010 New Revision: 47221 URL: http://svn.reactos.org/svn/reactos?rev=47221&view=rev Log: [PSDK] - ntsecpkg.h : merge recent changes from trunk. - winnt.h : Add missing PROCESSOR_NUMBER, introduce _ANONYMOUS_UNION in NT_TIB{32,64}, update WELL_KNOWN_SID_TYPE & SID_NAME_USE, ULONG -> DWORD in LDT_ENTRY and TOKEN_GROUPS_AND_PRIVILEGES and a consistent formatting for the rest. [FREELDR] - setupldr.rbuild : merge recent changes from trunk. Modified: branches/header-work/boot/freeldr/freeldr/setupldr.rbuild branches/header-work/include/psdk/ntsecpkg.h branches/header-work/include/psdk/winnt.h Modified: branches/header-work/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… ============================================================================== --- branches/header-work/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ branches/header-work/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Sat May 15 18:53:39 2010 @@ -11,7 +11,9 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <library>mini_hal</library> + <if property="ARCH" value="i386"> + <library>mini_hal</library> + </if> <group linkerset="ld"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> Modified: branches/header-work/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntsecp… ============================================================================== --- branches/header-work/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntsecpkg.h [iso-8859-1] Sat May 15 18:53:39 2010 @@ -19,6 +19,10 @@ #ifndef _NTSECPKG_H #define _NTSECPKG_H +#ifdef __cplusplus +extern "C" { +#endif + /* Flags for the MachineState field in SECPKG_PARAMETERS */ #define SECPKG_STATE_ENCRYPTION_PERMITTED 0x01 #define SECPKG_STATE_STRONG_ENCRYPTION_PERMITTED 0x02 @@ -30,6 +34,9 @@ #define SECPKG_INTERFACE_VERSION 0x10000 #define SECPKG_INTERFACE_VERSION_2 0x20000 #define SECPKG_INTERFACE_VERSION_3 0x40000 +#define SECPKG_INTERFACE_VERSION_4 0x80000 +#define SECPKG_INTERFACE_VERSION_5 0x100000 +#define SECPKG_INTERFACE_VERSION_6 0x200000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -139,6 +146,11 @@ SECPKG_MUTUAL_AUTH_LEVEL MutualAuthLevel; } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; + +typedef struct _SECPKG_TARGETINFO { + PSID DomainSid; + PCWSTR ComputerName; +} SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, @@ -341,6 +353,18 @@ ULONG); typedef NTSTATUS (NTAPI SpSetCredentialsAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, ULONG); +typedef NTSTATUS (NTAPI SpChangeAccountPasswordFn)(PUNICODE_STRING, + PUNICODE_STRING, PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PSecBufferDesc); +typedef NTSTATUS (NTAPI SpQueryMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, PULONG, PUCHAR *, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpExchangeMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, ULONG, PUCHAR, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpGetCredUIContextFn)(LSA_SEC_HANDLE, GUID *, PULONG, + PUCHAR *); +typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, + PUCHAR); +typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, + PVOID, ULONG, PSECPKG_TARGETINFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -402,6 +426,15 @@ /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */ SpSetCredentialsAttributesFn *SetCredentialsAttributes; /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */ + SpChangeAccountPasswordFn *ChangeAccountPassword; + /* Packages with version SECPKG_INTERFACE_VERSION_4 end here */ + SpQueryMetaDataFn *QueryMetaData; + SpExchangeMetaDataFn *ExchangeMetaData; + SpGetCredUIContextFn *GetCredUIContext; + SpUpdateCredentialsFn *UpdateCredentials; + /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ + SpValidateTargetInfoFn *ValidateTargetInfo; + /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE; @@ -432,4 +465,7 @@ typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); +#ifdef __cplusplus +} +#endif #endif /* _NTSECPKG_H */ Modified: branches/header-work/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winnt.… ============================================================================== --- branches/header-work/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/winnt.h [iso-8859-1] Sat May 15 18:53:39 2010 @@ -647,83 +647,89 @@ #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} typedef enum { - WinNullSid = 0, - WinWorldSid = 1, - WinLocalSid = 2, - WinCreatorOwnerSid = 3, - WinCreatorGroupSid = 4, - WinCreatorOwnerServerSid = 5, - WinCreatorGroupServerSid = 6, - WinNtAuthoritySid = 7, - WinDialupSid = 8, - WinNetworkSid = 9, - WinBatchSid = 10, - WinInteractiveSid = 11, - WinServiceSid = 12, - WinAnonymousSid = 13, - WinProxySid = 14, - WinEnterpriseControllersSid = 15, - WinSelfSid = 16, - WinAuthenticatedUserSid = 17, - WinRestrictedCodeSid = 18, - WinTerminalServerSid = 19, - WinRemoteLogonIdSid = 20, - WinLogonIdsSid = 21, - WinLocalSystemSid = 22, - WinLocalServiceSid = 23, - WinNetworkServiceSid = 24, - WinBuiltinDomainSid = 25, - WinBuiltinAdministratorsSid = 26, - WinBuiltinUsersSid = 27, - WinBuiltinGuestsSid = 28, - WinBuiltinPowerUsersSid = 29, - WinBuiltinAccountOperatorsSid = 30, - WinBuiltinSystemOperatorsSid = 31, - WinBuiltinPrintOperatorsSid = 32, - WinBuiltinBackupOperatorsSid = 33, - WinBuiltinReplicatorSid = 34, - WinBuiltinPreWindows2000CompatibleAccessSid = 35, - WinBuiltinRemoteDesktopUsersSid = 36, - WinBuiltinNetworkConfigurationOperatorsSid = 37, - WinAccountAdministratorSid = 38, - WinAccountGuestSid = 39, - WinAccountKrbtgtSid = 40, - WinAccountDomainAdminsSid = 41, - WinAccountDomainUsersSid = 42, - WinAccountDomainGuestsSid = 43, - WinAccountComputersSid = 44, - WinAccountControllersSid = 45, - WinAccountCertAdminsSid = 46, - WinAccountSchemaAdminsSid = 47, - WinAccountEnterpriseAdminsSid = 48, - WinAccountPolicyAdminsSid = 49, - WinAccountRasAndIasServersSid = 50, - WinNTLMAuthenticationSid = 51, - WinDigestAuthenticationSid = 52, - WinSChannelAuthenticationSid = 53, - WinThisOrganizationSid = 54, - WinOtherOrganizationSid = 55, - WinBuiltinIncomingForestTrustBuildersSid = 56, - WinBuiltinPerfMonitoringUsersSid = 57, - WinBuiltinPerfLoggingUsersSid = 58, - WinBuiltinAuthorizationAccessSid = 59, - WinBuiltinTerminalServerLicenseServersSid = 60, - WinBuiltinDCOMUsersSid = 61, - WinBuiltinIUsersSid = 62, - WinIUserSid = 63, - WinBuiltinCryptoOperatorsSid = 64, - WinUntrustedLabelSid = 65, - WinLowLabelSid = 66, - WinMediumLabelSid = 67, - WinHighLabelSid = 68, - WinSystemLabelSid = 69, - WinWriteRestrictedCodeSid = 70, - WinCreatorOwnerRightsSid = 71, - WinCacheablePrincipalsGroupSid = 72, - WinNonCacheablePrincipalsGroupSid = 73, - WinEnterpriseReadonlyControllersSid = 74, - WinAccountReadonlyControllersSid = 75, - WinBuiltinEventLogReadersGroup = 76 + WinNullSid = 0, + WinWorldSid = 1, + WinLocalSid = 2, + WinCreatorOwnerSid = 3, + WinCreatorGroupSid = 4, + WinCreatorOwnerServerSid = 5, + WinCreatorGroupServerSid = 6, + WinNtAuthoritySid = 7, + WinDialupSid = 8, + WinNetworkSid = 9, + WinBatchSid = 10, + WinInteractiveSid = 11, + WinServiceSid = 12, + WinAnonymousSid = 13, + WinProxySid = 14, + WinEnterpriseControllersSid = 15, + WinSelfSid = 16, + WinAuthenticatedUserSid = 17, + WinRestrictedCodeSid = 18, + WinTerminalServerSid = 19, + WinRemoteLogonIdSid = 20, + WinLogonIdsSid = 21, + WinLocalSystemSid = 22, + WinLocalServiceSid = 23, + WinNetworkServiceSid = 24, + WinBuiltinDomainSid = 25, + WinBuiltinAdministratorsSid = 26, + WinBuiltinUsersSid = 27, + WinBuiltinGuestsSid = 28, + WinBuiltinPowerUsersSid = 29, + WinBuiltinAccountOperatorsSid = 30, + WinBuiltinSystemOperatorsSid = 31, + WinBuiltinPrintOperatorsSid = 32, + WinBuiltinBackupOperatorsSid = 33, + WinBuiltinReplicatorSid = 34, + WinBuiltinPreWindows2000CompatibleAccessSid = 35, + WinBuiltinRemoteDesktopUsersSid = 36, + WinBuiltinNetworkConfigurationOperatorsSid = 37, + WinAccountAdministratorSid = 38, + WinAccountGuestSid = 39, + WinAccountKrbtgtSid = 40, + WinAccountDomainAdminsSid = 41, + WinAccountDomainUsersSid = 42, + WinAccountDomainGuestsSid = 43, + WinAccountComputersSid = 44, + WinAccountControllersSid = 45, + WinAccountCertAdminsSid = 46, + WinAccountSchemaAdminsSid = 47, + WinAccountEnterpriseAdminsSid = 48, + WinAccountPolicyAdminsSid = 49, + WinAccountRasAndIasServersSid = 50, + WinNTLMAuthenticationSid = 51, + WinDigestAuthenticationSid = 52, + WinSChannelAuthenticationSid = 53, + WinThisOrganizationSid = 54, + WinOtherOrganizationSid = 55, + WinBuiltinIncomingForestTrustBuildersSid = 56, + WinBuiltinPerfMonitoringUsersSid = 57, + WinBuiltinPerfLoggingUsersSid = 58, + WinBuiltinAuthorizationAccessSid = 59, + WinBuiltinTerminalServerLicenseServersSid = 60, + WinBuiltinDCOMUsersSid = 61, + WinBuiltinIUsersSid = 62, + WinIUserSid = 63, + WinBuiltinCryptoOperatorsSid = 64, + WinUntrustedLabelSid = 65, + WinLowLabelSid = 66, + WinMediumLabelSid = 67, + WinHighLabelSid = 68, + WinSystemLabelSid = 69, + WinWriteRestrictedCodeSid = 70, + WinCreatorOwnerRightsSid = 71, + WinCacheablePrincipalsGroupSid = 72, + WinNonCacheablePrincipalsGroupSid = 73, + WinEnterpriseReadonlyControllersSid = 74, + WinAccountReadonlyControllersSid = 75, + WinBuiltinEventLogReadersGroup = 76, + WinNewEnterpriseReadonlyControllersSid = 77, + WinBuiltinCertSvcDComAccessGroup = 78, + WinMediumPlusLabelSid = 79, + WinLocalLogonSid = 80, + WinConsoleLogonSid = 81, + WinThisOrganizationCertificateSid = 82, } WELL_KNOWN_SID_TYPE; #define SE_CREATE_TOKEN_NAME TEXT("SeCreateTokenPrivilege") @@ -1919,184 +1925,203 @@ #define SYSTEM_MANDATORY_LABEL_ACE_TYPE (0x11) #define ACCESS_MAX_MS_V5_ACE_TYPE (0x11) /* end ntifs.h */ + typedef struct _GENERIC_MAPPING { - ACCESS_MASK GenericRead; - ACCESS_MASK GenericWrite; - ACCESS_MASK GenericExecute; - ACCESS_MASK GenericAll; + ACCESS_MASK GenericRead; + ACCESS_MASK GenericWrite; + ACCESS_MASK GenericExecute; + ACCESS_MASK GenericAll; } GENERIC_MAPPING, *PGENERIC_MAPPING; + typedef struct _ACE_HEADER { - BYTE AceType; - BYTE AceFlags; - WORD AceSize; + BYTE AceType; + BYTE AceFlags; + WORD AceSize; } ACE_HEADER, *PACE_HEADER; typedef struct _ACCESS_ALLOWED_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; + typedef struct _ACCESS_DENIED_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; + typedef struct _SYSTEM_AUDIT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; -} SYSTEM_AUDIT_ACE; -typedef SYSTEM_AUDIT_ACE *PSYSTEM_AUDIT_ACE; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; + typedef struct _SYSTEM_ALARM_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } SYSTEM_ALARM_ACE,*PSYSTEM_ALARM_ACE; + typedef struct _SYSTEM_MANDATORY_LABEL_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; + #define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 #define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 #define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 #define SYSTEM_MANDATORY_LABEL_VALID_MASK (SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | SYSTEM_MANDATORY_LABEL_NO_READ_UP | SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP) + typedef struct _ACCESS_ALLOWED_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } ACCESS_ALLOWED_OBJECT_ACE,*PACCESS_ALLOWED_OBJECT_ACE; + typedef struct _ACCESS_DENIED_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } ACCESS_DENIED_OBJECT_ACE,*PACCESS_DENIED_OBJECT_ACE; + typedef struct _SYSTEM_AUDIT_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } SYSTEM_AUDIT_OBJECT_ACE,*PSYSTEM_AUDIT_OBJECT_ACE; + typedef struct _SYSTEM_ALARM_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } SYSTEM_ALARM_OBJECT_ACE,*PSYSTEM_ALARM_OBJECT_ACE; + typedef struct _ACCESS_ALLOWED_CALLBACK_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } ACCESS_ALLOWED_CALLBACK_ACE, *PACCESS_ALLOWED_CALLBACK_ACE; + typedef struct _ACCESS_DENIED_CALLBACK_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } ACCESS_DENIED_CALLBACK_ACE, *PACCESS_DENIED_CALLBACK_ACE; + typedef struct _SYSTEM_AUDIT_CALLBACK_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } SYSTEM_AUDIT_CALLBACK_ACE, *PSYSTEM_AUDIT_CALLBACK_ACE; + typedef struct _SYSTEM_ALARM_CALLBACK_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; } SYSTEM_ALARM_CALLBACK_ACE, *PSYSTEM_ALARM_CALLBACK_ACE; + typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE; + typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE; + typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE; + typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE { - ACE_HEADER Header; - ACCESS_MASK Mask; - DWORD Flags; - GUID ObjectType; - GUID InheritedObjectType; - DWORD SidStart; + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; } SYSTEM_ALARM_CALLBACK_OBJECT_ACE, *PSYSTEM_ALARM_CALLBACK_OBJECT_ACE; + typedef struct _ACL { - BYTE AclRevision; - BYTE Sbz1; - WORD AclSize; - WORD AceCount; - WORD Sbz2; + BYTE AclRevision; + BYTE Sbz1; + WORD AclSize; + WORD AceCount; + WORD Sbz2; } ACL,*PACL; -typedef enum _ACL_INFORMATION_CLASS -{ + +typedef enum _ACL_INFORMATION_CLASS { AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS; + typedef struct _ACL_REVISION_INFORMATION { - DWORD AclRevision; + DWORD AclRevision; } ACL_REVISION_INFORMATION, *PACL_REVISION_INFORMATION; + typedef struct _ACL_SIZE_INFORMATION { - DWORD AceCount; - DWORD AclBytesInUse; - DWORD AclBytesFree; + DWORD AceCount; + DWORD AclBytesInUse; + DWORD AclBytesFree; } ACL_SIZE_INFORMATION, *PACL_SIZE_INFORMATION; #ifndef _LDT_ENTRY_DEFINED #define _LDT_ENTRY_DEFINED -typedef struct _LDT_ENTRY -{ - USHORT LimitLow; - USHORT BaseLow; - union - { - struct - { - UCHAR BaseMid; - UCHAR Flags1; - UCHAR Flags2; - UCHAR BaseHi; - } Bytes; - struct - { - ULONG BaseMid:8; - ULONG Type:5; - ULONG Dpl:2; - ULONG Pres:1; - ULONG LimitHi:4; - ULONG Sys:1; - ULONG Reserved_0:1; - ULONG Default_Big:1; - ULONG Granularity:1; - ULONG BaseHi:8; - } Bits; - } HighWord; + +typedef struct _LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid:8; + DWORD Type:5; + DWORD Dpl:2; + DWORD Pres:1; + DWORD LimitHi:4; + DWORD Sys:1; + DWORD Reserved_0:1; + DWORD Default_Big:1; + DWORD Granularity:1; + DWORD BaseHi:8; + } Bits; + } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; -#endif + +#endif /* _LDT_ENTRY_DEFINED */ /* FIXME: add more machines */ #if defined(_X86_) && !defined(__PowerPC__) @@ -2117,42 +2142,43 @@ #define EXCEPTION_EXECUTE_FAULT 8 typedef struct _FLOATING_SAVE_AREA { - DWORD ControlWord; - DWORD StatusWord; - DWORD TagWord; - DWORD ErrorOffset; - DWORD ErrorSelector; - DWORD DataOffset; - DWORD DataSelector; - BYTE RegisterArea[80]; - DWORD Cr0NpxState; + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[80]; + DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; + typedef struct _CONTEXT { - DWORD ContextFlags; - DWORD Dr0; - DWORD Dr1; - DWORD Dr2; - DWORD Dr3; - DWORD Dr6; - DWORD Dr7; - FLOATING_SAVE_AREA FloatSave; - DWORD SegGs; - DWORD SegFs; - DWORD SegEs; - DWORD SegDs; - DWORD Edi; - DWORD Esi; - DWORD Ebx; - DWORD Edx; - DWORD Ecx; - DWORD Eax; - DWORD Ebp; - DWORD Eip; - DWORD SegCs; - DWORD EFlags; - DWORD Esp; - DWORD SegSs; - BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT; #elif defined(__x86_64__) @@ -2892,40 +2918,38 @@ #define EXCEPTION_NONCONTINUABLE 1 #define EXCEPTION_MAXIMUM_PARAMETERS 15 - typedef struct _EXCEPTION_RECORD { - DWORD ExceptionCode; - DWORD ExceptionFlags; - struct _EXCEPTION_RECORD *ExceptionRecord; - PVOID ExceptionAddress; - DWORD NumberParameters; - ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD; - - typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; - - typedef struct _EXCEPTION_RECORD32 { - DWORD ExceptionCode; - DWORD ExceptionFlags; - DWORD ExceptionRecord; - DWORD ExceptionAddress; - DWORD NumberParameters; - DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD32,*PEXCEPTION_RECORD32; - - typedef struct _EXCEPTION_RECORD64 { - DWORD ExceptionCode; - DWORD ExceptionFlags; - DWORD64 ExceptionRecord; - DWORD64 ExceptionAddress; - DWORD NumberParameters; - DWORD __unusedAlignment; - DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD64,*PEXCEPTION_RECORD64; - - typedef struct _EXCEPTION_POINTERS { - PEXCEPTION_RECORD ExceptionRecord; - PCONTEXT ContextRecord; - } EXCEPTION_POINTERS,*PEXCEPTION_POINTERS, *LPEXCEPTION_POINTERS; +typedef struct _EXCEPTION_RECORD { + DWORD ExceptionCode; + DWORD ExceptionFlags; + struct _EXCEPTION_RECORD *ExceptionRecord; + PVOID ExceptionAddress; + DWORD NumberParameters; + ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD, *PEXCEPTION_RECORD; + +typedef struct _EXCEPTION_RECORD32 { + DWORD ExceptionCode; + DWORD ExceptionFlags; + DWORD ExceptionRecord; + DWORD ExceptionAddress; + DWORD NumberParameters; + DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD32,*PEXCEPTION_RECORD32; + +typedef struct _EXCEPTION_RECORD64 { + DWORD ExceptionCode; + DWORD ExceptionFlags; + DWORD64 ExceptionRecord; + DWORD64 ExceptionAddress; + DWORD NumberParameters; + DWORD __unusedAlignment; + DWORD64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD64,*PEXCEPTION_RECORD64; + +typedef struct _EXCEPTION_POINTERS { + PEXCEPTION_RECORD ExceptionRecord; + PCONTEXT ContextRecord; +} EXCEPTION_POINTERS,*PEXCEPTION_POINTERS, *LPEXCEPTION_POINTERS; #ifdef _M_PPC #define LARGE_INTEGER_ORDER(x) x HighPart; DWORD LowPart; @@ -2960,151 +2984,174 @@ } LUID, *PLUID; #include <pshpack4.h> + typedef struct _LUID_AND_ATTRIBUTES { - LUID Luid; - DWORD Attributes; + LUID Luid; + DWORD Attributes; } LUID_AND_ATTRIBUTES, *PLUID_AND_ATTRIBUTES; -#include <poppack.h> - typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; typedef LUID_AND_ATTRIBUTES_ARRAY *PLUID_AND_ATTRIBUTES_ARRAY; + +#include <poppack.h> + typedef struct _PRIVILEGE_SET { - DWORD PrivilegeCount; - DWORD Control; - LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY]; + DWORD PrivilegeCount; + DWORD Control; + LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY]; } PRIVILEGE_SET,*PPRIVILEGE_SET; + typedef struct _SECURITY_ATTRIBUTES { DWORD nLength; LPVOID lpSecurityDescriptor; BOOL bInheritHandle; } SECURITY_ATTRIBUTES,*PSECURITY_ATTRIBUTES,*LPSECURITY_ATTRIBUTES; + typedef enum _SECURITY_IMPERSONATION_LEVEL { - SecurityAnonymous, - SecurityIdentification, - SecurityImpersonation, - SecurityDelegation + SecurityAnonymous, + SecurityIdentification, + SecurityImpersonation, + SecurityDelegation } SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL; + typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE; + typedef struct _SECURITY_QUALITY_OF_SERVICE { - DWORD Length; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; - BOOLEAN EffectiveOnly; + DWORD Length; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode; + BOOLEAN EffectiveOnly; } SECURITY_QUALITY_OF_SERVICE,*PSECURITY_QUALITY_OF_SERVICE; + typedef PVOID PACCESS_TOKEN; + typedef struct _SE_IMPERSONATION_STATE { - PACCESS_TOKEN Token; - BOOLEAN CopyOnOpen; - BOOLEAN EffectiveOnly; - SECURITY_IMPERSONATION_LEVEL Level; + PACCESS_TOKEN Token; + BOOLEAN CopyOnOpen; + BOOLEAN EffectiveOnly; + SECURITY_IMPERSONATION_LEVEL Level; } SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE; + typedef struct _SID_IDENTIFIER_AUTHORITY { - BYTE Value[6]; + BYTE Value[6]; } SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY; + typedef PVOID PSID; + typedef struct _SID { - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[ANYSIZE_ARRAY]; + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[ANYSIZE_ARRAY]; } SID, *PISID; + #define SECURITY_MIN_SID_SIZE (sizeof(SID)) #define SECURITY_MAX_SID_SIZE (FIELD_OFFSET(SID, SubAuthority) + SID_MAX_SUB_AUTHORITIES * sizeof(DWORD)) + typedef struct _SID_AND_ATTRIBUTES { - PSID Sid; - DWORD Attributes; + PSID Sid; + DWORD Attributes; } SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES; typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY]; typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY; + typedef struct _TOKEN_SOURCE { - CHAR SourceName[TOKEN_SOURCE_LENGTH]; - LUID SourceIdentifier; + CHAR SourceName[TOKEN_SOURCE_LENGTH]; + LUID SourceIdentifier; } TOKEN_SOURCE,*PTOKEN_SOURCE; + typedef struct _TOKEN_CONTROL { - LUID TokenId; - LUID AuthenticationId; - LUID ModifiedId; - TOKEN_SOURCE TokenSource; + LUID TokenId; + LUID AuthenticationId; + LUID ModifiedId; + TOKEN_SOURCE TokenSource; } TOKEN_CONTROL,*PTOKEN_CONTROL; + typedef struct _TOKEN_DEFAULT_DACL { - PACL DefaultDacl; + PACL DefaultDacl; } TOKEN_DEFAULT_DACL,*PTOKEN_DEFAULT_DACL; + typedef struct _TOKEN_GROUPS { - DWORD GroupCount; - SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; + DWORD GroupCount; + SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; } TOKEN_GROUPS,*PTOKEN_GROUPS,*LPTOKEN_GROUPS; + typedef struct _TOKEN_GROUPS_AND_PRIVILEGES { - ULONG SidCount; - ULONG SidLength; - PSID_AND_ATTRIBUTES Sids; - ULONG RestrictedSidCount; - ULONG RestrictedSidLength; - PSID_AND_ATTRIBUTES RestrictedSids; - ULONG PrivilegeCount; - ULONG PrivilegeLength; - PLUID_AND_ATTRIBUTES Privileges; - LUID AuthenticationId; + DWORD SidCount; + DWORD SidLength; + PSID_AND_ATTRIBUTES Sids; + DWORD RestrictedSidCount; + DWORD RestrictedSidLength; + PSID_AND_ATTRIBUTES RestrictedSids; + DWORD PrivilegeCount; + DWORD PrivilegeLength; + PLUID_AND_ATTRIBUTES Privileges; + LUID AuthenticationId; } TOKEN_GROUPS_AND_PRIVILEGES, *PTOKEN_GROUPS_AND_PRIVILEGES; + typedef struct _TOKEN_ORIGIN { - LUID OriginatingLogonSession; + LUID OriginatingLogonSession; } TOKEN_ORIGIN, *PTOKEN_ORIGIN; + typedef struct _TOKEN_OWNER { - PSID Owner; + PSID Owner; } TOKEN_OWNER,*PTOKEN_OWNER; + typedef struct _TOKEN_PRIMARY_GROUP { - PSID PrimaryGroup; + PSID PrimaryGroup; } TOKEN_PRIMARY_GROUP,*PTOKEN_PRIMARY_GROUP; + typedef struct _TOKEN_PRIVILEGES { - DWORD PrivilegeCount; - LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; + DWORD PrivilegeCount; + LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; } TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES; + typedef enum tagTOKEN_TYPE { TokenPrimary = 1, TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; -#include <pshpack4.h> typedef struct _TOKEN_STATISTICS { - LUID TokenId; - LUID AuthenticationId; - LARGE_INTEGER ExpirationTime; - TOKEN_TYPE TokenType; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - DWORD DynamicCharged; - DWORD DynamicAvailable; - DWORD GroupCount; - DWORD PrivilegeCount; - LUID ModifiedId; + LUID TokenId; + LUID AuthenticationId; + LARGE_INTEGER ExpirationTime; + TOKEN_TYPE TokenType; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + DWORD DynamicCharged; + DWORD DynamicAvailable; + DWORD GroupCount; + DWORD PrivilegeCount; + LUID ModifiedId; } TOKEN_STATISTICS, *PTOKEN_STATISTICS; -#include <poppack.h> typedef struct _TOKEN_USER { - SID_AND_ATTRIBUTES User; + SID_AND_ATTRIBUTES User; } TOKEN_USER, *PTOKEN_USER; + typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION; typedef WORD SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL; #ifndef _SECURITY_ATTRIBUTES_ #define _SECURITY_ATTRIBUTES_ typedef struct _SECURITY_DESCRIPTOR { - BYTE Revision; - BYTE Sbz1; - SECURITY_DESCRIPTOR_CONTROL Control; - PSID Owner; - PSID Group; - PACL Sacl; - PACL Dacl; + BYTE Revision; + BYTE Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + PSID Owner; + PSID Group; + PACL Sacl; + PACL Dacl; } SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; typedef PVOID PSECURITY_DESCRIPTOR; #endif + typedef struct _SECURITY_DESCRIPTOR_RELATIVE { - BYTE Revision; - BYTE Sbz1; - SECURITY_DESCRIPTOR_CONTROL Control; - DWORD Owner; - DWORD Group; - DWORD Sacl; - DWORD Dacl; + BYTE Revision; + BYTE Sbz1; + SECURITY_DESCRIPTOR_CONTROL Control; + DWORD Owner; + DWORD Group; + DWORD Sacl; + DWORD Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; typedef enum _TOKEN_INFORMATION_CLASS { @@ -3140,18 +3187,27 @@ } TOKEN_INFORMATION_CLASS; typedef enum _SID_NAME_USE { - SidTypeUser=1,SidTypeGroup,SidTypeDomain,SidTypeAlias, - SidTypeWellKnownGroup,SidTypeDeletedAccount,SidTypeInvalid, - SidTypeUnknown + SidTypeUser=1, + SidTypeGroup, + SidTypeDomain, + SidTypeAlias, + SidTypeWellKnownGroup, + SidTypeDeletedAccount, + SidTypeInvalid, + SidTypeUnknown, + SidTypeComputer, + SidTypeLabel } SID_NAME_USE,*PSID_NAME_USE; + typedef struct _QUOTA_LIMITS { - SIZE_T PagedPoolLimit; - SIZE_T NonPagedPoolLimit; - SIZE_T MinimumWorkingSetSize; - SIZE_T MaximumWorkingSetSize; - SIZE_T PagefileLimit; - LARGE_INTEGER TimeLimit; + SIZE_T PagedPoolLimit; + SIZE_T NonPagedPoolLimit; + SIZE_T MinimumWorkingSetSize; + SIZE_T MaximumWorkingSetSize; + SIZE_T PagefileLimit; + LARGE_INTEGER TimeLimit; } QUOTA_LIMITS,*PQUOTA_LIMITS; + typedef struct _IO_COUNTERS { ULONGLONG ReadOperationCount; ULONGLONG WriteOperationCount; @@ -3248,21 +3304,24 @@ DWORD NumberOfBlocks; MESSAGE_RESOURCE_BLOCK Blocks[1]; } MESSAGE_RESOURCE_DATA,*PMESSAGE_RESOURCE_DATA; + typedef struct _LIST_ENTRY { - struct _LIST_ENTRY *Flink; - struct _LIST_ENTRY *Blink; + struct _LIST_ENTRY *Flink; + struct _LIST_ENTRY *Blink; } LIST_ENTRY, *PLIST_ENTRY, *RESTRICTED_POINTER PRLIST_ENTRY; + typedef struct _LIST_ENTRY32 { - DWORD Flink; - DWORD Blink; + DWORD Flink; + DWORD Blink; } LIST_ENTRY32,*PLIST_ENTRY32; + typedef struct _LIST_ENTRY64 { - ULONGLONG Flink; - ULONGLONG Blink; + ULONGLONG Flink; + ULONGLONG Blink; } LIST_ENTRY64,*PLIST_ENTRY64; typedef struct _SINGLE_LIST_ENTRY { - struct _SINGLE_LIST_ENTRY *Next; + struct _SINGLE_LIST_ENTRY *Next; } SINGLE_LIST_ENTRY,*PSINGLE_LIST_ENTRY; // @@ -3431,6 +3490,12 @@ (NTAPI *PVECTORED_EXCEPTION_HANDLER)( struct _EXCEPTION_POINTERS *ExceptionInfo ); + +typedef struct _PROCESSOR_NUMBER { + WORD Group; + BYTE Number; + BYTE Reserved; +} PROCESSOR_NUMBER, *PPROCESSOR_NUMBER; typedef struct _GROUP_AFFINITY { KAFFINITY Mask; @@ -4179,42 +4244,42 @@ } SERVICE_ERROR_TYPE; typedef struct _NT_TIB { - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; - PVOID StackBase; - PVOID StackLimit; - PVOID SubSystemTib; - _ANONYMOUS_UNION union { - PVOID FiberData; - DWORD Version; - } DUMMYUNIONNAME; - PVOID ArbitraryUserPointer; - struct _NT_TIB *Self; + struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + PVOID StackBase; + PVOID StackLimit; + PVOID SubSystemTib; + _ANONYMOUS_UNION union { + PVOID FiberData; + DWORD Version; + } DUMMYUNIONNAME; + PVOID ArbitraryUserPointer; + struct _NT_TIB *Self; } NT_TIB,*PNT_TIB; typedef struct _NT_TIB32 { - DWORD ExceptionList; - DWORD StackBase; - DWORD StackLimit; - DWORD SubSystemTib; - union { - DWORD FiberData; - DWORD Version; - }; - DWORD ArbitraryUserPointer; - DWORD Self; + DWORD ExceptionList; + DWORD StackBase; + DWORD StackLimit; + DWORD SubSystemTib; + _ANONYMOUS_UNION union { + DWORD FiberData; + DWORD Version; + } DUMMYUNIONNAME; + DWORD ArbitraryUserPointer; + DWORD Self; } NT_TIB32,*PNT_TIB32; typedef struct _NT_TIB64 { - DWORD64 ExceptionList; - DWORD64 StackBase; - DWORD64 StackLimit; - DWORD64 SubSystemTib; - union { - DWORD64 FiberData; - DWORD Version; - }; - DWORD64 ArbitraryUserPointer; - DWORD64 Self; + DWORD64 ExceptionList; + DWORD64 StackBase; + DWORD64 StackLimit; + DWORD64 SubSystemTib; + _ANONYMOUS_UNION union { + DWORD64 FiberData; + DWORD Version; + } DUMMYUNIONNAME; + DWORD64 ArbitraryUserPointer; + DWORD64 Self; } NT_TIB64,*PNT_TIB64; typedef struct _REPARSE_GUID_DATA_BUFFER { @@ -4303,11 +4368,10 @@ MaxJobObjectInfoClass } JOBOBJECTINFOCLASS; -typedef struct _JOB_SET_ARRAY -{ - HANDLE JobHandle; - DWORD MemberLevel; - DWORD Flags; +typedef struct _JOB_SET_ARRAY { + HANDLE JobHandle; + DWORD MemberLevel; + DWORD Flags; } JOB_SET_ARRAY, *PJOB_SET_ARRAY; typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION { @@ -4592,8 +4656,8 @@ #if (_WIN32_WINNT >= 0x0500) #define _AUDIT_EVENT_TYPE_HACK 1 typedef enum _AUDIT_EVENT_TYPE { - AuditEventObjectAccess, - AuditEventDirectoryServiceAccess + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess } AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; #endif @@ -4842,9 +4906,9 @@ } typedef struct _OBJECT_TYPE_LIST { - WORD Level; - WORD Sbz; - GUID *ObjectType; + WORD Level; + WORD Sbz; + GUID *ObjectType; } OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST; #if defined(__GNUC__)

1 0

[ekohl] 47220: [WINLOGON] - Add a hack to fix the APPDATA environment variable. This hack will be removed after bug #5372 has been fixed. Fixes bug #4102.
by ekohl＠svn.reactos.org 15 May '10

15 May '10

Author: ekohl Date: Sat May 15 18:02:14 2010 New Revision: 47220 URL: http://svn.reactos.org/svn/reactos?rev=47220&view=rev Log: [WINLOGON] - Add a hack to fix the APPDATA environment variable. This hack will be removed after bug #5372 has been fixed. Fixes bug #4102. Modified: trunk/reactos/base/system/winlogon/environment.c Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sat May 15 18:02:14 2010 @@ -31,15 +31,15 @@ HINSTANCE hShell32 = NULL; PFSHGETFOLDERPATHW pfSHGetFolderPathW = NULL; WCHAR szPath[MAX_PATH + 1]; + WCHAR szExpandedPath[MAX_PATH + 1]; LPCWSTR wstr; SIZE_T size; - WCHAR szEnvKey[MAX_PATH]; WCHAR szEnvValue[1024]; - SIZE_T length; LPWSTR eqptr, endptr; + /* Parse the environment variables and add them to the volatile environment key */ if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment != NULL) { @@ -80,7 +80,7 @@ } } - + /* Load shell32.dll and call SHGetFolderPathW to get the users appdata folder path */ hShell32 = LoadLibraryW(L"shell32.dll"); if (hShell32 != NULL) { @@ -94,12 +94,21 @@ 0, szPath) == S_OK) { + /* FIXME: Expand %USERPROFILE% here. SHGetFolderPathW should do it for us. See Bug #5372.*/ + TRACE("APPDATA path: %S\n", szPath); + ExpandEnvironmentStringsForUserW(Session->UserToken, + szPath, + szExpandedPath, + MAX_PATH); + + /* Add the appdata folder path to the users volatile environment key */ + TRACE("APPDATA expanded path: %S\n", szExpandedPath); RegSetValueExW(hKey, L"APPDATA", 0, REG_SZ, - (LPBYTE)szPath, - (wcslen(szPath) + 1) * sizeof(WCHAR)); + (LPBYTE)szExpandedPath, + (wcslen(szExpandedPath) + 1) * sizeof(WCHAR)); } }

1 0

[dreimer] 47219: Prepare for RosBE 1.5.1. RC is available on my site already.
by dreimer＠svn.reactos.org 15 May '10

15 May '10

Author: dreimer Date: Sat May 15 15:33:40 2010 New Revision: 47219 URL: http://svn.reactos.org/svn/reactos?rev=47219&view=rev Log: Prepare for RosBE 1.5.1. RC is available on my site already. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat May 15 15:33:40 2010 @@ -36,7 +36,7 @@ $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_PREFIX = $null -$global:_ROSBE_VERSION = "1.5" +$global:_ROSBE_VERSION = "1.5.1" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 @@ -175,7 +175,7 @@ clear-host "*******************************************************************************" "* *" -"* ReactOS Build Environment $_ROSBE_VERSION *" +"* ReactOS Build Environment $_ROSBE_VERSION *" "* *" "*******************************************************************************" "" Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat May 15 15:33:40 2010 @@ -1,30 +1,27 @@ -*** XXX XXth, 2010 - RosBE 1.X Released - -- Readded the old behavior of RosBE to ignore the System PATH Variable. Many ppl will love it as fix for overly stupid installed cygwin and WinAVR Tools. - To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1. (Daniel Reimer) +*** May XXth, 2010 - RosBE 1.5.1 Released + +- Updated NASM to 2.08.01 (Daniel Reimer) +- Updated YASM to 1.0.0 (Daniel Reimer) +- Updated SVN to 1.6.11 (Daniel Reimer) +- Re-added the old behavior of RosBE to ignore the System PATH Variable. Many people will love it as fix for overly stupid installed cygwin and WinAVR Tools. To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1. (Daniel Reimer) - sSVN: Make use of the http:// protocol instead of the svn:// one. (Daniel Reimer) - Add remakex command to RosBE. (Daniel Reimer) -- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, if you let it - generate a LOG File. (Daniel Reimer) -- Made a small modification to be able to ask for help for ps commands in RosBE, too. (Daniel Reimer) -- Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming BuildBot Vars to skip the updating of the main trunk source when ssvn is used - to do so. If its being set to "1" it only updates rosapps and rostests if existant. This is needed for Olaf Siejka's Windows Buildbot project. - As Default its set to "0" and thus all behaves as before. (Daniel Reimer) +- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, if you let it generate a LOG File. (Daniel Reimer) +- Made a small modification to be able to ask for help for PS commands in RosBE, too. (Daniel Reimer) +- Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming Build Bot Vars to skip the updating of the main trunk source when sSVN is used to do so. If its being set to "1" it only updates rosapps and rostests if existent. This is needed for Olaf Siejka's Windows Build Bot project. As Default its set to "0" and thus all behaves as before. (Daniel Reimer) - Fix a access error when you start two builds in the same minute on a PC by adding the seconds to $TIMENAME, too. (Daniel Reimer) - Clean up $DATENAME which included the year twice. (Daniel Reimer) - Weaken the ROS Source Dir check in clean a bit so that it does remove the built stuff even if it did not even build any tool yet. (Daniel Reimer) - Add the correct license to the audio files. (Daniel Reimer) - If a custom output folder is defined, pass it to log2lines, too. (Mephisto, Daniel Reimer) -- Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories - in the modules folder. Now it detects an existant repository and just updates that one. If theres no repository or even no folder for the repository - it first generates it and continues. Additionally you can set the revision you wanna checkout or update to. "create" accepts a revision as second - parameter now, too. (Daniel Reimer) -- Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. (Daniel Reimer) +- Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories in the modules folder. Now it detects an existent repository and just updates that one. If there's no repository or even no folder for the repository it first generates it and continues. Additionally you can set the revision you want to checkout or update to. "create" accepts a revision as second parameter now, too. (Daniel Reimer) +- Make sSVN fully multiple Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. (Daniel Reimer) + *** Feb 08th, 2010 - RosBE 1.5 Released - Updated Binutils to 2.20.51-20091222 (snapshot) (Colin Finck) -- Updated GCC to 4.4.3 (including backported GCC r153606) (Colin Finck) +- Updated GCC to 4.4.3 (including back-ported GCC r153606) (Colin Finck) * gmp 4.4.3 * mpfr 2.4.2 - Updated MinGW Runtime to 3.17 (Daniel Reimer) @@ -35,7 +32,7 @@ - Added kdbg Command (Jan Roeloffzen, Daniel Reimer) - Replaced raddr2line with log2lines v1.12 (Jan Roeloffzen, Daniel Reimer) - Added piperead Tool for log2lines fully working in Powershell (Jan Roeloffzen, Daniel Reimer) -- Added a chinese translation to the options tool (Elton Chung) +- Added a Chinese translation to the options tool (Elton Chung) - Added ARM Arch support to RosBE (Daniel Reimer) - Added ARM Settings to options.exe, too (Daniel Reimer) - Fixed a few renaming bugs (Daniel Reimer) @@ -44,20 +41,18 @@ - Rename mingw32-make to make. Its platform independent (Daniel Reimer) - Merge the 32 bit and 64 bit options tool in one file (Daniel Reimer) - PS1 options script now waits for options.exe closing and then immediately sets all options active (Daniel Reimer) -- Tidy up existant and add more Target Compiler Paths (Daniel Reimer) -- Reworked clean command to be more restrictive and secure - and being able to clean other repos except the main one (Colin Finck, Daniel Reimer) -- Clean up from some app calls where the app's path is in the PATH Var (Daniel Reimer) +- Tidy up existent and add more Target Compiler Paths (Daniel Reimer) +- Reworked clean command to be more restrictive and secure and being able to clean other reposorities except the main one (Colin Finck, Daniel Reimer) +- Clean up from some app calls where the application's path is in the PATH Var (Daniel Reimer) - Cleaned up Host-GCC Path being added twice to the PATH Var (Daniel Reimer) - Work on the Update Script: (Daniel Reimer) - * Theres no need for a loading routine for 7z.exe anymore. Its included in RosBE now + * There's no need for a loading routine for 7z.exe anymore. Its included in RosBE now * Added some Status Messages telling if stuff succeeded or not - Removed the address translation from the raddr2line script. Its done in the tools now (Daniel Reimer) -- Fixed the Core detection in makex for PS. Added a global setting to the variable - containing the number of cores. (Daniel Reimer) -- Added getincludes from RosBE Unix. This makes the scripts way more logical and fixes a PS Bug - when you open several Windows at once (Colin Finck, Daniel Reimer) -- Fix for GCC Version showup together with Colin's new Tool in PS. (Maciej Bialas) +- Fixed the Core detection in makex for PS. Added a global setting to the variable containing the number of cores. (Daniel Reimer) +- Added getincludes from RosBE Unix. This makes the scripts way more logical and fixes a PS Bug when you open several Windows at once (Colin Finck, Daniel Reimer) +- Fix for GCC Version show up together with Colin's new Tool in PS. (Maciej Bialas) + *** Oct 26th, 2009 - RosBE 1.4.5 Released @@ -69,19 +64,19 @@ - Installer Fixes: * Installer starts the Uninstaller of the old Version again. - * Installer does not accidentially kill the whole Start menu again. + * Installer does not accidentally kill the whole Start menu again. * Installer uninstalls charch too. * Fixed some line skippers. (care2debug, Daniel Reimer) -- AMD64 Addon Fixes: +- AMD64 Add-on Fixes: * Fix the one dash too much problem. * Fix the args not checked bug. (Samuel Serapion) - Prepare scripts for RosBE64 1.1 which is compatible with the new RosBE Versions (Daniel Reimer) -- Bugfixes in ssvn (Shashkov Maxim, Daniel Reimer) +- Bugfixes in sSVN (Shashkov Maxim, Daniel Reimer) - Fix confusion between %_ROSBE_ROSPREFIX% and %_ROSBE_PREFIX%. (Colin Finck) We only use %_ROSBE_PREFIX% now, which should fix building with amd64. (Colin Finck) -- Readd chdefdir's feature to switch to the new default directory after changing it. (Colin Finck) +- Re-add chdefdir's feature to switch to the new default directory after changing it. (Colin Finck) - Fix inability to switch back to i386. (Colin Finck) - Fix Variables to be able to use more recent GCCs. (Daniel Reimer) - Fix up the call of the i386 config file in charch. (Daniel Reimer) @@ -89,45 +84,38 @@ - "Only" call the 64 bit config file when you are in 64 bit mode. (Daniel Reimer) - Fix the 64 bit options tool to be useable. (Daniel Reimer) - Tidy up work on all files. (Daniel Reimer) -- Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE - startup and thus behave the same way like the other settings you can set in there. (Daniel Reimer) -- Made the "update" command stop when it found the last existant update online. Theres no use in trying - the full update 1-9 if theres none/one. This speeds up the status generation process. (Daniel Reimer) -- Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) - to the PATH and call all .cmd files directly. Renamed some batch files to match the macro names and - added some new ones, for which no batch file existed. (except "env", this command has been removed) - Now these commands can be called from other batch files and stuff like "clean & make" will work as well. - (Colin Finck, Gunnar) +- Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE start-up and thus behave the same way like the other settings you can set in there. (Daniel Reimer) +- Made the "update" command stop when it found the last existent update online. There's no use in trying the full update 1-9 if there's none/one. This speeds up the status generation process. (Daniel Reimer) +- Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) to the PATH and call all .cmd files directly. Renamed some batch files to match the macro names and added some new ones, for which no batch file existed. (except "env", this command has been removed) Now these commands can be called from other batch files and stuff like "clean & make" will work as well. (Colin Finck, Gunnar) - Fix raddr2line.cmd to properly handle spaces in the path. (Colin Finck) -- Added rosapps and rostests support to ssvn. (Daniel Reimer) +- Added rosapps and rostests support to sSVN. (Daniel Reimer) - clean supports now multiple clean commands like "clean aaa bbb" (Daniel Reimer, mota) - Got rid of the TranslateOptions Hack (Daniel Reimer, Art Yerkes) -- Add AMD64 Branch SVN Tree Creation Support to ssvn. (Daniel Reimer) +- Add AMD64 Branch SVN Tree Creation Support to sSVN. (Daniel Reimer) - Fixed the "GCC not found" bug in AMD64 Build Processes. (Daniel Reimer) -- Fixed something cosmetical in the look on startup of rosbe. (Daniel Reimer) +- Fixed something cosmetic in the look on start-up of RosBE. (Daniel Reimer) - Added a regression test for RosBE (flex/bison) (Christoph von Wittich) - Fix Bison running from folders with spaces (Christoph von Wittich, Daniel Reimer) - Elevate Updater on Win Vista / 7 now. (Daniel Reimer, Ged Murphy) - Add some missing headers. (Daniel Reimer) - Fix some missing /i on some sets. (Daniel Reimer) -- Fix the Info message at the very beginning that theres no source code and how to get it. (Daniel Reimer) +- Fix the Info message at the very beginning that there's no source code and how to get it. (Daniel Reimer) - Fixed Window Flash and end of build (Daniel Reimer) - Fixed makex only accepting one parameter in PS. (Daniel Reimer) + *** Jun 29th, 2009 - RosBE 1.4.4 Released - Reverted to the old GCC. Because of the optimization we have problems running ROS on Pentium I PCs. (Colin Finck) - Updated SVN to 1.6.3 (Daniel Reimer) -- Fixed a bug which prevented makefile.auto to be deleted by "clean" in the PS Version, this was the reason for - the "buildno.h not found" error, too (Daniel Reimer) -- Fixed "ssvn create" not working due to the fact that RosBE creates a log folder and then tries to verify a - empty folder. Thx for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) +- Fixed a bug which prevented makefile.auto to be deleted by "clean" in the PS Version, this was the reason for the "buildno.h not found" error, too (Daniel Reimer) +- Fixed "sSVN create" not working due to the fact that RosBE creates a log folder and then tries to verify a empty folder. Thanks for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) - Updated: NSIS to 2.45 (Daniel Reimer) - Added a way to enable/disable the Version Show up (Daniel Reimer) - Fixed a bug with not activating settings in options.ps1 (Daniel Reimer) -- Added a while-like loop into Batch where already used in PS. This makes it possible to get more than 10 Updates - and realizes the Log show feature in SSVN in Batch too. (Victor Martinez, Daniel Reimer) +- Added a while-like loop into Batch where already used in PS. This makes it possible to get more than 10 Updates and realizes the Log show feature in SSVN in Batch too. (Victor Martinez, Daniel Reimer) - Killed a forgotten regression test from update.ps1 (Daniel Reimer) + *** May 26th, 2009 - RosBE 1.4.3 Released @@ -135,19 +123,17 @@ - Bison fixed for REAL. (Daniel Reimer) - Updated SVN to 1.6.2 (Daniel Reimer) - Updated yasm to 0.8.0 (Daniel Reimer) + RosBE-Windows spring cleaning: - Rewrite most of the RosBE-Windows CMD scripts resulting in more compact and cleaner code. (Colin Finck) - Remove the Standard MinGW Build Environment. We don't need it any longer since we have a new GCC. (Colin Finck) - Get rid of the GCC 3.4.5-specific hacks: A properly compiled GCC 3.4.5 shouldn't need them. (Colin Finck) -- Get rid of the experimental ARM and PPC compiler support: It simply won't work that way and we can readd that - later, when we have proper compilers. (Colin Finck) +- Get rid of the experimental ARM and PPC compiler support: It simply won't work that way and we can re-add that later, when we have proper compilers. (Colin Finck) - Use setlocal wherever possible, so that we don't need to unload the used variables explicitly. (Colin Finck) - Make the coding style more consistent. (Colin Finck) - Commands like "make bootcd livecd install" work again. (Daniel Reimer) -- Cleaned up the PS Scripts with an eye to Colin's cleaning process and removed the Variable nulling because its - not needed at all. All vars are only available in the actual Script. So the are killed anyway. (Daniel Reimer) -- In PS Logs were generated, but without any warnings or errors in it. Additionally they were not even displayed - in the console too. This is now fixed. (Daniel Reimer) +- Cleaned up the PS Scripts with an eye to Colin's cleaning process and removed the Variable nulling because its not needed at all. All vars are only available in the actual Script. So the are killed anyway. (Daniel Reimer) +- In PS Logs were generated, but without any warnings or errors in it. Additionally they were not even displayed in the console too. This is now fixed. (Daniel Reimer) - "buildno.h not found" errors i PS were fixed now that I was able to see them :-P (Daniel Reimer) - Fixed chdefgcc, charch and chdefdir for PS and Batch. (Daniel Reimer) - Fixed version showing when using charch and chdefdir under PS. (Daniel Reimer) @@ -157,9 +143,7 @@ *** May 08th, 2009 - RosBE 1.4.2 Released -- Add the environment variables ROSBE_HOST_CFLAGS, ROSBE_HOST_CXXFLAGS, ROSBE_TARGET_CFLAGS, ROSBE_TARGET_CXXFLAGS - They contain existing pathes for the built-in include directories of the Host C/C++ and Target C/C++ compilers as compiler flags. - Required for kjk's rbuild work. (Colin Finck) +- Add the environment variables ROSBE_HOST_CFLAGS, ROSBE_HOST_CXXFLAGS, ROSBE_TARGET_CFLAGS, ROSBE_TARGET_CXXFLAGS They contain existing paths for the built-in include directories of the Host C/C++ and Target C/C++ compilers as compiler flags. Required for kjk's RBuild work. (Colin Finck) - Fixes for the Uninstall Routine to keep most settings, if wished, on a update. (Daniel Reimer) - Remove some stupid setlocals. (Daniel Reimer) - New binutils and GCC builds optimized for i686 and with proper relative include directories (Colin Finck) @@ -173,22 +157,17 @@ * Fix some typos in the PS files to fully work with the new GCC - sSVN can show the Log Files now. ONLY in the PS Version (Daniel Reimer) + *** April 07th, 2009 - RosBE 1.4.1 Released - Updated: SVN 1.6 included (Daniel Reimer) -- Fixed: Sped up starting of rosbe (Daniel Reimer) +- Fixed: Sped up starting of RosBE (Daniel Reimer) - Fixed: Hopefully fixed bison. (Daniel Reimer) + *** February 01st, 2009 - RosBE 1.4 Released -"Quote of the year: A loooong time ago there was something called Batch. It was a old -scripting "language" which you could use for some stuff, but with hacks, so ugly, you -would turn to stone if used. Then there was the new shiny Powershell Scripting Language -which came from the deep resorts of the Devil GaTeS with great features like a XML -parser and more. A great war began for the right to be used in the Glorious Heaven of -RosBE. After some salves of XML parse and shrapnels of DeHacking, Batch was fainted and -vanished. The glorious winner of the war helped to gain worldwide peace and food for the -hungry ppl. After a loong live Powershell died and was replaced by PS 2.0." +"Quote of the year: A loooong time ago there was something called Batch. It was a old scripting "language" which you could use for some stuff, but with hacks, so ugly, you would turn to stone if used. Then there was the new shiny Powershell Scripting Language which came from the deep resorts of the Devil GaTeS with great features like a XML parser and more. A great war began for the right to be used in the Glorious Heaven of RosBE. After some salves of XML parse and shrapnel of DeHacking, Batch was fainted and vanished. The glorious winner of the war helped to gain worldwide peace and food for the hungry people. After a loong live Powershell died and was replaced by PS 2.0." - Added: Spanish Resource Files for options.exe (Javier Remacha) - Added: Experimental GCC 3.4.5 Support added back (Daniel Reimer) @@ -196,27 +175,19 @@ - Fixed: More logical names for the GCC Folders - Fixed: Drive not Found Errors (Colin Finck, d0g) - Fixed: clean when using _ROSBE_OBJPATH and/or _ROSBE_OUTPATH -- Fixed: If the specified OBJ and OUT Paths are non existant, don't just abort. Create - them and continue. +- Fixed: If the specified OBJ and OUT Paths are non existent, don't just abort. Create them and continue. - Fixed: Options.exe configs the PS Port now too. -- Updated: "clean MODULENAME" does the same like "make MODULENAME_clean now" - (Daniel Reimer) -- Updated: The Update Utility now does not just blindly sync the script files. It - loads complete Update Packs, which can contain from a single script update up to - a fully new GCC Version and installs them if the User confirms it. (Daniel Reimer) -- Updated: The Powershell Port is now complete and privides the same features like - the Batch one, but in a way more powerful console window. (Daniel Reimer) -- Fixed: Now config adds the ELF Parameter to the config file to and lets you modify - it. Without this param, build was broken. (Daniel Reimer) -- Modified: Changed the default values of config to the previous setting instead of - the real default one if you don't type in anything for a setting. (Daniel Reimer) +- Updated: "clean MODULENAME" does the same like "make MODULENAME_clean now" (Daniel Reimer) +- Updated: The Update Utility now does not just blindly sync the script files. It loads complete Update Packs, which can contain from a single script update up to a fully new GCC Version and installs them if the User confirms it. (Daniel Reimer) +- Updated: The Powershell Port is now complete and provides the same features like the Batch one, but in a way more powerful console window. (Daniel Reimer) +- Fixed: Now config adds the ELF Parameter to the config file to and lets you modify it. Without this parameter, build was broken. (Daniel Reimer) +- Modified: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. (Daniel Reimer) - Tons of Code cleanup, code reduction and Bugfixes (Daniel Reimer) - Updated: MingW32 Runtime DLL 3.15.2 (Daniel Reimer) - Updated: NASM to 2.05.01 (Daniel Reimer) - Updated: Subversion to 1.5.5 (Daniel Reimer) - Updated: NSIS to 2.42 (Daniel Reimer) - Updated: Binutils 2.19.51 Build 20090127. (Daniel Reimer) - *** October 26th, 2008 - RosBE 1.3 Released @@ -233,28 +204,18 @@ - Added: YASM 0.72, which supports 64 bit asm too. (Daniel Reimer) - Added: Update command (Daniel Reimer) - Added: nostrip function (Christoph von Wittich) -- Added: RosBE Debugging Feature which disables the @echo off. just set - _ROSBE_DEBUG=1 (Daniel Reimer) -- Added: Mingw-64 GCC 4.4.0 for the 64 bit Branch. It will be installed with a - Optional installer (Daniel Reimer) -- Fixed: Fixed the Header Mess in the different GCC Versions. Now the need for - LIBRARY_PATH is no more and all Arches use THEIR Headers. (Samuel Serapion) -- Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel Reimer) +- Added: RosBE Debugging Feature which disables the @echo off. just set _ROSBE_DEBUG=1 (Daniel Reimer) +- Added: MinGW-64 GCC 4.4.0 for the 64 bit Branch. It will be installed with a Optional installer (Daniel Reimer) +- Fixed: Fixed the Header Mess in the different GCC Versions. Now the need for LIBRARY_PATH is no more and all Arches use THEIR Headers. (Samuel Serapion) +- Fixed: Dependent on the Arch variable a cross compiler will be used now. (Daniel Reimer) - Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer) -- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not work in batch. - (Daniel Reimer) +- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not work in batch. (Daniel Reimer) - Fixed: Bug 3043: Polish translation update (olaf_siejka(a)o2.pl) - Fixed: Bug 3044: Ukrainian translation update (temarez(a)yandex.ru) -- Fixed: Bug 3035: Patch for RosBE that solves improper handling of a path with - spaces (roelmessiant(a)gmail.com) -- Fixed: Stripped apps and removed Debug Symbols at once may not be possible. - (Daniel Reimer) -- Fixed: Warnings, Resource Leaks, Problems with non-allocated Memory, RC MSVC - Comptibility (Christoph von Wittich) -- Fixed: First look into %_ROSBE_BASEDIR% for the specified directory and use it if it - exists. his makes it possible to just call "chdefgcc 3.4.5" instead of - "chdefgcc full\path\to\the\3.4.5\directory" if there is a "3.4.5" directory - in the RosBE installation directory. (Colin Finck) +- Fixed: Bug 3035: Patch for RosBE that solves improper handling of a path with spaces (roelmessiant(a)gmail.com) +- Fixed: Stripped apps and removed Debug Symbols at once may not be possible. (Daniel Reimer) +- Fixed: Warnings, Resource Leaks, Problems with non-allocated Memory, RC MSVC Compatibility (Christoph von Wittich) +- Fixed: First look into %_ROSBE_BASEDIR% for the specified directory and use it if it exists. his makes it possible to just call "chdefgcc 3.4.5" instead of "chdefgcc full\path\to\the\3.4.5\directory" if there is a "3.4.5" directory in the RosBE installation directory. (Colin Finck) *** January 23rd, 2008 - RosBE 1.2 Released @@ -272,11 +233,11 @@ - If there's a slash at the end of the entered path, it's removed (Pierre Schweitzer) - Definitively get rid of pidl work (Pierre Schweitzer) - Now, previous path is just selected in browse window (Pierre Schweitzer) - - Stop abusing WM_SETCURSOR and use tooltips instead. (Thomas Weidenmueller) + - Stop abusing WM_SETCURSOR and use tool tips instead. (Thomas Weidenmueller) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) - Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck) -- Add the ability to determine the cpu count based on the inherited process affinity mask to cpucount (only for win32 hosts) (Thomas Weidenmueller) +- Add the ability to determine the CPU count based on the inherited process affinity mask to cpucount (only for win32 hosts) (Thomas Weidenmueller) - KDBG is defaulted to 1 now in Config.cmd to reflect changes in svn. (Daniel Reimer) - Grab the GCC target dynamically as well as the version so chdefgcc will work with mingw64, etc... (Peter Ward) @@ -291,9 +252,9 @@ - Updated French translation (Pierre Schweitzer) - Prompt on cancel button when there are changes (Pierre Schweitzer) - Use Program Files instead of Desktop by default for browsing (Pierre Schweitzer) - - Free Pidl ressources (Pierre Schweitzer) + - Free Pidl resources (Pierre Schweitzer) - Converted last parts of the program to Unicode (Pierre Schweitzer) - - Attached MessageBoxes to Window (Pierre Schweitzer) + - Attached Message Boxes to Window (Pierre Schweitzer) - Code cleanup (Pierre Schweitzer) - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. (Peter Ward) @@ -304,9 +265,8 @@ - Added a small utility (rquote) to remove any quotes from a string (needed for the spaces fix in chdefgcc.cmd). (Peter Ward) - Fix a problem with spaces in chdefgcc.cmd. (Peter Ward) - Make 'chdefgcc' bail if no MinGW/GCC is found in the given path. (Peter Ward) -- Fix a bug in Clean.cmd. It accidently killed some not anymore Autogenerated Resources. (Daniel Reimer) -- Remove file deletions that are no longer needed from Clean.cmd so it now only removes - obj-i386\., output-i386\., reactos\. and makefile.auto. (Peter Ward) +- Fix a bug in Clean.cmd. It accidentally killed some not anymore Auto generated Resources. (Daniel Reimer) +- Remove file deletions that are no longer needed from Clean.cmd so it now only removes obj-i386\., output-i386\., reactos\. and makefile.auto. (Peter Ward) - Fix a bug in TimeDate.cmd. (Peter Ward) - Fix a bug in reladdr2line.cmd. (Peter Ward) - Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) @@ -319,6 +279,7 @@ - Stop scut from listing the default shortcut and inform the user there are no shortcuts if none are found. (Peter Ward) - Fix six memory leaks in scut (who added these? :P). (Peter Ward) + *** Nov 18th, 2007 - RosBE 1.0 Released - Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, Mike Nordell) @@ -328,17 +289,17 @@ - Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer) - Added French translation. (Pierre Schweitzer) - - Added the possibility to choose MingW directory. (Pierre Schweitzer) - - Added check to see if MingW dir is right. (Pierre Schweitzer) - - Added support for WinXP style. (Pierre Schweitzer) + - Added the possibility to choose MinGW directory. (Pierre Schweitzer) + - Added check to see if MinGW directory is right. (Pierre Schweitzer) + - Added support for Windows XP style. (Pierre Schweitzer) - Added the support of C99. (Pierre Schweitzer) - Fixed warnings. (Pierre Schweitzer) - Added -s and went from -O3 to -O2 in Makefile. (Daniel Reimer) - Correct Button States and Whitespace changes. (Pierre Schweitzer) - Save button is disabled until a parameter is changed. (Pierre Schweitzer) - Definitively fixed resources IDs. (Pierre Schweitzer) - - Added check to test if log dir exists and if it doesn't, it's created. (Pierre Schweitzer) - - Added check to avoid writing in a non-existant file. (Pierre Schweitzer) + - Added check to test if log directory exists and if it doesn't, it's created. (Pierre Schweitzer) + - Added check to avoid writing in a non-existent file. (Pierre Schweitzer) - Updated todo list. (Pierre Schweitzer) - Reorganized resources. (Pierre Schweitzer) - Added a basic font preview. (Pierre Schweitzer) @@ -351,31 +312,24 @@ - Fixed various bugs (Pierre Schweitzer) - Moved colors names to RC files (Pierre Schweitzer) - Added a status bar to display status of previous settings (Pierre Schweitzer) - - Moved last hardcoded strings to RC files (Pierre Schweitzer) + - Moved last hard coded strings to RC files (Pierre Schweitzer) - Fixed German RC File of Options.exe. (Daniel Reimer) - Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more than one command to make. (Daniel Reimer) - Fixed Russian RC File of options.exe (towerr) - - Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) + - Make options.exe startable from cmd window. After exiting RosBE resets to use the new settings. (Daniel Reimer) - Improve the GUI to be easier to understand and add two more settings. (Daniel Reimer) - Make options.exe only write path variables if there is something to write. (Peter Ward) - Fix the Case where you enable Logging and want to keep the default Path for it. (Daniel Reimer) - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. (Peter Ward) -- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' - instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can - also use part of the file name ie. 'ntdll*' instead of 'ntdll.dll' and - it will match it. Searchs the current directory and all sub-directories. - (does not match directories of course) - (yes you can still specify the full path if you like) (Peter Ward) -- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this - file can also be used outside of the RosBE to initialize and GCC/MinGW - in the current directory. (Peter Ward) -- Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) +- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name i.e. 'ntdll*' instead of 'ntdll.dll' and it will match it. Searches the current directory and all sub-directories. (does not match directories of course) (yes you can still specify the full path if you like) (Peter Ward) +- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this file can also be used outside of the RosBE to initialize and GCC/MinGW in the current directory. (Peter Ward) +- Added the command 'chdefgcc' to allow easy switching of the current tool set. (Peter Ward) - Added a minimal replacement for tee. (Peter Ward) - Added ccache 2.4 to RosBE. (Daniel Reimer) - Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) -- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Re-add chdefdir due to popular Demand. (Daniel Reimer) - Move Options cmd and srcdir.txt to Application Data Folder. (Peter Ward) - Move Temp Files to Temp Folder. (Daniel Reimer) @@ -385,7 +339,7 @@ - Merged the NSIS files back together. (Peter Ward) - Rewrote Scut in C. (Peter Ward) -- Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer) +- Heavily cleaning up the .cmd files. (Peter Ward, Daniel Reimer) - Remove typos. (Peter Ward, Daniel Reimer) - Make variable names more consistent. (Peter Ward) - Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) @@ -395,18 +349,17 @@ - Remove the need for cutz.cmd and delete it. (Peter Ward, Daniel Reimer) - Remove the doskey macro for a component if it is not actually present. (Peter Ward) - Remove the dependency on cut from sSVN.cmd. (Peter Ward) - - Completely rewrote scut to work without *nix tools and added a edit function (Parter Ward, Daniel Reimer) - - Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos (Daniel Reimer) + - Completely rewrote scut to work without *nix tools and added a edit function (Peter Ward, Daniel Reimer) + - Fix one bug in sSVN. Now it does checkout in %CD% not %CD%/reactos (Daniel Reimer) - Added more Error Messages to prevent confusion and stupid mistakes. (Daniel Reimer) - Remove trailing Spaces. (Daniel Reimer) - - Make helpfile entries dependant on the installed optional files. (Daniel Reimer) - - Added echo Messages which inform you about a sucessful process. (Daniel Reimer) + - Make helpfile entries dependent on the installed optional files. (Daniel Reimer) + - Added echo Messages which inform you about a successful process. (Daniel Reimer) - Sorted and fixed parts of the help. (Daniel Reimer, Peter Ward) - Modify many "if" to "if /I" to ignore lower and upper case. (Daniel Reimer) - Modify ERROR messages in scut to abort the process when Name and Path are specified by Shell Commands, too. (Daniel Reimer) - Updated echo Messages a bit. (Daniel Reimer) - Get rid of svnversion.exe and its need in ssvn.cmd. (Daniel Reimer) - - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (Peter Ward) - Add a Shortcut Listing Feature to scut.cmd. (Daniel Reimer) - Fully get rid of all *nix Tools (Daniel Reimer) - Unload all Vars at the Script's end. (Daniel Reimer) @@ -415,13 +368,13 @@ - Started to Update the Documentation. (Daniel Reimer) -*** Sep 24th, 2007 - RosBE 0.3.8.1 Released - -- Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to - seperate target and host headers by Hervé Poussineau. (Hervé Poussineau, Daniel Reimer) +*** Sept 24th, 2007 - RosBE 0.3.8.1 Released + +- Updated the Variables for GCC. This is needed in r29185+ because of RBUILD Changes to separate target and host headers by Hervé Poussineau. (Hervé Poussineau, Daniel Reimer) - Updated: NASM 0.99.02 to 0.99.04 (Daniel Reimer) -*** Sep 11th, 2007 - RosBE 0.3.8 Released + +*** Sept 11th, 2007 - RosBE 0.3.8 Released - Updated: w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) - Updated: mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) @@ -438,9 +391,10 @@ - Fixed: Double \\ Bug introduced in 0.3.7. (Daniel Reimer) - Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer) - Fixed: DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) -- sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer) +- sSVN asks you if you want to update if Offline Source Tree is old. (Daniel Reimer) - Add a new option called update to Config.cmd and add some security stuff. (Daniel Reimer) -- All commands use the current dir now. SO you can use several SVN Source Trees now. (Daniel Reimer) +- All commands use the current directory now. SO you can use several SVN Source Trees now. (Daniel Reimer) + *** July 22nd, 2007 - RosBE 0.3.7 Released @@ -452,9 +406,9 @@ - Added grep/cut/sed Tools for the new Configurator. (Daniel Reimer) - Added SVN 1.4.4 for the SVN Feature. (Daniel Reimer) - Added RAddr2Line Tool for the Devs out there. (Christoph von Wittich, Daniel Reimer) -- Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip". (Daniel Reimer) +- Added use of ROS_LEAN_AND_MEAN by typing "make/makex %command% strip". (Daniel Reimer) - Added GDB GNU-Debugger 6.6. (Daniel Reimer) -- Readded makex. Sorry, bug in Vista still persists... its a GCC bug. (Daniel Reimer) +- Re-added makex. Sorry, bug in Vista still persists... its a GCC bug. (Daniel Reimer) - Changed Default Source Folder to \Source Subfolder. Helpful for letting RosBE load the Source. (Daniel Reimer) - Added a command to change the Default Folder for this session, nice for working with several ROS Trees or Branches. (Daniel Reimer) - Very ALPHA NonAdmin Account Support (NOT for Vista). (Daniel Reimer, Colin Finck) @@ -471,30 +425,32 @@ - Snapshot: Binutils 2.17.50 (20060824) to Binutils 2.17.50 (20070204) - Updated: NSIS 2.22 to NSIS 2.27. - New cool Icon. Thanks to ROSFan for it. -- Readded buildtime. +- Re-added buildtime. - Removed makex for now, until the bug is fixed. - Added Colin Finck's Build.cmd Unification. - Added Ged Murphy's flash tool to let the window flash once at build's end. - Updated all other tools. -*** Janruary 26th, 2007 - RosBE 0.3.5b2 Released + +*** January 26th, 2007 - RosBE 0.3.5b2 Released - Updated GCC 4.1.2 to a newer snapshot (20070122). - Removed buildtime for the time being. - Fixed remaining bugs with spaces in paths. - Removed GCC 3.4.5. -*** Janruary 12th, 2007 - RosBE 0.3.5b1 Released + +*** January 12th, 2007 - RosBE 0.3.5b1 Released - Updated GCC 4.1.2 to a newer snapshot (20070108). - Added 'clean logs' command to clean up build logs created by RosBE. - Added help for individual commands. - Fixed a bug concerning spaces in file names/paths. -*** Janruary 08th, 2007 - RosBE 0.3.4 Released - -- New command 'makex' which automatically determines the correct number for, and uses the -j option of - mingw32-make.exe. + +*** January 08th, 2007 - RosBE 0.3.4 Released + +- New command 'makex' which automatically determines the correct number for, and uses the -j option of mingw32-make.exe. - Fixed a bug concerning the date in log file names for locales other than English. - Partial support for building ReactOS on Vista. - Updated GCC 4.1.2 to a newer snapshot (20061229). Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Sat May 15 15:33:40 2010 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.5 +ReactOS Build Environment v1.5.1 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat May 15 15:33:40 2010 @@ -30,7 +30,7 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_VERSION=1.5 +set _ROSBE_VERSION=1.5.1 set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 @@ -90,7 +90,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat May 15 15:33:40 2010 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.5" +!define PRODUCT_VERSION "1.5.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.5.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.5.1.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.5.0.0" +VIProductVersion "1.5.1.0" CRCCheck force SetDatablockOptimize on @@ -153,7 +153,7 @@ File /r Components\Tools\iconv.exe File /r Components\Tools\m4.exe File /r Components\Tools\patch.exe - File /r Components\Tools\wav.exe + File /r Components\Tools\playwav.exe SetOutPath "$INSTDIR\samples" SetOverwrite try File /r Components\samples\*.* @@ -189,7 +189,6 @@ SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\svn.exe - File /r Components\Tools\intl3_svn.dll File /r Components\Tools\libapr-1.dll File /r Components\Tools\libeay32.dll File /r Components\Tools\ssleay32.dll

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs